incr ver

Fixed bug in main view quick filter binding.

.github/workflows/build-linux.yml

@@ -33,7 +33,7 @@ on:
 
 env:
   DOTNET_CONFIGURATION: 'Release'
-  DOTNET_VERSION: '7.0.x'
+  DOTNET_VERSION: '8.0.x'
   RELEASE_NAME: 'chardonnay'
 
 jobs:
@@ -41,9 +41,9 @@ jobs:
     name: '${{ inputs.OS }}-${{ inputs.architecture }}'
     runs-on: ${{ inputs.runs_on }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
         env:
@@ -124,7 +124,7 @@ jobs:
           echo "artifact=${artifact}" >> "${GITHUB_OUTPUT}"
           
       - name: Publish bundle
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.bundle.outputs.artifact }}
           path: ./Source/bin/Publish/bundle/${{ steps.bundle.outputs.artifact }}

.github/workflows/build-windows.yml

@@ -18,7 +18,7 @@ on:
 
 env:
   DOTNET_CONFIGURATION: 'Release'
-  DOTNET_VERSION: '7.0.x'
+  DOTNET_VERSION: '8.0.x'
 
 jobs:
   build:
@@ -35,9 +35,9 @@ jobs:
             release_name: classic
             prefix: Classic-
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
         env:
@@ -107,7 +107,7 @@ jobs:
           Compress-Archive -Path "${bin_dir}*" -DestinationPath "$artifact.zip"
 
       - name: Publish artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.zip.outputs.artifact }}.zip
           path: ./Source/bin/Publish/${{ steps.zip.outputs.artifact }}.zip

.github/workflows/docker.yml

@@ -24,22 +24,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.docker_username }}
           password: ${{ secrets.docker_token }}
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           push: true
           build-args: 'FOLDER_NAME=Linux-chardonnay'

.github/workflows/release.yml

@@ -39,21 +39,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 
       - name: Release
         id: release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
-          name: Libation v${{ needs.prerelease.outputs.version }}
+          name: Libation ${{ needs.prerelease.outputs.version }}
           body: <Put a body here>
           draft: true
           prerelease: false
 
       - name: Upload release assets
-        uses: dwenegar/upload-release-assets@v1
+        uses: dwenegar/upload-release-assets@v2
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
         with:

Dockerfile

@@ -1,12 +1,12 @@
 # Dockerfile
-FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 as build-env
 
 COPY Source /Source
 RUN dotnet publish -c Release -o /Source/bin/Publish/Linux-chardonnay /Source/LibationCli/LibationCli.csproj -p:PublishProfile=/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml
 COPY Docker/liberate.sh /Source/bin/Publish/Linux-chardonnay
 
 
-FROM mcr.microsoft.com/dotnet/runtime:7.0
+FROM mcr.microsoft.com/dotnet/runtime:8.0
 
 ENV SLEEP_TIME "30m"
 

Documentation/Advanced.md

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

Documentation/Docker.md

@@ -1,10 +1,11 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 
-### Disclaimer
+
+# Disclaimer
 The docker image is provided as-is. We hope it can be useful to you but it is not officially supported.
 
 ### Setup
@@ -12,7 +13,15 @@ In order to use the docker image, you'll need to provide it with a copy of the `
 
 In Settings.json, make the following changes:
 * Change `Books` to `/data`
-* Change `InProgress` to `/tmp`
+* Change `InProgress` to `/tmp` *
+
+*You may have to paste the following at the end of your your Settings.json file if `InProgess` is not present:
+
+```
+  "InProgress": "/tmp"
+```
+![image](https://github.com/patienttruth/Libation/assets/105557996/cf65a108-cadf-4284-9000-e7672c99c59b)
+
 
 ### Running
 Once the configuration files are copied and edited, the docker image can be run with the following command.

Documentation/FrequentlyAskedQuestions.md

@@ -0,0 +1,38 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
+# Frequently Asked Questions
+
+## Q: What's the difference between 'Classic' and 'Chardonnay'?
+
+**A:** First and most importantly: Classic and Chardonnay have the exact same features.
+
+* **Classic** is Windows only. Its older 'grey boxes' look has a compact design which allows for more information on the screen. Notably, Classic was written using an older, more mature technology which has built-in support for screenreaders.
+
+* **Chardonnay** is available for Windows, Mac, and Linux. Its modern design has a more open look and feel.
+
+## Q: Now that I've downloaded my books, how can I listen to them?
+
+**A:** You can use any app which plays m4b files (or mp3 files if you used that setting). Here are just a few ideas. Disclaimer: I have no affiliation with any of these companies:
+
+* iOS: [BookPlayer](https://apps.apple.com/us/app/bookplayer/id1138219998)
+* iOS: [Bound](https://apps.apple.com/us/app/bound-audiobook-player/id1041727137)
+* Android: [Smart AudioBook Player](https://play.google.com/store/apps/details?id=ak.alizandro.smartaudiobookplayer&hl=en_US&gl=US)
+* Android: [Listen](https://play.google.com/store/apps/details?id=ru.litres.android.audio&hl=en_US&gl=US)
+* Desktop: [VLC](https://www.videolan.org/)
+* Windows Desktop: [Audibly](https://github.com/rstewa/Audibly) -- a desktop player build specifically for audiobooks
+
+Self-hosting online:
+
+* [audiobookshelf](https://www.audiobookshelf.org). On [reddit](https://www.reddit.com/r/audiobookshelf/)
+* [plex](https://www.plex.tv/). Listen with [Prologue](https://prologue.audio/) (iOS)
+
+## Q: How do I use Libation with a South Africa account?
+
+**A:** Like many countries, amazon gives South Africa it's own amazon site. [Unlike many other regions](https://www.audible.com/ep/country-selector) there is not South Africa specific audible site. Use `US` for your region -- ie: audible.com.
+
+(Not exactly a *frequently* asked question but it's come up more than once)

Documentation/GettingStarted.md

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

Documentation/InstallOnLinux.md

@@ -1,15 +1,16 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 
-### Install and Run Libation on Ubuntu
+
+# Install and Run Libation on Ubuntu
 
 New Libation releases are automatically packed into .deb and .rpm package and are available from the Libation repository's releases page.
 
 
-Run this command in your terminal to dowbnload and install Libation, replacing the url with the latest Libation package url:
+Run this command in your terminal to download and install Libation, replacing the url with the latest Libation package url:
 
 - Debian
   ```Console

Documentation/InstallOnMac.md

@@ -1,9 +1,10 @@
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
 
+
 # Run Libation on MacOS
 This walkthrough should get you up and running with Libation on your Mac.
 
@@ -15,13 +16,40 @@ This walkthrough should get you up and running with Libation on your Mac.
   - Apple Silicon (M1, M2, ...): `Libation.9.4.2-macOS-chardonnay-`**arm64**`.tgz`
   - Intel: `Libation.x.x.x-macOS-chardonnay-`**x64**`.tgz`
 - Move the extracted Libation app bundle to your applications folder.
-- Open a terminal (Go > Utilities > Terminal)
-- Copy/paste/run the following command (you'll be prompted to enter your password)
-  
+- Right-click on Libation and then click on open
+- The first time, it will not immediately show you an option to open it. Just dismiss the dialog and do the same thing again (right-click -> open) then you will get an option to run the unsigned application. This takes about 10 seconds.
+
+## If this doesn't work
+
+You can add Libation as a safe app without touching Gatekeeper.
+
+- Copy/paste/run the following command. Adjust the file path to the Libation.app on your computer if necessary.
+
+  ```Console
+  xattr -r -d com.apple.quarantine ~/Downloads/Libation.app
+  ```
+- Close the terminal and use Libation!
+
+## If this still doesn't work
+
+- Copy/paste/run the following command (you'll be prompted to enter your Mac password)
+
   ```Console
   sudo spctl --master-disable && sudo spctl --add --label "Libation" /Applications/Libation.app && open /Applications/Libation.app && sudo spctl --master-enable
-  ```  
-- Close the terminal and use Libation!
+  ```
+
+* Close the terminal and use Libation!
+
+## Troubleshooting
+
+If Libation fails to start after completing the above steps, try the following:
+
+1. Right-click the Libation app in your applications folder and select _Show Package Contents_
+2. Open the `Contents` folder and then the `MacOS` folder.
+3. Find the file named `Libation`, right-click it, and then select _Open_.
+
+Libation _should_ launch, and you should now be able to open Libation by just double-clicking the app bundle in your applications folder.
+
 
 ## Running Hangover
 
@@ -30,7 +58,7 @@ Libation comes with a recovery app called Hangover. You can start it by running
 open /Applications/Libation.app --args hangover
 ```
 
-## Runnign LibationCli
+## Running LibationCli
 
 Libation comes with a command-line interface. Unfortunately, due to the way apps are sandboxed on mac, its use is somewhat limited. To open a new sandboxed terminal in LibationCli's directory, run the following command:
 ```Console

Documentation/NamingTemplates.md

@@ -1,3 +1,10 @@
+## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
+
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
+...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
+
+
+
 # Naming Templates
 File and Folder names can be customized using Libation's built-in tag template naming engine. To edit how folder and file names are created, go to Settings \> Download/Decrypt and edit the naming templates. If you're splitting your audiobook into multiple files by chapter, you can also use a custom template to set each chapter's title metadata tag by editing the template in Settings \> Audio File Options.
 

Documentation/SearchingAndFiltering.md

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

Images/libation_glass.svg

@@ -1,28 +1,39 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512" enable-background="new 0 0 512 512">
-<path id="glass" d=
-"M139,2
-	A 192,200 0 0 0 103,84
-	A 222,334 41 0 0 241,320
-	V478
-	H160
-	A 16,16 0 0 0 160,510
-	H352
-	A16 16 0 0 0 352,478
-	H271
-	V320
-	A 222,334 -41 0 0 409,84
-	A 192,200 0 0 0 373,2
-M355,32
-	A 192,200 0 0 1 381,127
-	A 187.5,334 -35 0 1 256,286
-	A 187.5,334 35 0 1 131,127
-	A 192,200 0 0 1 157,32
-	H355
-z" />
-
-<path id="wine-level" d=
-"M146,128
-	A 168,300 35 0 0 256,270
-	A 168,300 -35 0 0 366,128
-z"/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 524 524" enable-background="new 0 0 524 524">
+	<defs>
+		<g id="glass">
+			<path fill-rule="evenodd" d=
+				"M262,8
+					h-117
+					a 192,200 0 0 0 -36,82
+					a 222,334 41 0 0 138,236
+					v158
+					h-81
+					a 16,16 0 0 0 0,32
+					h192
+					a 16 16 0 0 0 0,-32
+					h-81
+					v-158
+					a 222,334 -41 0 0 138,-236
+					a 192,200 0 0 0 -36,-82
+					h-117
+				m-99,30
+					a 192,200 0 0 0 -26,95
+					a 187.5,334 35 0 0 125,159
+					a 187.5,334 -35 0 0 125,-159
+					a 192,200 0 0 0 -26,-95
+					h-198
+				z"/>
+		</g>
+		<g id="wine-level">
+			<path d=
+				"M158,136
+					a 168,305 35 0 0 104,136
+					a 168,305 -35 0 0 104,-136
+				z"/>
+		</g>
+	</defs>	
+	<use href="#glass" stroke="#ffffffa0" stroke-width="16" fill="Transparent" />
+	<use href="#wine-level" stroke="#ffffffa0" stroke-width="16" fill="Transparent" />
+	<use href="#glass" fill="Black" />
+	<use href="#wine-level" fill="Black" />
 </svg>

README.md

@@ -2,9 +2,11 @@
 
 ## [Download Libation](https://github.com/rmcrackan/Libation/releases/latest)
 
-### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/MBucari?locale.x=en_us)
+### If you found this useful, tell a friend. If you found this REALLY useful, you can click here to [PayPal.me](https://paypal.me/mcrackan?locale.x=en_us)
 ...or just tell more friends. As long as I'm maintaining this software, it will remain **free** and **open source**.
 
+
+
 # Table of Contents
 
 - [Audible audiobook manager](#audible-audiobook-manager)
@@ -31,6 +33,7 @@
     - [Custom File Naming](Documentation/NamingTemplates.md)
     - [Command Line Interface](Documentation/Advanced.md#command-line-interface)
 - [Docker](Documentation/Docker.md)
+- [Frequently Asked Questions](Documentation/FrequentlyAskedQuestions.md)
 
 ## Getting started
 

Scripts/Bundle_Debian.sh

@@ -109,9 +109,6 @@ ln -s /usr/lib/libation/LibationCli /usr/bin/libationcli
 if ! grep -q 'fs.inotify.max_user_instances=524288' /etc/sysctl.conf; then
   echo fs.inotify.max_user_instances=524288 | tee -a /etc/sysctl.conf && sysctl -p
 fi
-# workaround until this file is moved to the user's home directory
-touch /usr/lib/libation/appsettings.json
-chmod 666 /usr/lib/libation/appsettings.json
 " >> $FOLDER_DEBIAN/postinst
 
 echo "Creating control file..."

Scripts/Bundle_MacOS.sh

@@ -86,8 +86,12 @@ delfiles=( 'libmp3lame.arm64.so' 'libmp3lame.x64.so' 'libmp3lame.x64.dll' 'libmp
 if [[ "$ARCH" == "arm64" ]]
 then
   delfiles+=('libmp3lame.x64.dylib' 'ffmpegaac.x64.dylib')
+  mv $BUNDLE_MACOS/ffmpegaac.arm64.dylib  $BUNDLE_MACOS/ffmpegaac.dylib
+  mv $BUNDLE_MACOS/libmp3lame.arm64.dylib  $BUNDLE_MACOS/libmp3lame.dylib
 else
   delfiles+=('libmp3lame.arm64.dylib' 'ffmpegaac.arm64.dylib')
+  mv $BUNDLE_MACOS/ffmpegaac.x64.dylib  $BUNDLE_MACOS/ffmpegaac.dylib
+  mv $BUNDLE_MACOS/libmp3lame.x64.dylib  $BUNDLE_MACOS/libmp3lame.dylib
 fi
 
 
@@ -111,4 +115,4 @@ mv $APP_FILE ./bundle/$APP_FILE
 
 rm -r $BUNDLE
 
-echo "Done!"
+echo "Done!"

Scripts/Bundle_Redhat.sh

@@ -94,8 +94,6 @@ install * %{buildroot}%{_libdir}/%{name}/
 
 if [ \$1 -eq 1 ] ; then
   # Initial installation
-  touch %{_libdir}/%{name}/appsettings.json
-  chmod 666 %{_libdir}/%{name}/appsettings.json
   
   ln -s %{_libdir}/%{name}/Libation %{_bindir}/libation
   ln -s %{_libdir}/%{name}/Hangover %{_bindir}/hangover

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="1.1.0" />
+	  <PackageReference Include="AAXClean.Codecs" Version="1.1.3" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/AppScaffolding/AppScaffolding.csproj

@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Version>10.6.4.1</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>11.5.2.1</Version>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="7.1.0" />
-    <PackageReference Include="Serilog.Sinks.ZipFile" Version="1.0.1" />
+    <PackageReference Include="Octokit" Version="11.0.1" />
+    <!-- Do not remove unused Serilog.Sinks -->
+    <!-- Only ZipFile sink is currently used. By user request (June 2024) others packages are included for experimental use. -->
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.ZipFile" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationServices\ApplicationServices.csproj" />
@@ -19,4 +23,4 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>embedded</DebugType>
   </PropertyGroup>
-</Project>
+</Project>

Source/AppScaffolding/LibationScaffolding.cs

@@ -1,21 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using ApplicationServices;
+using ApplicationServices;
 using AudibleUtilities;
-using Dinah.Core;
 using Dinah.Core.IO;
 using Dinah.Core.Logging;
 using LibationFileManager;
-using System.Runtime.InteropServices;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Serilog;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
 
 namespace AppScaffolding
 {
-	public enum ReleaseIdentifier
+    public enum ReleaseIdentifier
 	{
 		None,
 		WindowsClassic = OS.Windows | Variety.Classic | Architecture.X64,
@@ -87,7 +88,8 @@ namespace AppScaffolding
 			//
 
 			Migrations.migrate_to_v6_6_9(config);
-		}
+            Migrations.migrate_to_v11_5_0(config);
+        }
 
 		/// <summary>Initialize logging. Wire-up events. Run after migration</summary>
 		public static void RunPostMigrationScaffolding(Variety variety, Configuration config)
@@ -124,6 +126,9 @@ namespace AppScaffolding
 				{ "MinimumLevel", "Information" },
 				{ "WriteTo", new JArray
 					{
+						// ABOUT SINKS
+						// Only ZipFile sink is currently used. By user request (June 2024) others packages are included for experimental use.
+
 						// new JObject { {"Name", "Console" } }, // this has caused more problems than it's solved
 						new JObject
 						{
@@ -227,12 +232,20 @@ namespace AppScaffolding
 
 			// begin logging session with a form feed
 			Log.Logger.Information("\r\n\f");
-			Log.Logger.Information("Begin. {@DebugInfo}", new
+
+			static int fileCount(FileManager.LongPath longPath)
+            {
+                try { return FileManager.FileUtility.SaferEnumerateFiles(longPath).Count(); }
+                catch { return -1; }
+            }
+
+            Log.Logger.Information("Begin. {@DebugInfo}", new
 			{
 				AppName = EntryAssembly.GetName().Name,
 				Version = BuildVersion.ToString(),
 				ReleaseIdentifier,
 				Configuration.OS,
+                Environment.OSVersion,
                 InteropFactory.InteropFunctionsType,
                 Mode = mode,
 				LogLevel_Verbose_Enabled = Log.Logger.IsVerboseEnabled(),
@@ -242,6 +255,7 @@ namespace AppScaffolding
 				LogLevel_Error_Enabled = Log.Logger.IsErrorEnabled(),
 				LogLevel_Fatal_Enabled = Log.Logger.IsFatalEnabled(),
 
+                config.AutoScan,
                 config.BetaOptIn,
                 config.UseCoverAsFolderIcon,
                 config.LibationFiles,
@@ -250,10 +264,12 @@ namespace AppScaffolding
 				config.InProgress,
 
 				AudibleFileStorage.DownloadsInProgressDirectory,
-				DownloadsInProgressFiles = FileManager.FileUtility.SaferEnumerateFiles(AudibleFileStorage.DownloadsInProgressDirectory).Count(),
+				DownloadsInProgressFiles = fileCount(AudibleFileStorage.DownloadsInProgressDirectory),
 
 				AudibleFileStorage.DecryptInProgressDirectory,
-				DecryptInProgressFiles = FileManager.FileUtility.SaferEnumerateFiles(AudibleFileStorage.DecryptInProgressDirectory).Count(),
+				DecryptInProgressFiles = fileCount(AudibleFileStorage.DecryptInProgressDirectory),
+
+                disableIPv6 = AppContext.TryGetSwitch("System.Net.DisableIPv6", out bool disableIPv6Value),
 			});
 
             if (InteropFactory.InteropFunctionsType is null)
@@ -390,5 +406,55 @@ namespace AppScaffolding
 				UNSAFE_MigrationHelper.Settings_AddUniqueToArray("Serilog.Enrich", "WithExceptionDetails");
 			}
 		}
-	}
+
+        class FilterState_6_6_9
+        {
+            public bool UseDefault { get; set; }
+            public List<string> Filters { get; set; } = new();
+        }
+
+        public static void migrate_to_v11_5_0(Configuration config)
+        {
+            // Read file, but convert old format to new (with Name field) as necessary.
+            if (!File.Exists(QuickFilters.JsonFile))
+            {
+                QuickFilters.InMemoryState = new();
+                return;
+            }
+
+            try
+            {
+                if (JsonConvert.DeserializeObject<QuickFilters.FilterState>(File.ReadAllText(QuickFilters.JsonFile))
+                    is QuickFilters.FilterState inMemState)
+                {
+                    QuickFilters.InMemoryState = inMemState;
+                    return;
+                }
+            }
+            catch
+            {
+                // Eat
+            }
+
+            try
+            {
+                if (JsonConvert.DeserializeObject<FilterState_6_6_9>(File.ReadAllText(QuickFilters.JsonFile))
+                    is FilterState_6_6_9 inMemState)
+                {
+                    // Copy old structure to new.
+                    QuickFilters.InMemoryState = new();
+                    QuickFilters.InMemoryState.UseDefault = inMemState.UseDefault;
+                    foreach (var oldFilter in inMemState.Filters)
+                        QuickFilters.InMemoryState.Filters.Add(new QuickFilters.NamedFilter(oldFilter, null));
+
+                    return;
+                }
+                Debug.Assert(false, "Should not get here, QuickFilters.json deserialization issue");
+            }
+            catch
+            {
+				// Eat
+            }
+        }
+    }
 }

Source/ApplicationServices/ApplicationServices.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="NPOI" Version="2.6.1" />
+    <PackageReference Include="CsvHelper" Version="33.0.1" />
+    <PackageReference Include="NPOI" Version="2.7.0" />
   </ItemGroup>
 
   <ItemGroup>

Source/ApplicationServices/LibraryCommands.cs

@@ -119,9 +119,16 @@ namespace ApplicationServices
 
                 logTime($"pre {nameof(scanAccountsAsync)} all");
                 var libraryOptions = new LibraryOptions
-                {
-                    ResponseGroups = LibraryOptions.ResponseGroupOptions.ALL_OPTIONS,
-                    ImageSizes = LibraryOptions.ImageSizeOptions._500 | LibraryOptions.ImageSizeOptions._1215
+				{
+					ResponseGroups
+					    = LibraryOptions.ResponseGroupOptions.Rating | LibraryOptions.ResponseGroupOptions.Media
+					    | LibraryOptions.ResponseGroupOptions.Relationships | LibraryOptions.ResponseGroupOptions.ProductDesc
+					    | LibraryOptions.ResponseGroupOptions.Contributors | LibraryOptions.ResponseGroupOptions.ProvidedReview
+					    | LibraryOptions.ResponseGroupOptions.ProductPlans | LibraryOptions.ResponseGroupOptions.Series
+					    | LibraryOptions.ResponseGroupOptions.CategoryLadders | LibraryOptions.ResponseGroupOptions.ProductExtendedAttrs
+					    | LibraryOptions.ResponseGroupOptions.PdfUrl | LibraryOptions.ResponseGroupOptions.OriginAsin
+                        | LibraryOptions.ResponseGroupOptions.IsFinished,
+					ImageSizes = LibraryOptions.ImageSizeOptions._500 | LibraryOptions.ImageSizeOptions._1215
                 };
                 var importItems = await scanAccountsAsync(apiExtendedfunc, accounts, libraryOptions);
                 logTime($"post {nameof(scanAccountsAsync)} all");

Source/ApplicationServices/LibraryExporter.cs

@@ -115,6 +115,9 @@ namespace ApplicationServices
 
 		[Name("LastDownloadedVersion")]
         public string LastDownloadedVersion { get; set; }
+
+		[Name("IsFinished")]
+        public bool IsFinished { get; set; }
     }
 	public static class LibToDtos
 	{
@@ -153,8 +156,8 @@ namespace ApplicationServices
 				Language = a.Book.Language,
 				LastDownloaded = a.Book.UserDefinedItem.LastDownloaded,
 				LastDownloadedVersion = a.Book.UserDefinedItem.LastDownloadedVersion?.ToString() ?? "",
-
-			}).ToList();
+                IsFinished = a.Book.UserDefinedItem.IsFinished
+            }).ToList();
 	}
 	public static class LibraryExporter
 	{
@@ -229,6 +232,7 @@ namespace ApplicationServices
                 nameof(ExportDto.Language),
                 nameof(ExportDto.LastDownloaded),
                 nameof(ExportDto.LastDownloadedVersion),
+                nameof(ExportDto.IsFinished)
             };
 			var col = 0;
 			foreach (var c in columns)
@@ -306,6 +310,7 @@ namespace ApplicationServices
 				}
 
                 row.CreateCell(++col).SetCellValue(dto.LastDownloadedVersion);
+                row.CreateCell(++col).SetCellValue(dto.IsFinished);
 
                 rowIndex++;
 			}

Source/AudibleUtilities/ApiExtended.cs

@@ -207,7 +207,11 @@ namespace AudibleUtilities
 			try
 			{
 				var sw = Stopwatch.StartNew();
-				var items = await Api.GetCatalogProductsAsync(asins, CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+				var items = await Api.GetCatalogProductsAsync(asins, CatalogOptions.ResponseGroupOptions.Rating | CatalogOptions.ResponseGroupOptions.Media
+					| CatalogOptions.ResponseGroupOptions.Relationships | CatalogOptions.ResponseGroupOptions.ProductDesc
+					| CatalogOptions.ResponseGroupOptions.Contributors | CatalogOptions.ResponseGroupOptions.ProvidedReview
+					| CatalogOptions.ResponseGroupOptions.ProductPlans | CatalogOptions.ResponseGroupOptions.Series
+					| CatalogOptions.ResponseGroupOptions.CategoryLadders | CatalogOptions.ResponseGroupOptions.ProductExtendedAttrs);
 				sw.Stop();
 
 				Serilog.Log.Logger.Debug($"Batch {batchNum} End: Retrieved {items.Count} items in {sw.ElapsedMilliseconds} ms");

Source/AudibleUtilities/AudibleApiValidators.cs

@@ -90,8 +90,10 @@ namespace AudibleUtilities
 			var distinct = items.GetSeriesDistinct();
 			if (distinct.Any(s => s.SeriesId is null))
 				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesId)}", nameof(items)));
-			if (distinct.Any(s => s.SeriesName is null))
-				exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesName)}", nameof(items)));
+
+			//// unfortunately, a user has a series with no name
+			//if (distinct.Any(s => s.SeriesName is null))
+			//    exceptions.Add(new ArgumentException($"Collection contains {nameof(Item.Series)} with null {nameof(Series.SeriesName)}", nameof(items)));
 
 			return exceptions;
 		}

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="8.4.3.1" />
+    <PackageReference Include="AudibleApi" Version="9.2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/DataLayer/DataLayer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,14 +10,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="7.3.0.1" />
-    <PackageReference Include="Dinah.EntityFrameworkCore" Version="7.3.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
+    <PackageReference Include="Dinah.Core" Version="8.0.0.1" />
+    <PackageReference Include="Dinah.EntityFrameworkCore" Version="8.0.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer/EfClasses/Book.cs

@@ -106,6 +106,7 @@ namespace DataLayer
             ReplaceAuthors(authors);
             ReplaceNarrators(narrators);
         }
+
         public void UpdateTitle(string title, string subtitle)
         {
             Title = title?.Trim() ?? "";
@@ -113,8 +114,11 @@ namespace DataLayer
             _titleWithSubtitle = null;
         }
 
-        #region contributors, authors, narrators
-        internal HashSet<BookContributor> ContributorsLink { get; private set; }
+        public void UpdateLengthInMinutes(int lengthInMinutes)
+            => LengthInMinutes = lengthInMinutes;
+
+		#region contributors, authors, narrators
+		internal HashSet<BookContributor> ContributorsLink { get; private set; }
 
         public IEnumerable<Contributor> Authors => ContributorsLink.ByRole(Role.Author).Select(bc => bc.Contributor).ToList();
         public IEnumerable<Contributor> Narrators => ContributorsLink.ByRole(Role.Narrator).Select(bc => bc.Contributor).ToList();
@@ -187,7 +191,7 @@ namespace DataLayer
 			ArgumentValidator.EnsureNotNull(ladders, nameof(ladders));
 
 			//Replace all existing category ladders.
-            //Some books make have duplocate ladders
+            //Some books make have duplicate ladders
 			CategoriesLink.Clear();
             CategoriesLink.UnionWith(ladders.Distinct().Select(l => new BookCategory(this, l)));
 		}

Source/DataLayer/EfClasses/UserDefinedItem.cs

@@ -195,7 +195,23 @@ namespace DataLayer
                 }
             }
         }
-		#endregion
+        #endregion
+
+        #region IsFinished
+        private bool _isFinished;
+        public bool IsFinished
+        {
+            get => _isFinished;
+            set
+            {
+                if (value != _isFinished)
+                {
+                    _isFinished = value;
+                    OnItemChanged(nameof(IsFinished));
+                }
+            }
+        }
+        #endregion
 
         public override string ToString() => $"{Book} {Rating} {Tags}";
 	}

Source/DataLayer/Migrations/20240911114741_MyComment.Designer.cs

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

Source/DataLayer/Migrations/20240911114741_MyComment.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataLayer.Migrations
+{
+    /// <inheritdoc />
+    public partial class MyComment : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsFinished",
+                table: "UserDefinedItem",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsFinished",
+                table: "UserDefinedItem");
+        }
+    }
+}

Source/DataLayer/Migrations/LibationContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace DataLayer.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "7.0.5");
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.5");
 
             modelBuilder.Entity("CategoryCategoryLadder", b =>
                 {
@@ -312,6 +312,9 @@ namespace DataLayer.Migrations
                             b1.Property<int>("BookStatus")
                                 .HasColumnType("INTEGER");
 
+                            b1.Property<bool>("IsFinished")
+                                .HasColumnType("INTEGER");
+
                             b1.Property<DateTime?>("LastDownloaded")
                                 .HasColumnType("TEXT");
 

Source/DtoImporterService/BookImporter.cs

@@ -149,6 +149,8 @@ namespace DtoImporterService
 		{
 			var item = importItem.DtoItem;
 
+			book.UpdateLengthInMinutes(item.LengthInMinutes);
+
 			// Update the book titles, since formatting can change
 			book.UpdateTitle(item.Title, item.Subtitle);
 
@@ -162,6 +164,9 @@ namespace DtoImporterService
 			if (item.PictureLarge is not null)
 				book.PictureLarge = item.PictureLarge;
 
+			if (item.IsFinished is not null)
+                book.UserDefinedItem.IsFinished = item.IsFinished.Value;
+
             // 2023-02-01
             // updateBook must update language on books which were imported before the migration which added language.
             // Can eventually delete this

Source/DtoImporterService/CategoryImporter.cs

@@ -23,9 +23,11 @@ namespace DtoImporterService
 			loadLocal_categories();
 
 			// upsert
+			//Import item may not have no (null) categories
 			var categoryLadders = importItems
+				.Where(i => i.DtoItem.CategoryLadders is not null)
 				.SelectMany(i => i.DtoItem.CategoryLadders)
-				.Select(cl => cl.Ladder)
+				.Select(cl => cl?.Ladder)
 				.Where(l => l?.Length > 0)
 				.ToList();
 

Source/DtoImporterService/DtoImporterService.csproj

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

Source/FileLiberator/AudioFileStorageExt.cs

@@ -21,7 +21,8 @@ namespace FileLiberator
 				var series = libraryBook.Book.SeriesLink.SingleOrDefault();
 				if (series is not null)
 				{
-					var seriesParent = ApplicationServices.DbContexts.GetContext().GetLibraryBook_Flat_NoTracking(series.Series.AudibleSeriesId);
+					using var context = ApplicationServices.DbContexts.GetContext();
+					var seriesParent = context.GetLibraryBook_Flat_NoTracking(series.Series.AudibleSeriesId);
 
 					if (seriesParent is not null)
 					{

Source/FileLiberator/ConvertToMp3.cs

@@ -60,6 +60,11 @@ namespace FileLiberator
 						config.LameMatchSourceBR,
 						chapters);
 
+					if (m4bBook.AppleTags.Tracks is (int trackNum, int trackCount))
+					{
+						lameConfig.ID3.Track = trackCount > 0 ? $"{trackNum}/{trackCount}" : trackNum.ToString();
+					}
+
 					using var mp3File = File.Open(Path.GetTempFileName(), FileMode.OpenOrCreate, FileAccess.ReadWrite);
 					try
 					{

Source/FileLiberator/DownloadDecryptBook.cs

@@ -375,8 +375,15 @@ namespace FileLiberator
         {
             if (Configuration.Instance.AllowLibationFixup)
             {
-                e = OnRequestCoverArt();
-				abDownloader.SetCoverArt(e);
+                try
+                {
+                    e = OnRequestCoverArt();
+                    abDownloader.SetCoverArt(e);
+                }
+                catch (Exception ex)
+                {
+                    Serilog.Log.Logger.Error(ex, "Failed to retrieve cover art from server.");
+                }
             }
             
             if (e is not null)

Source/FileLiberator/FileLiberator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

Source/FileManager/BackgroundFileSystem.cs

@@ -50,7 +50,7 @@ namespace FileManager
             lock (fsCacheLocker)
             {
                 fsCache.Clear();
-                fsCache.AddRange(FileUtility.SaferEnumerateFiles(RootDirectory, SearchPattern, SearchOption));
+                fsCache.AddRange(SafestEnumerateFiles(RootDirectory));
             }
         }
 
@@ -59,7 +59,7 @@ namespace FileManager
             Stop();
 
             lock (fsCacheLocker)
-                fsCache.AddRange(FileUtility.SaferEnumerateFiles(RootDirectory, SearchPattern, SearchOption));
+                fsCache.AddRange(SafestEnumerateFiles(RootDirectory));
 
             directoryChangesEvents = new BlockingCollection<FileSystemEventArgs>();
 			fileSystemWatcher = new FileSystemWatcher(RootDirectory)
@@ -152,11 +152,23 @@ namespace FileManager
             if (Path.GetFileName(path).Contains("LibationContext.db") || !File.Exists(path) && !Directory.Exists(path))
                 return;
             if (File.GetAttributes(path).HasFlag(FileAttributes.Directory))
-                AddUniqueFiles(FileUtility.SaferEnumerateFiles(path, SearchPattern, SearchOption));
+                AddUniqueFiles(SafestEnumerateFiles(path));
             else
                 AddUniqueFile(path);
         }
 
+        private IEnumerable<LongPath> SafestEnumerateFiles(string path)
+        {
+            try
+            {
+                return FileUtility.SaferEnumerateFiles(path, SearchPattern, SearchOption);
+            }
+            catch
+            {
+                return [];
+            }
+        }
+
         private void AddUniqueFiles(IEnumerable<LongPath> newFiles)
         {
             foreach (var file in newFiles)

Source/FileManager/FileManager.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dinah.Core" Version="7.3.0.1" />
-    <PackageReference Include="Polly" Version="7.2.4" />
+    <PackageReference Include="Dinah.Core" Version="8.0.0.1" />
+    <PackageReference Include="Polly" Version="8.4.1" />
   </ItemGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
 		<TrimMode>copyused</TrimMode>
@@ -21,9 +21,13 @@
 		<ApplicationIcon>hangover.ico</ApplicationIcon>
 	</PropertyGroup>
 
-  <PropertyGroup>
-    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-  </PropertyGroup>
+	<ItemGroup>
+		<RuntimeHostConfigurationOption Include="System.Net.DisableIPv6" Value="true" />
+	</ItemGroup>
+
+	<PropertyGroup>
+		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 		<OutputPath>..\bin\Avalonia\Debug</OutputPath>
@@ -67,13 +71,13 @@
 	</ItemGroup>
 	<ItemGroup>
 
-		<PackageReference Include="Avalonia" Version="11.0.2" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.0.2" />
+		<PackageReference Include="Avalonia" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.2" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.2" />
-		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.2" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.2" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.5" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />

Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/HangoverBase/HangoverBase.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

Source/HangoverWinForms/HangoverWinForms.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
 	<AssemblyName>Hangover</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>
@@ -15,6 +15,10 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
 
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="System.Net.DisableIPv6" Value="true" />
+  </ItemGroup>
+
   <PropertyGroup>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
   </PropertyGroup>

Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\classic</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/Libation.sln

@@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Solution Items", "_Solution Items", "{03C8835F-936C-4AF7-87AE-FF92BDBE8B9B}"
 	ProjectSection(SolutionItems) = preProject
 		REFERENCE.txt = REFERENCE.txt
+		Upgrading dotnet version.txt = Upgrading dotnet version.txt
 		_ARCHITECTURE NOTES.txt = _ARCHITECTURE NOTES.txt
 		_AvaloniaUI Primer.txt = _AvaloniaUI Primer.txt
 		_DB_NOTES.txt = _DB_NOTES.txt

Source/LibationAvalonia/App.axaml

@@ -44,9 +44,9 @@
 
 					<SolidColorBrush x:Key="CancelRed" Color="#802727" />
 					<SolidColorBrush x:Key="IconFill" Color="#DCE0DF" />
-					<SolidColorBrush x:Key="StoplightRed" Color="#5F0707" />
-					<SolidColorBrush x:Key="StoplightYellow" Color="#5F5B1A" />
-					<SolidColorBrush x:Key="StoplightGreen" Color="#174E15" />
+					<SolidColorBrush x:Key="StoplightRed" Color="#7d1f1f" />
+					<SolidColorBrush x:Key="StoplightYellow" Color="#7d7d1f" />
+					<SolidColorBrush x:Key="StoplightGreen" Color="#1f7d1f" />
 
 
 					<SolidColorBrush x:Key="DisabledGrayBrush" Opacity="0.4"  Color="{StaticResource SystemChromeMediumColor}" />
@@ -77,6 +77,10 @@
 		<Style Selector="Button">
 			<Setter Property="VerticalContentAlignment" Value="Center"/>
 		</Style>
+		<Style Selector="ScrollBar">
+			<!-- It's called AutoHide, but this is really the mouseover shrink/expand. -->
+            <Setter Property="AllowAutoHide" Value="false"/>
+		</Style>
 	</Application.Styles>
 
 	<NativeMenu.Menu>

Source/LibationAvalonia/App.axaml.cs

@@ -90,14 +90,10 @@ namespace LibationAvalonia
 
 					if (setupDialog.Config.LibationSettingsAreValid)
 					{
-						var theme
-							= setupDialog.SelectedTheme.Content is nameof(ThemeVariant.Dark)
-							? nameof(ThemeVariant.Dark)
-							: nameof(ThemeVariant.Light);
-
+                        string theme = setupDialog.SelectedTheme.Content as string;
+						
 						setupDialog.Config.SetString(theme, nameof(ThemeVariant));
 
-
 						await RunMigrationsAsync(setupDialog.Config);
 						LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
 						AudibleUtilities.AudibleApiStorage.EnsureAccountsSettingsFileExists();
@@ -208,9 +204,15 @@ namespace LibationAvalonia
 
 		private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
 		{
-			Current.RequestedThemeVariant = Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)) is "Dark" ? ThemeVariant.Dark : ThemeVariant.Light;
+            Current.RequestedThemeVariant = Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)) switch
+            {
+                nameof(ThemeVariant.Dark) => ThemeVariant.Dark,
+                nameof(ThemeVariant.Light) => ThemeVariant.Light,
+				// "System"
+                _ => ThemeVariant.Default
+            };
 
-			//Reload colors for current theme
+            //Reload colors for current theme
 			LoadStyles();
 			var mainWindow = new MainWindow();
 			desktop.MainWindow = MainWindow = mainWindow;

Source/LibationAvalonia/Controls/DirectoryOrCustomSelectControl.axaml.cs

@@ -107,7 +107,7 @@ namespace LibationAvalonia.Controls
 
 				if (known is Configuration.KnownDirectories.None)
 				{
-					directoryState.CustomDir = noSubDir;
+					directoryState.CustomDir = directory;
 					directoryState.CustomChecked = true;
 				}
 				else

Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml

@@ -2,11 +2,13 @@
         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:dialogs="clr-namespace:LibationAvalonia.Dialogs"
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="350"
         Width="800" Height="450"
         x:Class="LibationAvalonia.Dialogs.EditQuickFilters"
         Title="Audible Accounts"
-		Icon="/Assets/libation.ico">
+		Icon="/Assets/libation.ico"
+		x:DataType="dialogs:EditQuickFilters">
 	<Grid RowDefinitions="*,Auto">
 
 		<Grid.Styles>
@@ -43,7 +45,14 @@
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
-				
+
+				<DataGridTextColumn
+    				Width="*"
+				    IsReadOnly="False"
+				    Binding="{Binding Name, Mode=TwoWay}"
+				    Header="Name"/>
+
+
 				<DataGridTextColumn
 					Width="*"
 					IsReadOnly="False"

Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml.cs

@@ -12,8 +12,18 @@ namespace LibationAvalonia.Dialogs
 		public ObservableCollection<Filter> Filters { get; } = new();
 
 		public class Filter : ViewModels.ViewModelBase
-		{
-			private string _filterString;
+		{ 
+            private string _name;
+            public string Name
+            {
+                get => _name;
+                set
+                {
+                    this.RaiseAndSetIfChanged(ref _name, value);
+                }
+            }
+
+            private string _filterString;
 			public string FilterString
 			{
 				get => _filterString;
@@ -25,6 +35,9 @@ namespace LibationAvalonia.Dialogs
 				}
 			}
 			public bool IsDefault { get; private set; } = true;
+
+			public QuickFilters.NamedFilter AsNamedFilter() => new(FilterString, Name);
+
 		}
 		public EditQuickFilters()
 		{
@@ -40,7 +53,7 @@ namespace LibationAvalonia.Dialogs
 
 			ControlToFocusOnShow = this.FindControl<Button>(nameof(saveBtn));
 
-			var allFilters = QuickFilters.Filters.Select(f => new Filter { FilterString = f }).ToList();
+			var allFilters = QuickFilters.Filters.Select(f => new Filter { FilterString = f.Filter, Name = f.Name }).ToList();
 			allFilters.Add(new Filter());
 
 			foreach (var f in allFilters)
@@ -61,7 +74,7 @@ namespace LibationAvalonia.Dialogs
 
 		protected override void SaveAndClose()
 		{
-			QuickFilters.ReplaceAll(Filters.Where(f => !f.IsDefault).Select(f => f.FilterString));
+			QuickFilters.ReplaceAll(Filters.Where(f => !f.IsDefault).Select(x => x.AsNamedFilter()));
 			base.SaveAndClose();
 		}
 

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml

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

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml.cs

@@ -1,11 +1,9 @@
-using Avalonia.Controls;
 using LibationFileManager;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs
 {
-	public partial class LibationFilesDialog : Window
+	public partial class LibationFilesDialog : DialogWindow
 	{
 		private class DirSelectOptions
 		{
@@ -18,28 +16,26 @@ namespace LibationAvalonia.Dialogs
 
 			public string Directory { get; set; } = Configuration.GetKnownDirectoryPath(Configuration.KnownDirectories.UserProfile);
 		}
-		private DirSelectOptions dirSelectOptions;
+
+		private readonly DirSelectOptions dirSelectOptions;
 		public string SelectedDirectory => dirSelectOptions.Directory;
-		public DialogResult DialogResult { get; private set; }
-		public LibationFilesDialog()
+
+		public LibationFilesDialog() : base(saveAndRestorePosition: false)
 		{
 			InitializeComponent();
 
 			DataContext = dirSelectOptions = new();
 		}
 
-		public async Task SaveButtonAsync()
+		public async void Save_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			var libationDir = dirSelectOptions.Directory;
-
-			if (!System.IO.Directory.Exists(libationDir))
+			if (!System.IO.Directory.Exists(SelectedDirectory))
 			{
-				await MessageBox.Show("Not saving change to Libation Files location. This folder does not exist:\r\n" + libationDir, "Folder does not exist", MessageBoxButtons.OK, MessageBoxIcon.Error, saveAndRestorePosition: false);
+				await MessageBox.Show("Not saving change to Libation Files location. This folder does not exist:\r\n" + SelectedDirectory, "Folder does not exist", MessageBoxButtons.OK, MessageBoxIcon.Error, saveAndRestorePosition: false);
 				return;
 			}
 
-			DialogResult = DialogResult.OK;
-			Close(DialogResult);
+			await SaveAndCloseAsync();
 		}
 	}
 }

Source/LibationAvalonia/Dialogs/SettingsDialog.axaml

@@ -2,8 +2,8 @@
         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="900" d:DesignHeight="750"
-		MinWidth="900" MinHeight="750"
+        mc:Ignorable="d" d:DesignWidth="900" d:DesignHeight="200"
+		MinWidth="900" MinHeight="200"
 		Width="900" Height="750"
         x:Class="LibationAvalonia.Dialogs.SettingsDialog"
         xmlns:controls="clr-namespace:LibationAvalonia.Controls"
@@ -46,39 +46,41 @@
 			</TabControl.Styles>
 
 			<TabItem>
-
 				<TabItem.Header>
 					<TextBlock Text="Important Settings"/>
 				</TabItem.Header>
 
-				<settings:Important DataContext="{CompiledBinding ImportantSettings}" />
+				<ScrollViewer VerticalScrollBarVisibility="Auto">
+					<settings:Important DataContext="{CompiledBinding ImportantSettings}" />
+				</ScrollViewer>
 			</TabItem>
-
 			<TabItem>
-
 				<TabItem.Header>
 					<TextBlock Text="Import Library"/>
 				</TabItem.Header>
 
-				<settings:Import DataContext="{CompiledBinding ImportSettings}" />
+				<ScrollViewer VerticalScrollBarVisibility="Auto">
+					<settings:Import DataContext="{CompiledBinding ImportSettings}" />
+				</ScrollViewer>
 			</TabItem>
 
 			<TabItem>
-
 				<TabItem.Header>
 					<TextBlock Text="Download/Decrypt"/>
 				</TabItem.Header>
-
-				<settings:DownloadDecrypt DataContext="{CompiledBinding DownloadDecryptSettings}" />
+				
+				<ScrollViewer VerticalScrollBarVisibility="Auto">
+					<settings:DownloadDecrypt DataContext="{CompiledBinding DownloadDecryptSettings}" />
+				</ScrollViewer>
 			</TabItem>
-
+			
 			<TabItem>
-
 				<TabItem.Header>
 					<TextBlock Text="Audio File Settings"/>
 				</TabItem.Header>
-
-				<settings:Audio DataContext="{CompiledBinding AudioSettings}" />
+				<ScrollViewer VerticalScrollBarVisibility="Auto">
+					<settings:Audio DataContext="{CompiledBinding AudioSettings}" />
+				</ScrollViewer>
 			</TabItem>
 		</TabControl>
 	</Grid>

Source/LibationAvalonia/Dialogs/SetupDialog.axaml

@@ -2,12 +2,14 @@
         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:dialogs="clr-namespace:LibationAvalonia.Dialogs"
         mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="350"
         x:Class="LibationAvalonia.Dialogs.SetupDialog"
 		WindowStartupLocation="CenterScreen"
 		Width="500" Height="350"
 		Icon="/Assets/libation.ico"
-        Title="Welcome to Libation">
+        Title="Welcome to Libation"
+		x:DataType="dialogs:SetupDialog">
 
 	<Grid
 		Margin="10"
@@ -58,6 +60,7 @@
 				SelectedIndex="0"
 				SelectedItem="{Binding SelectedTheme, Mode=OneWayToSource}">
 				<ComboBox.Items>
+                    <ComboBoxItem Content="System" />
 					<ComboBoxItem Content="Light" />
 					<ComboBoxItem Content="Dark" />
 				</ComboBox.Items>

Source/LibationAvalonia/LibationAvalonia.csproj

@@ -3,7 +3,7 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net7.0-windows</TargetFramework>
+		<TargetFramework>net8.0-windows7.0</TargetFramework>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 		<ApplicationIcon>Assets/libation.ico</ApplicationIcon>
@@ -14,6 +14,10 @@
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 		<StartupObject />
 	</PropertyGroup>
+	
+	<ItemGroup>
+		<RuntimeHostConfigurationOption Include="System.Net.DisableIPv6" Value="true" />
+	</ItemGroup>
 
 	<PropertyGroup>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
@@ -69,14 +73,14 @@
 		<UpToDateCheckInput Remove="Controls\GroupBox.axaml" />
 	</ItemGroup>
 
-	<ItemGroup>		
-		<PackageReference Include="Avalonia.Diagnostics" Version="11.0.2" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
-		<PackageReference Include="Avalonia" Version="11.0.2" />
-		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.2" />
-		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.2" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.0.2" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.2" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.2" />
+	<ItemGroup>
+		<PackageReference Include="Avalonia.Diagnostics" Version="11.0.5" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
+		<PackageReference Include="Avalonia" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.5" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/LibationAvalonia/MessageBox.cs

@@ -177,9 +177,12 @@ Libation.
 			tbx.MinWidth = vm.TextBlockMinWidth;
 			tbx.Text = message;
 
-			var thisScreen = owner.Screens.ScreenFromVisual(owner);
+			
+			var thisScreen = owner.Screens?.ScreenFromVisual(owner);
 
-			var maxSize = new Size(0.20 * thisScreen.Bounds.Width, 0.9 * thisScreen.Bounds.Height - 55);
+			var maxSize
+				= thisScreen is null ? owner.ClientSize
+				: new Size(0.20 * thisScreen.Bounds.Width, 0.9 * thisScreen.Bounds.Height - 55);
 
 			var desiredMax = new Size(maxSize.Width, maxSize.Height);
 

Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/LibationAvalonia/ViewModels/MainVM.Filters.cs

@@ -13,12 +13,12 @@ namespace LibationAvalonia.ViewModels
 {
 	partial class MainVM
 	{
-		private string lastGoodFilter = "";
-		private string _filterString;
+		private QuickFilters.NamedFilter lastGoodFilter = new(string.Empty, null);
+		private QuickFilters.NamedFilter _selectedNamedFilter = new(string.Empty, null);
 		private bool _firstFilterIsDefault = true;
 
 		/// <summary> Library filterting query </summary>
-		public string FilterString { get => _filterString; set => this.RaiseAndSetIfChanged(ref _filterString, value); }
+		public QuickFilters.NamedFilter SelectedNamedFilter { get => _selectedNamedFilter; set => this.RaiseAndSetIfChanged(ref _selectedNamedFilter, value); }
 		public AvaloniaList<Control> QuickFilterMenuItems { get; } = new();
 		/// <summary> Indicates if the first quick filter is the default filter </summary>
 		public bool FirstFilterIsDefault { get => _firstFilterIsDefault; set => QuickFilters.UseDefault = this.RaiseAndSetIfChanged(ref _firstFilterIsDefault, value); }
@@ -50,19 +50,19 @@ namespace LibationAvalonia.ViewModels
 			QuickFilterMenuItems.Add(new Separator());
 		}
 
-		public void AddQuickFilterBtn() => QuickFilters.Add(FilterString);
-		public async Task FilterBtn() => await PerformFilter(FilterString);
+		public void AddQuickFilterBtn() => QuickFilters.Add(SelectedNamedFilter);
+		public async Task FilterBtn() => await PerformFilter(SelectedNamedFilter);
 		public async Task FilterHelpBtn() => await new LibationAvalonia.Dialogs.SearchSyntaxDialog().ShowDialog(MainWindow);
 		public void ToggleFirstFilterIsDefault() => FirstFilterIsDefault = !FirstFilterIsDefault;
 		public async Task EditQuickFiltersAsync() => await new LibationAvalonia.Dialogs.EditQuickFilters().ShowDialog(MainWindow);
-		public async Task PerformFilter(string filterString)
+		public async Task PerformFilter(QuickFilters.NamedFilter namedFilter)
 		{
-			FilterString = filterString;
+			SelectedNamedFilter = namedFilter;
 
 			try
 			{
-				await ProductsDisplay.Filter(filterString);
-				lastGoodFilter = filterString;
+				await ProductsDisplay.Filter(namedFilter.Filter);
+				lastGoodFilter = namedFilter;
 			}
 			catch (Exception ex)
 			{
@@ -99,8 +99,8 @@ namespace LibationAvalonia.ViewModels
 			{
 				var command = ReactiveCommand.Create(async () => await PerformFilter(filter));
 
-				var menuItem = new MenuItem { Header = $"{++index}: {filter}", Command = command };
-				var nativeMenuItem = new NativeMenuItem { Header = $"{index}: {filter}", Command = command };
+				var menuItem = new MenuItem { Header = $"{++index}: {(string.IsNullOrWhiteSpace(filter.Name) ? filter.Filter : filter.Name)}", Command = command };
+				var nativeMenuItem = new NativeMenuItem { Header = $"{index}: {(string.IsNullOrWhiteSpace(filter.Name) ? filter.Filter : filter.Name)}", Command = command };
 
 				if (Configuration.IsMacOs && index <= 10)
 				{

Source/LibationAvalonia/ViewModels/ProcessBookViewModel.cs

@@ -265,7 +265,7 @@ namespace LibationAvalonia.ViewModels
 		private byte[] AudioDecodable_RequestCoverArt(object sender, EventArgs e)
 		{
 			var quality
-				= Configuration.Instance.FileDownloadQuality == Configuration.DownloadQuality.High
+				= Configuration.Instance.FileDownloadQuality == Configuration.DownloadQuality.High && LibraryBook.Book.PictureLarge is not null
 				? new PictureDefinition(LibraryBook.Book.PictureLarge, PictureSize.Native)
 				: new PictureDefinition(LibraryBook.Book.PictureId, PictureSize._500x500);
 

Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs

@@ -1,15 +1,18 @@
 using ApplicationServices;
 using AudibleUtilities;
 using Avalonia.Collections;
+using Avalonia.Controls;
 using Avalonia.Threading;
 using DataLayer;
 using LibationAvalonia.Dialogs.Login;
+using LibationFileManager;
 using LibationUiBase.GridView;
 using ReactiveUI;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.ViewModels
@@ -27,8 +30,8 @@ namespace LibationAvalonia.ViewModels
 		public string FilterString { get; private set; }
 		public DataGridCollectionView GridEntries { get; private set; }
 
-		private bool _removeColumnVisivle;
-		public bool RemoveColumnVisivle { get => _removeColumnVisivle; private set => this.RaiseAndSetIfChanged(ref _removeColumnVisivle, value); }
+		private bool _removeColumnVisible;
+		public bool RemoveColumnVisible { get => _removeColumnVisible; private set => this.RaiseAndSetIfChanged(ref _removeColumnVisible, value); }
 
 		public List<LibraryBook> GetVisibleBookEntries()
 			=> FilteredInGridEntries?
@@ -321,7 +324,7 @@ namespace LibationAvalonia.ViewModels
 		{
 			foreach (var item in SOURCE)
 				item.PropertyChanged -= GridEntry_PropertyChanged;
-			RemoveColumnVisivle = false;
+			RemoveColumnVisible = false;
 		}
 
 		public async Task RemoveCheckedBooksAsync()
@@ -376,7 +379,7 @@ namespace LibationAvalonia.ViewModels
 				item.PropertyChanged += GridEntry_PropertyChanged;
 			}
 
-			RemoveColumnVisivle = true;
+			RemoveColumnVisible = true;
 			RemovableCountChanged?.Invoke(this, 0);
 
 			try
@@ -421,5 +424,44 @@ namespace LibationAvalonia.ViewModels
 		}
 
 		#endregion
+
+		#region Column Widths
+
+		public DataGridLength TitleWidth { get => getColumnWidth("Title", 200); set => setColumnWidth("Title", value); }
+		public DataGridLength AuthorsWidth { get => getColumnWidth("Authors", 100); set => setColumnWidth("Authors", value); }
+		public DataGridLength NarratorsWidth { get => getColumnWidth("Narrators", 100); set => setColumnWidth("Narrators", value); }
+		public DataGridLength LengthWidth { get => getColumnWidth("Length", 80); set => setColumnWidth("Length", value); }
+		public DataGridLength SeriesWidth { get => getColumnWidth("Series", 100); set => setColumnWidth("Series", value); }
+		public DataGridLength SeriesOrderWidth { get => getColumnWidth("SeriesOrder", 60); set => setColumnWidth("SeriesOrder", value); }
+		public DataGridLength DescriptionWidth { get => getColumnWidth("Description", 100); set => setColumnWidth("Description", value); }
+		public DataGridLength CategoryWidth { get => getColumnWidth("Category", 100); set => setColumnWidth("Category", value); }
+		public DataGridLength ProductRatingWidth { get => getColumnWidth("ProductRating", 95); set => setColumnWidth("ProductRating", value); }
+		public DataGridLength PurchaseDateWidth { get => getColumnWidth("PurchaseDate", 75); set => setColumnWidth("PurchaseDate", value); }
+		public DataGridLength MyRatingWidth { get => getColumnWidth("MyRating", 95); set => setColumnWidth("MyRating", value); }
+		public DataGridLength MiscWidth { get => getColumnWidth("Misc", 140); set => setColumnWidth("Misc", value); }
+		public DataGridLength LastDownloadWidth { get => getColumnWidth("LastDownload", 100); set => setColumnWidth("LastDownload", value); }
+		public DataGridLength BookTagsWidth { get => getColumnWidth("BookTags", 100); set => setColumnWidth("BookTags", value); }
+
+		private static DataGridLength getColumnWidth(string columnName, double defaultWidth)
+			=> Configuration.Instance.GridColumnsWidths.TryGetValue(columnName, out var val)
+			? new DataGridLength(val)
+			: new DataGridLength(defaultWidth);
+
+		private void setColumnWidth(string columnName, DataGridLength width, [CallerMemberName] string propertyName = "")
+		{
+			var dictionary = Configuration.Instance.GridColumnsWidths;
+
+			var newValue = (int)width.DisplayValue;
+			var valueSame = dictionary.TryGetValue(columnName, out var val) && val == newValue;
+			dictionary[columnName] = newValue;
+
+			if (!valueSame)
+			{
+				Configuration.Instance.GridColumnsWidths = dictionary;
+				this.RaisePropertyChanged(propertyName);
+			}
+		}
+
+		#endregion
 	}
 }

Source/LibationAvalonia/ViewModels/Settings/ImportantSettingsVM.cs

@@ -31,10 +31,10 @@ namespace LibationAvalonia.ViewModels.Settings
 			LoggingLevel = config.LogLevel;
 			GridScaleFactor = scaleFactorToLinearRange(config.GridScaleFactor);
 			GridFontScaleFactor = scaleFactorToLinearRange(config.GridFontScaleFactor);
-			ThemeVariant = initialThemeVariant
-				= Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)) is nameof(Avalonia.Styling.ThemeVariant.Dark)
-				? nameof(Avalonia.Styling.ThemeVariant.Dark)
-				: nameof(Avalonia.Styling.ThemeVariant.Light);
+
+			ThemeVariant = initialThemeVariant = Configuration.Instance.GetString(propertyName: nameof(ThemeVariant));
+			if (string.IsNullOrWhiteSpace(initialThemeVariant)) 
+				ThemeVariant = initialThemeVariant = "System";
 		}
 
 		public void SaveSettings(Configuration config)
@@ -83,7 +83,7 @@ namespace LibationAvalonia.ViewModels.Settings
 		public string GridScaleFactorText { get; } = Configuration.GetDescription(nameof(Configuration.GridScaleFactor));
 		public string GridFontScaleFactorText { get; } = Configuration.GetDescription(nameof(Configuration.GridFontScaleFactor));
 		public string BetaOptInText { get; } = Configuration.GetDescription(nameof(Configuration.BetaOptIn));
-		public string[] Themes { get; } = { nameof(Avalonia.Styling.ThemeVariant.Light), nameof(Avalonia.Styling.ThemeVariant.Dark) };
+		public string[] Themes { get; } = { "System", nameof(Avalonia.Styling.ThemeVariant.Light), nameof(Avalonia.Styling.ThemeVariant.Dark) };
 
 		public string BooksDirectory { get; set; }
 		public bool SavePodcastsToParentFolder { get; set; }

Source/LibationAvalonia/Views/MainWindow.axaml

@@ -191,7 +191,7 @@
 				<Button IsVisible="{CompiledBinding RemoveButtonsVisible}" Command="{CompiledBinding DoneRemovingBtn}" Content="Done Removing Books"/>
 			</StackPanel>
 				
-			<TextBox Grid.Column="1" Margin="10,0,0,0" Name="filterSearchTb" IsVisible="{CompiledBinding !RemoveButtonsVisible}" Text="{CompiledBinding FilterString, Mode=TwoWay}" KeyDown="filterSearchTb_KeyPress" />
+			<TextBox Grid.Column="1" Margin="10,0,0,0" Name="filterSearchTb" IsVisible="{CompiledBinding !RemoveButtonsVisible}" Text="{CompiledBinding SelectedNamedFilter.Filter, Mode=TwoWay}" KeyDown="filterSearchTb_KeyPress" />
 
 			<StackPanel Grid.Column="2" Height="30" Orientation="Horizontal">
 				<Button Name="filterBtn" Command="{CompiledBinding FilterBtn}" VerticalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Content="Filter"/>

Source/LibationAvalonia/Views/MainWindow.axaml.cs

@@ -21,7 +21,7 @@ namespace LibationAvalonia.Views
 			InitializeComponent();
 			Configure_Upgrade();
 
-			Loaded += MainWindow_Loaded;
+			Opened += MainWindow_Opened;
 			Closing += MainWindow_Closing;
 			LibraryLoaded += MainWindow_LibraryLoaded;
 
@@ -35,7 +35,7 @@ namespace LibationAvalonia.Views
 			}
 		}
 
-		private async void MainWindow_Loaded(object sender, EventArgs e)
+		private async void MainWindow_Opened(object sender, EventArgs e)
 		{
 			if (Configuration.Instance.FirstLaunch)
 			{
@@ -79,7 +79,7 @@ namespace LibationAvalonia.Views
 		{
 			if (e.Key == Key.Return)
 			{
-				await ViewModel.PerformFilter(ViewModel.FilterString);
+				await ViewModel.PerformFilter(ViewModel.SelectedNamedFilter);
 
 				// silence the 'ding'
 				e.Handled = true;

Source/LibationAvalonia/Views/ProductsDisplay.axaml

@@ -17,6 +17,7 @@
 			AutoGenerateColumns="False"
 			ItemsSource="{Binding GridEntries}"
 			CanUserSortColumns="True" BorderThickness="3"
+			CanUserResizeColumns="True"
 			CanUserReorderColumns="True">
 
 			<DataGrid.Styles>
@@ -45,10 +46,11 @@
 			</DataGrid.Styles>
 			
 			<DataGrid.Columns>
-
+ 
 				<DataGridTemplateColumn
 					CanUserSort="True"
-					IsVisible="{Binding RemoveColumnVisivle}"
+					CanUserResize="False"
+					IsVisible="{Binding RemoveColumnVisible}"
 					PropertyChanged="RemoveColumn_PropertyChanged"
 					Header="Remove"
 					IsReadOnly="False"
@@ -65,7 +67,7 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</DataGridTemplateColumn>
 
-				<controls:DataGridTemplateColumnExt CanUserSort="True" Header="Liberate" SortMemberPath="Liberate" ClipboardContentBinding="{Binding Liberate.ToolTip}">
+				<controls:DataGridTemplateColumnExt CanUserResize="False" CanUserSort="True" Header="Liberate" SortMemberPath="Liberate" ClipboardContentBinding="{Binding Liberate.ToolTip}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<views:LiberateStatusButton
@@ -80,15 +82,15 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt CanUserSort="False" Header="Cover" SortMemberPath="Cover" ClipboardContentBinding="{Binding LibraryBook.Book.PictureLarge}">
+				<controls:DataGridTemplateColumnExt CanUserResize="False" CanUserSort="False" Header="Cover" SortMemberPath="Cover" ClipboardContentBinding="{Binding LibraryBook.Book.PictureLarge}">
 					<DataGridTemplateColumn.CellTemplate>
-						<DataTemplate  x:DataType="uibase:IGridEntry">
+						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Image Opacity="{CompiledBinding Liberate.Opacity}" Tapped="Cover_Click" Source="{CompiledBinding Cover}" ToolTip.Tip="Click to see full size" />
 						</DataTemplate>
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt MinWidth="150" Width="2*" Header="Title" CanUserSort="True" SortMemberPath="Title" ClipboardContentBinding="{Binding Title}">
+				<controls:DataGridTemplateColumnExt Header="Title" MinWidth="10" Width="{Binding TitleWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Title" ClipboardContentBinding="{Binding Title}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}">
@@ -98,7 +100,7 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt MinWidth="80" Width="1*" Header="Authors" CanUserSort="True" SortMemberPath="Authors" ClipboardContentBinding="{Binding Authors}">
+				<controls:DataGridTemplateColumnExt Header="Authors" MinWidth="10" Width="{Binding AuthorsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Authors" ClipboardContentBinding="{Binding Authors}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}">
@@ -108,7 +110,7 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt MinWidth="80" Width="1*"  Header="Narrators" CanUserSort="True" SortMemberPath="Narrators" ClipboardContentBinding="{Binding Narrators}">
+				<controls:DataGridTemplateColumnExt Header="Narrators" MinWidth="10" Width="{Binding NarratorsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Narrators" ClipboardContentBinding="{Binding Narrators}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}">
@@ -118,7 +120,7 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Width="90"  Header="Length" CanUserSort="True" SortMemberPath="Length" ClipboardContentBinding="{Binding Length}">
+				<controls:DataGridTemplateColumnExt Header="Length" MinWidth="10" Width="{Binding LengthWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Length" ClipboardContentBinding="{Binding Length}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}">
@@ -128,7 +130,7 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt MinWidth="80" Width="1*" Header="Series" CanUserSort="True" SortMemberPath="Series" ClipboardContentBinding="{Binding Series}">
+				<controls:DataGridTemplateColumnExt Header="Series" MinWidth="10" Width="{Binding SeriesWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Series" ClipboardContentBinding="{Binding Series}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}">
@@ -138,7 +140,7 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Width="Auto" Header="Series&#xA;Order" CanUserSort="True" SortMemberPath="SeriesOrder" ClipboardContentBinding="{Binding Series}">
+				<controls:DataGridTemplateColumnExt Header="Series&#xA;Order" MinWidth="10" Width="{Binding SeriesOrderWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="SeriesOrder" ClipboardContentBinding="{Binding Series}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}">
@@ -148,7 +150,7 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt MinWidth="100" Width="1*" Header="Description" CanUserSort="True" SortMemberPath="Description" ClipboardContentBinding="{Binding Description}">
+				<controls:DataGridTemplateColumnExt Header="Description" MinWidth="10" Width="{Binding DescriptionWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Description" ClipboardContentBinding="{Binding Description}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}" Tapped="Description_Click" ToolTip.Tip="Click to see full description" >
@@ -158,7 +160,7 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt Width="100" Header="Category" CanUserSort="True" SortMemberPath="Category" ClipboardContentBinding="{Binding Category}">
+				<controls:DataGridTemplateColumnExt Header="Category" MinWidth="10" Width="{Binding CategoryWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Category" ClipboardContentBinding="{Binding Category}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}">
@@ -172,14 +174,14 @@
 					x:DataType="uibase:IGridEntry"
 					Header="Product&#xA;Rating"
 					IsReadOnly="true"
-					Width="115"
+					MinWidth="10" Width="{Binding ProductRatingWidth, Mode=TwoWay}"
 					SortMemberPath="ProductRating" CanUserSort="True"
 					OpacityBinding="{CompiledBinding Liberate.Opacity}"
 					BackgroundBinding="{CompiledBinding Liberate.BackgroundBrush}"
 					ClipboardContentBinding="{CompiledBinding ProductRating}"
 					Binding="{CompiledBinding ProductRating}" />
 
-				<controls:DataGridTemplateColumnExt Width="90" Header="Purchase&#xA;Date" CanUserSort="True" SortMemberPath="PurchaseDate" ClipboardContentBinding="{Binding PurchaseDate}">
+				<controls:DataGridTemplateColumnExt Header="Purchase&#xA;Date" MinWidth="10" Width="{Binding PurchaseDateWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="PurchaseDate" ClipboardContentBinding="{Binding PurchaseDate}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}">
@@ -191,16 +193,16 @@
 
 				<controls:DataGridMyRatingColumn
 					x:DataType="uibase:IGridEntry"
-					Header="My Rating"					
+					Header="My Rating"
 					IsReadOnly="false"
-					Width="115"
+					MinWidth="10" Width="{Binding MyRatingWidth, Mode=TwoWay}"
 					SortMemberPath="MyRating" CanUserSort="True"
 					OpacityBinding="{CompiledBinding Liberate.Opacity}"
 					BackgroundBinding="{CompiledBinding Liberate.BackgroundBrush}"
 					ClipboardContentBinding="{CompiledBinding MyRating}"					
 					Binding="{CompiledBinding MyRating, Mode=TwoWay}" />
 
-				<controls:DataGridTemplateColumnExt Width="135" Header="Misc" CanUserSort="True" SortMemberPath="Misc" ClipboardContentBinding="{Binding Misc}">
+				<controls:DataGridTemplateColumnExt Header="Misc" MinWidth="10" Width="{Binding MiscWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="Misc" ClipboardContentBinding="{Binding Misc}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}">
@@ -210,7 +212,7 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 				
-				<controls:DataGridTemplateColumnExt Width="102" Header="Last&#xA;Download" CanUserSort="True" SortMemberPath="LastDownload" ClipboardContentBinding="{Binding LastDownload}">
+				<controls:DataGridTemplateColumnExt Header="Last&#xA;Download" MinWidth="10" Width="{Binding LastDownloadWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="LastDownload" ClipboardContentBinding="{Binding LastDownload}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Panel Opacity="{CompiledBinding Liberate.Opacity}" Background="{CompiledBinding Liberate.BackgroundBrush}" ToolTip.Tip="{CompiledBinding LastDownload.ToolTipText}" DoubleTapped="Version_DoubleClick">
@@ -220,7 +222,7 @@
 					</DataGridTemplateColumn.CellTemplate>
 				</controls:DataGridTemplateColumnExt>
 
-				<controls:DataGridTemplateColumnExt CanUserSort="True" Width="100" Header="Tags" SortMemberPath="BookTags" ClipboardContentBinding="{Binding BookTags}">
+				<controls:DataGridTemplateColumnExt Header="Tags" MinWidth="10" Width="{Binding BookTagsWidth, Mode=TwoWay}" CanUserSort="True" SortMemberPath="BookTags" ClipboardContentBinding="{Binding BookTags}">
 					<DataGridTemplateColumn.CellTemplate>
 						<DataTemplate x:DataType="uibase:IGridEntry">
 							<Button

Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs

@@ -11,6 +11,7 @@ using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels;
 using LibationFileManager;
 using LibationUiBase.GridView;
+using ReactiveUI;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -172,126 +173,107 @@ namespace LibationAvalonia.Views
 
 		public void ProductsGrid_CellContextMenuStripNeeded(object sender, DataGridCellContextMenuStripNeededEventArgs args)
 		{
+			var entry = args.GridEntry;
+			var ctx = new GridContextMenu(entry, '_');
+
 			if (args.Column.SortMemberPath is not "Liberate" and not "Cover")
 			{
-				var menuItem = new MenuItem { Header = "_Copy Cell Contents" };
-
-				menuItem.Click += async (s, e)
-					=> await App.MainWindow.Clipboard.SetTextAsync(args.CellClipboardContents);
-
-				args.ContextMenuItems.Add(menuItem);
+				args.ContextMenuItems.Add(new MenuItem
+				{
+					Header = ctx.CopyCellText,
+					Command = ReactiveCommand.CreateFromTask(() => App.MainWindow.Clipboard.SetTextAsync(args.CellClipboardContents))
+				});
 				args.ContextMenuItems.Add(new Separator());
 			}
-			var entry = args.GridEntry;
 
 			#region Liberate all Episodes
 
 			if (entry.Liberate.IsSeries)
 			{
-				var liberateEpisodesMenuItem = new MenuItem()
+				args.ContextMenuItems.Add(new MenuItem()
 				{
-					Header = "_Liberate All Episodes",
-					IsEnabled = ((ISeriesEntry)entry).Children.Any(c => c.Liberate.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload)
-				};
-
-				args.ContextMenuItems.Add(liberateEpisodesMenuItem);
-
-				liberateEpisodesMenuItem.Click += (_, _) => LiberateSeriesClicked?.Invoke(this, ((ISeriesEntry)entry));
+					Header = ctx.LiberateEpisodesText,
+					IsEnabled = ctx.LiberateEpisodesEnabled,
+					Command = ReactiveCommand.Create(() => LiberateSeriesClicked?.Invoke(this, (ISeriesEntry)entry))
+				});
 			}
 
 			#endregion
 			#region Set Download status to Downloaded
 
-			var setDownloadMenuItem = new MenuItem()
+			args.ContextMenuItems.Add(new MenuItem()
 			{
-				Header = "Set Download status to '_Downloaded'",
-				IsEnabled = entry.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated || entry.Liberate.IsSeries
-			};
-
-			args.ContextMenuItems.Add(setDownloadMenuItem);
-
-			if (entry.Liberate.IsSeries)
-				setDownloadMenuItem.Click += (_, __) => ((ISeriesEntry)entry).Children.Select(c => c.LibraryBook).UpdateBookStatus(LiberatedStatus.Liberated);
-			else
-				setDownloadMenuItem.Click += (_, __) => entry.LibraryBook.UpdateBookStatus(LiberatedStatus.Liberated);
+				Header = ctx.SetDownloadedText,
+				IsEnabled = ctx.SetDownloadedEnabled,
+				Command = ReactiveCommand.Create(ctx.SetDownloaded)
+			});
 
 			#endregion
 			#region Set Download status to Not Downloaded
 
-			var setNotDownloadMenuItem = new MenuItem()
+			args.ContextMenuItems.Add(new MenuItem()
 			{
-				Header = "Set Download status to '_Not Downloaded'",
-				IsEnabled = entry.Book.UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated || entry.Liberate.IsSeries
-			};
-
-			args.ContextMenuItems.Add(setNotDownloadMenuItem);
-
-			if (entry.Liberate.IsSeries)
-				setNotDownloadMenuItem.Click += (_, __) => ((ISeriesEntry)entry).Children.Select(c => c.LibraryBook).UpdateBookStatus(LiberatedStatus.NotLiberated);
-			else
-				setNotDownloadMenuItem.Click += (_, __) => entry.LibraryBook.UpdateBookStatus(LiberatedStatus.NotLiberated);
+				Header = ctx.SetNotDownloadedText,
+				IsEnabled = ctx.SetNotDownloadedEnabled,
+				Command = ReactiveCommand.Create(ctx.SetNotDownloaded)
+			});
 
 			#endregion
 			#region Remove from library
 
-			var removeMenuItem = new MenuItem() { Header = "_Remove from library" };
-
-			args.ContextMenuItems.Add(removeMenuItem);
-
-			if (entry.Liberate.IsSeries)
-				removeMenuItem.Click += async (_, __) => await ((ISeriesEntry)entry).Children.Select(c => c.LibraryBook).RemoveBooksAsync();
-			else
-				removeMenuItem.Click += async (_, __) => await Task.Run(entry.LibraryBook.RemoveBook);
+			args.ContextMenuItems.Add(new MenuItem
+			{
+				Header = ctx.RemoveText,
+				Command = ReactiveCommand.CreateFromTask(ctx.RemoveAsync)
+			});
 
 			#endregion
 
 			if (!entry.Liberate.IsSeries)
 			{
 				#region Locate file
-				var locateFileMenuItem = new MenuItem() { Header = "_Locate file..." };
 
-				args.ContextMenuItems.Add(locateFileMenuItem);
-
-				locateFileMenuItem.Click += async (_, __) =>
+				args.ContextMenuItems.Add(new MenuItem
 				{
-					try
+					Header = ctx.LocateFileText,
+					Command = ReactiveCommand.CreateFromTask(async () =>
 					{
-						var window = this.GetParentWindow();
-
-						var openFileDialogOptions = new FilePickerOpenOptions
+						try
 						{
-							Title = $"Locate the audio file for '{entry.Book.TitleWithSubtitle}'",
-							AllowMultiple = false,
-							SuggestedStartLocation = await window.StorageProvider.TryGetFolderFromPathAsync(Configuration.Instance.Books.PathWithoutPrefix),
-							FileTypeFilter = new FilePickerFileType[]
+							var window = this.GetParentWindow();
+
+							var openFileDialogOptions = new FilePickerOpenOptions
 							{
-								new("All files (*.*)") { Patterns = new[] { "*" } },
-							}
-						};
+								Title = ctx.LocateFileDialogTitle,
+								AllowMultiple = false,
+								SuggestedStartLocation = await window.StorageProvider.TryGetFolderFromPathAsync(Configuration.Instance.Books.PathWithoutPrefix),
+								FileTypeFilter = new FilePickerFileType[]
+								{
+									new("All files (*.*)") { Patterns = new[] { "*" } },
+								}
+							};
 
-						var selectedFiles = await window.StorageProvider.OpenFilePickerAsync(openFileDialogOptions);
-						var selectedFile = selectedFiles.SingleOrDefault()?.TryGetLocalPath();
+							var selectedFiles = await window.StorageProvider.OpenFilePickerAsync(openFileDialogOptions);
+							var selectedFile = selectedFiles.SingleOrDefault()?.TryGetLocalPath();
 
-						if (selectedFile is not null)
-							FilePathCache.Insert(entry.AudibleProductId, selectedFile);
-					}
-					catch (Exception ex)
-					{
-						var msg = "Error saving book's location";
-						await MessageBox.ShowAdminAlert(null, msg, msg, ex);
-					}
-				};
+							if (selectedFile is not null)
+								FilePathCache.Insert(entry.AudibleProductId, selectedFile);
+						}
+						catch (Exception ex)
+						{
+							await MessageBox.ShowAdminAlert(null, ctx.LocateFileErrorMessage, ctx.LocateFileErrorMessage, ex);
+						}
+					})
+				});
 
 				#endregion
 				#region Convert to Mp3
-				var convertToMp3MenuItem = new MenuItem
+				args.ContextMenuItems.Add(new MenuItem
 				{
-					Header = "_Convert to Mp3",
-					IsEnabled = entry.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated
-				};
-				args.ContextMenuItems.Add(convertToMp3MenuItem);
-
-				convertToMp3MenuItem.Click += (_, _) => ConvertToMp3Clicked?.Invoke(this, entry.LibraryBook);
+					Header = ctx.ConvertToMp3Text,
+					IsEnabled = ctx.ConvertToMp3Enabled,
+					Command = ReactiveCommand.Create(() => ConvertToMp3Clicked?.Invoke(this, entry.LibraryBook))
+				});
 
 				#endregion
 			}
@@ -299,34 +281,72 @@ namespace LibationAvalonia.Views
 			#region Force Re-Download
 			if (!entry.Liberate.IsSeries)
 			{
-				var reDownloadMenuItem = new MenuItem()
+				args.ContextMenuItems.Add(new MenuItem()
 				{
-					Header = "Re-download this audiobook",
-					IsEnabled = entry.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated
-				};
-
-				args.ContextMenuItems.Add(reDownloadMenuItem);
-				reDownloadMenuItem.Click += (s, _) =>
-				{
-					//No need to persist this change. It only needs to last long for the file to start downloading
-					entry.Book.UserDefinedItem.BookStatus = LiberatedStatus.NotLiberated;
-					LiberateClicked?.Invoke(s, entry.LibraryBook);
-				};
+					Header = ctx.ReDownloadText,
+					IsEnabled = ctx.ReDownloadEnabled,
+					Command = ReactiveCommand.Create(() =>
+					{
+						//No need to persist this change. It only needs to last long for the file to start downloading
+						entry.Book.UserDefinedItem.BookStatus = LiberatedStatus.NotLiberated;
+						LiberateClicked?.Invoke(this, entry.LibraryBook);
+					})
+				});
 			}
 			#endregion
 
 			args.ContextMenuItems.Add(new Separator());
 
+			#region Edit Templates
+			async Task editTemplate<T>(LibraryBook libraryBook, string existingTemplate, Action<string> setNewTemplate)
+				where T : Templates, LibationFileManager.ITemplate, new()
+			{
+				var template = ctx.CreateTemplateEditor<T>(libraryBook, existingTemplate);
+				var form = new EditTemplateDialog(template);
+				if (await form.ShowDialog<DialogResult>(this.GetParentWindow()) == DialogResult.OK)
+				{
+					setNewTemplate(template.EditingTemplate.TemplateText);
+				}
+			}
+
+			if (!entry.Liberate.IsSeries)
+			{
+				args.ContextMenuItems.Add(new MenuItem
+				{
+					Header = ctx.EditTemplatesText,
+					ItemsSource = new[]
+					{
+						new MenuItem
+						{
+							Header = ctx.FolderTemplateText,
+							Command = ReactiveCommand.CreateFromTask(() => editTemplate<Templates.FolderTemplate>(entry.LibraryBook, Configuration.Instance.FolderTemplate, t => Configuration.Instance.FolderTemplate = t))
+						},
+						new MenuItem
+						{
+							Header = ctx.FileTemplateText,
+							Command = ReactiveCommand.CreateFromTask(() => editTemplate<Templates.FileTemplate>(entry.LibraryBook, Configuration.Instance.FileTemplate, t => Configuration.Instance.FileTemplate = t))
+						},
+						new MenuItem
+						{
+							Header = ctx.MultipartTemplateText,
+							Command = ReactiveCommand.CreateFromTask(() => editTemplate<Templates.ChapterFileTemplate>(entry.LibraryBook, Configuration.Instance.ChapterFileTemplate, t => Configuration.Instance.ChapterFileTemplate = t))
+						}
+					}
+				});
+				args.ContextMenuItems.Add(new Separator());
+			}
+
+			#endregion
+
 			#region View Bookmarks/Clips
 
 			if (!entry.Liberate.IsSeries)
 			{
-
-				var bookRecordMenuItem = new MenuItem { Header = "View _Bookmarks/Clips" };
-
-				args.ContextMenuItems.Add(bookRecordMenuItem);
-
-				bookRecordMenuItem.Click += async (_, _) => await new BookRecordsDialog(entry.LibraryBook).ShowDialog(VisualRoot as Window);
+				args.ContextMenuItems.Add(new MenuItem
+				{
+					Header = ctx.ViewBookmarksText,
+					Command = ReactiveCommand.CreateFromTask(() => new BookRecordsDialog(entry.LibraryBook).ShowDialog(VisualRoot as Window))
+				});
 			}
 
 			#endregion
@@ -334,12 +354,11 @@ namespace LibationAvalonia.Views
 
 			if (entry.Book.SeriesLink.Any())
 			{
-				var header = entry.Liberate.IsSeries ? "View All Episodes in Series" : "View All Books in Series";
-				var viewSeriesMenuItem = new MenuItem { Header = header };
-
-				args.ContextMenuItems.Add(viewSeriesMenuItem);
-
-				viewSeriesMenuItem.Click += (_, _) => new SeriesViewDialog(entry.LibraryBook).Show();
+				args.ContextMenuItems.Add(new MenuItem
+				{
+					Header = ctx.ViewSeriesText,
+					Command = ReactiveCommand.Create(() => new SeriesViewDialog(entry.LibraryBook).Show())
+				});
 			}
 
 			#endregion

Source/LibationCli/LibationCli.csproj

@@ -3,7 +3,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net7.0-windows</TargetFramework>
+		<TargetFramework>net8.0-windows7.0</TargetFramework>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<PublishReadyToRun>true</PublishReadyToRun>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -11,6 +11,10 @@
 		<IsPublishable>True</IsPublishable>
 	</PropertyGroup>
 
+	<ItemGroup>
+		<RuntimeHostConfigurationOption Include="System.Net.DisableIPv6" Value="true" />
+	</ItemGroup>
+
 	<PropertyGroup>
 		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
 	</PropertyGroup>

Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\Linux-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\MacOS-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml

@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\bin\Publish\Windows-chardonnay</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Source/LibationFileManager/AudibleFileStorage.cs

@@ -8,126 +8,136 @@ using Dinah.Core;
 using System.Threading.Tasks;
 using System.Threading;
 using FileManager;
+using AaxDecrypter;
 
 #nullable enable
 namespace LibationFileManager
 {
-    public abstract class AudibleFileStorage
-    {
-        protected abstract LongPath? GetFilePathCustom(string productId);
-        protected abstract List<LongPath> GetFilePathsCustom(string productId);
+	public abstract class AudibleFileStorage
+	{
+		protected abstract LongPath? GetFilePathCustom(string productId);
+		protected abstract List<LongPath> GetFilePathsCustom(string productId);
 
-        #region static
-        public static LongPath DownloadsInProgressDirectory => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).FullName;
-        public static LongPath DecryptInProgressDirectory => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DecryptInProgress")).FullName;
+		#region static
+		public static LongPath DownloadsInProgressDirectory => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DownloadsInProgress")).FullName;
+		public static LongPath DecryptInProgressDirectory => Directory.CreateDirectory(Path.Combine(Configuration.Instance.InProgress, "DecryptInProgress")).FullName;
 
-        static AudibleFileStorage()
+		static AudibleFileStorage()
 		{
 			//Clean up any partially-decrypted files from previous Libation instances.
-			//Do no clean DownloadsInProgressDirectory because those files are resumable
-			foreach (var tempFile in Directory.EnumerateFiles(DecryptInProgressDirectory))
-				FileUtility.SaferDelete(tempFile);
+			//Do not clean DownloadsInProgressDirectory. Those files are resumable.
+			try
+            {
+                foreach (var tempFile in FileUtility.SaferEnumerateFiles(DecryptInProgressDirectory))
+                    FileUtility.SaferDelete(tempFile);
+            }
+            catch (Exception ex)
+            {
+                // since this is a static constructor which may be called very early, do not assume Serilog is initialized
+                try { Serilog.Log.Error(ex, "Error cleaning up partially-decrypted files"); }
+				catch { }
+            }
 		}
 
 
 		private static AaxcFileStorage AAXC { get; } = new AaxcFileStorage();
-        public static bool AaxcExists(string productId) => AAXC.Exists(productId);
+		public static bool AaxcExists(string productId) => AAXC.Exists(productId);
 
-        public static AudioFileStorage Audio { get; } = new AudioFileStorage();
+		public static AudioFileStorage Audio { get; } = new AudioFileStorage();
 
-        public static LongPath BooksDirectory
-        {
-            get
-            {
-                if (string.IsNullOrWhiteSpace(Configuration.Instance.Books))
-                    Configuration.Instance.Books = Path.Combine(Configuration.UserProfile, "Books");
-                return Directory.CreateDirectory(Configuration.Instance.Books).FullName;
-            }
-        }
-        #endregion
+		public static LongPath BooksDirectory
+		{
+			get
+			{
+				if (string.IsNullOrWhiteSpace(Configuration.Instance.Books))
+					Configuration.Instance.Books = Path.Combine(Configuration.UserProfile, "Books");
+				return Directory.CreateDirectory(Configuration.Instance.Books).FullName;
+			}
+		}
+		#endregion
 
-        #region instance
-        private FileType FileType { get; }
-        private string regexTemplate { get; }
+		#region instance
+		private FileType FileType { get; }
+		private string regexTemplate { get; }
 
-        protected AudibleFileStorage(FileType fileType)
-        {
-            FileType = fileType;
+		protected AudibleFileStorage(FileType fileType)
+		{
+			FileType = fileType;
 
-            var extAggr = FileTypes.GetExtensions(FileType).Aggregate((a, b) => $"{a}|{b}");
-            regexTemplate = $@"{{0}}.*?\.({extAggr})$";
-        }
+			var extAggr = FileTypes.GetExtensions(FileType).Aggregate((a, b) => $"{a}|{b}");
+			regexTemplate = $@"{{0}}.*?\.({extAggr})$";
+		}
 
-        protected LongPath? GetFilePath(string productId)
-        {
-            // primary lookup
-            var cachedFile = FilePathCache.GetFirstPath(productId, FileType);
-            if (cachedFile is not null && File.Exists(cachedFile))
-                return cachedFile;
+		protected LongPath? GetFilePath(string productId)
+		{
+			// primary lookup
+			var cachedFile = FilePathCache.GetFirstPath(productId, FileType);
+			if (cachedFile is not null && File.Exists(cachedFile))
+				return cachedFile;
 
-            // secondary lookup attempt
-            var firstOrNull = GetFilePathCustom(productId);
-            if (firstOrNull is not null)
-                FilePathCache.Insert(productId, firstOrNull);
+			// secondary lookup attempt
+			var firstOrNull = GetFilePathCustom(productId);
+			if (firstOrNull is not null)
+				FilePathCache.Insert(productId, firstOrNull);
 
-            return firstOrNull;
-        }
+			return firstOrNull;
+		}
 
-        public List<LongPath> GetPaths(string productId)
-            => GetFilePathsCustom(productId);
+		public List<LongPath> GetPaths(string productId)
+			=> GetFilePathsCustom(productId);
 
-        protected Regex GetBookSearchRegex(string productId)
-        {
-            var pattern = string.Format(regexTemplate, productId);
-            return new Regex(pattern, RegexOptions.IgnoreCase);
-        }
-        #endregion
-    }
+		protected Regex GetBookSearchRegex(string productId)
+		{
+			var pattern = string.Format(regexTemplate, productId);
+			return new Regex(pattern, RegexOptions.IgnoreCase);
+		}
+		#endregion
+	}
 
-    internal class AaxcFileStorage : AudibleFileStorage
-    {
-        internal AaxcFileStorage() : base(FileType.AAXC) { }
+	internal class AaxcFileStorage : AudibleFileStorage
+	{
+		internal AaxcFileStorage() : base(FileType.AAXC) { }
 
-        protected override LongPath? GetFilePathCustom(string productId)
-            => GetFilePathsCustom(productId).FirstOrDefault();
+		protected override LongPath? GetFilePathCustom(string productId)
+			=> GetFilePathsCustom(productId).FirstOrDefault();
 
-        protected override List<LongPath> GetFilePathsCustom(string productId)
-        {
-            var regex = GetBookSearchRegex(productId);
-            return FileUtility
-                .SaferEnumerateFiles(DownloadsInProgressDirectory, "*.*", SearchOption.AllDirectories)
-                .Where(s => regex.IsMatch(s)).ToList();
-        }
+		protected override List<LongPath> GetFilePathsCustom(string productId)
+		{
+			var regex = GetBookSearchRegex(productId);
+			return FileUtility
+				.SaferEnumerateFiles(DownloadsInProgressDirectory, "*.*", SearchOption.AllDirectories)
+				.Where(s => regex.IsMatch(s)).ToList();
+		}
 
-        public bool Exists(string productId) => GetFilePath(productId) is not null;
-    }
+		public bool Exists(string productId) => GetFilePath(productId) is not null;
+	}
 
-    public class AudioFileStorage : AudibleFileStorage
-    {
-        internal AudioFileStorage() : base(FileType.Audio)
-            => BookDirectoryFiles ??= newBookDirectoryFiles();
+	public class AudioFileStorage : AudibleFileStorage
+	{
+		internal AudioFileStorage() : base(FileType.Audio)
+			=> BookDirectoryFiles ??= newBookDirectoryFiles();
 
-        private static BackgroundFileSystem? BookDirectoryFiles { get; set; }
-        private static object bookDirectoryFilesLocker { get; } = new();
+		private static BackgroundFileSystem? BookDirectoryFiles { get; set; }
+		private static object bookDirectoryFilesLocker { get; } = new();
 		private static EnumerationOptions enumerationOptions { get; } = new()
 		{
 			RecurseSubdirectories = true,
 			IgnoreInaccessible = true,
-			MatchCasing = MatchCasing.CaseInsensitive
+			AttributesToSkip = FileAttributes.Hidden,
 		};
 
 		protected override LongPath? GetFilePathCustom(string productId)
-            => GetFilePathsCustom(productId).FirstOrDefault();
+			=> GetFilePathsCustom(productId).FirstOrDefault();
 
-        private static BackgroundFileSystem newBookDirectoryFiles()
-            => new BackgroundFileSystem(BooksDirectory, "*.*", SearchOption.AllDirectories);
+		private static BackgroundFileSystem newBookDirectoryFiles()
+			=> new BackgroundFileSystem(BooksDirectory, "*.*", SearchOption.AllDirectories);
 
 		protected override List<LongPath> GetFilePathsCustom(string productId)
-        {
-            // If user changed the BooksDirectory: reinitialize
-            lock (bookDirectoryFilesLocker)
-                if (BooksDirectory != BookDirectoryFiles?.RootDirectory)
-                    BookDirectoryFiles = newBookDirectoryFiles();
+		{
+			// If user changed the BooksDirectory: reinitialize
+			lock (bookDirectoryFilesLocker)
+				if (BooksDirectory != BookDirectoryFiles?.RootDirectory)
+					BookDirectoryFiles = newBookDirectoryFiles();
 
 			var regex = GetBookSearchRegex(productId);
 
@@ -135,44 +145,60 @@ namespace LibationFileManager
 			//using both the file system and the file path cache
 			return
 				FilePathCache
-                .GetFiles(productId)
-                .Where(c => c.fileType == FileType.Audio && File.Exists(c.path))
-                .Select(c => c.path)
-                .Union(BookDirectoryFiles.FindFiles(regex))
-                .ToList();
-        }
+				.GetFiles(productId)
+				.Where(c => c.fileType == FileType.Audio && File.Exists(c.path))
+				.Select(c => c.path)
+				.Union(BookDirectoryFiles.FindFiles(regex))
+				.ToList();
+		}
 
-        public void Refresh()
-        {
-            if (BookDirectoryFiles is null)
-                lock (bookDirectoryFilesLocker)
-                    BookDirectoryFiles = newBookDirectoryFiles();
-            else
-                BookDirectoryFiles?.RefreshFiles();
-        }
+		public void Refresh()
+		{
+			if (BookDirectoryFiles is null)
+				lock (bookDirectoryFilesLocker)
+					BookDirectoryFiles = newBookDirectoryFiles();
+			else
+				BookDirectoryFiles?.RefreshFiles();
+		}
 
-        public LongPath? GetPath(string productId) => GetFilePath(productId);
+		public LongPath? GetPath(string productId) => GetFilePath(productId);
 
 		public static async IAsyncEnumerable<FilePathCache.CacheEntry> FindAudiobooksAsync(LongPath searchDirectory, [EnumeratorCancellation] CancellationToken cancellationToken)
 		{
 			ArgumentValidator.EnsureNotNull(searchDirectory, nameof(searchDirectory));
 
-			foreach (LongPath path in Directory.EnumerateFiles(searchDirectory, "*.M4B", enumerationOptions))
+			foreach (LongPath path in Directory.EnumerateFiles(searchDirectory, "*.*", enumerationOptions))
 			{
 				if (cancellationToken.IsCancellationRequested)
 					yield break;
 
+				if (getFormatByExtension(path) is not OutputFormat format)
+					continue;
+
 				FilePathCache.CacheEntry? audioFile = default;
 
 				try
 				{
-					using var fileStream = File.OpenRead(path);
+					if (format is OutputFormat.M4b)
+					{
+						var tags = await Task.Run(() => AAXClean.AppleTags.FromFile(path));
 
-					var mp4File = await Task.Run(() => new AAXClean.Mp4File(fileStream), cancellationToken);
+						if (tags?.Asin is not null)
+							audioFile = new FilePathCache.CacheEntry(tags.Asin, FileType.Audio, path);
+					}
+					else
+					{
+						using var fileStream = File.OpenRead(path);
+						var id3 = await Task.Run(() => NAudio.Lame.ID3.Id3Tag.Create(fileStream));
 
-					if (mp4File?.AppleTags?.Asin is not null)
-						audioFile = new FilePathCache.CacheEntry(mp4File.AppleTags.Asin, FileType.Audio, path);
+						var asin = id3?.Children
+							.OfType<NAudio.Lame.ID3.TXXXFrame>()
+							.FirstOrDefault(f => f.FieldName == "AUDIBLE_ASIN")
+							?.FieldValue;
 
+						if (!string.IsNullOrWhiteSpace(asin))
+							audioFile = new FilePathCache.CacheEntry(asin, FileType.Audio, path);
+					}
 				}
 				catch (Exception ex)
 				{
@@ -186,6 +212,15 @@ namespace LibationFileManager
 				if (audioFile is not null)
 					yield return audioFile;
 			}
+
+			static OutputFormat? getFormatByExtension(string path)
+			{
+				var ext = Path.GetExtension(path).ToLower();
+
+				return ext == ".mp3" ? OutputFormat.Mp3
+					: ext == ".m4b" ? OutputFormat.M4b
+					: null;
+			}
 		}
 	}
 }

Source/LibationFileManager/Configuration.LibationFiles.cs

@@ -6,6 +6,7 @@ using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
 using Serilog;
 using Dinah.Core.Logging;
+using System.Diagnostics;
 
 #nullable enable
 namespace LibationFileManager
@@ -75,17 +76,19 @@ namespace LibationFileManager
 			const string appsettings_filename = "appsettings.json";
 
 			//Possible appsettings.json locations, in order of preference.
-			string[] possibleAppsettingsFiles = new[]
+			string[] possibleAppsettingsDirectories = new[]
 			{
-				Path.Combine(ProcessDirectory, appsettings_filename),
-				Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Libation", appsettings_filename),
-				Path.Combine(UserProfile, appsettings_filename),
-				Path.Combine(Path.GetTempPath(), "Libation", appsettings_filename)
+				ProcessDirectory,
+				Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Libation"),
+				UserProfile,
+				Path.Combine(Path.GetTempPath(), "Libation")
 			};
 
 			//Try to find and validate appsettings.json in each folder
-			foreach (var appsettingsFile in possibleAppsettingsFiles)
+			foreach (var dir in possibleAppsettingsDirectories)
 			{
+				var appsettingsFile = Path.Combine(dir, appsettings_filename);
+
 				if (File.Exists(appsettingsFile))
 				{
 					try
@@ -104,10 +107,13 @@ namespace LibationFileManager
 
 			//Valid appsettings.json not found. Try to create it in each folder.
 			var endingContents = new JObject { { LIBATION_FILES_KEY, UserProfile } }.ToString(Formatting.Indented);
-			foreach (var appsettingsFile in possibleAppsettingsFiles)
+			foreach (var dir in possibleAppsettingsDirectories)
 			{
+				var appsettingsFile = Path.Combine(dir, appsettings_filename);
+
 				try
 				{
+					Directory.CreateDirectory(dir);
 					File.WriteAllText(appsettingsFile, endingContents);
 					return appsettingsFile;
 				}
@@ -121,16 +127,56 @@ namespace LibationFileManager
 		}
 
 		private static string getLibationFilesSettingFromJson()
-        {
-            // do not check whether directory exists. special/meta directory (eg: AppDir) is valid
-            // verify from live file. no try/catch. want failures to be visible
-            var jObjFinal = JObject.Parse(File.ReadAllText(AppsettingsJsonFile));
+		{
+			// do not check whether directory exists. special/meta directory (eg: AppDir) is valid
+			// verify from live file. no try/catch. want failures to be visible
+			var jObjFinal = JObject.Parse(File.ReadAllText(AppsettingsJsonFile));
 
 			if (jObjFinal[LIBATION_FILES_KEY]?.Value<string>() is not string valueFinal)
 				throw new InvalidDataException($"{LIBATION_FILES_KEY} not found in {AppsettingsJsonFile}");
 
-            return valueFinal;
-        }
+			if (IsWindows)
+			{
+				valueFinal = Environment.ExpandEnvironmentVariables(valueFinal);
+			}
+			else
+			{
+				//If the shell command fails and returns null, proceed with the verbatim
+				//LIBATION_FILES_KEY path and hope for the best. If Libation can't find
+				//anything at this path it will set LIBATION_FILES_KEY to UserProfile
+				valueFinal = runShellCommand("echo " + valueFinal) ?? valueFinal;
+			}
+
+			return valueFinal;
+
+			static string? runShellCommand(string command)
+			{
+				var psi = new ProcessStartInfo
+				{
+					FileName = "/bin/sh",
+					RedirectStandardOutput = true,
+					UseShellExecute = false,
+					CreateNoWindow = true,
+					ArgumentList =
+					{
+						"-c",
+						command
+					}
+				};
+
+				try
+				{
+					var proc = Process.Start(psi);
+					proc?.WaitForExit();
+					return proc?.StandardOutput?.ReadToEnd()?.Trim();
+				}
+				catch (Exception e)
+				{
+					Serilog.Log.Error(e, "Failed to run shell command. {Arguments}", psi.ArgumentList);
+					return null;
+				}
+			}
+		}
 
         public static void SetLibationFiles(string directory)
         {

Source/LibationFileManager/Configuration.PersistentSettings.cs

@@ -321,7 +321,7 @@ namespace LibationFileManager
 			set => setTemplate<Templates.ChapterFileTemplate>(value);
 		}
 
-		[Description("How to format the file's Tile stored in metadata")]
+		[Description("How to format the file's Title stored in metadata")]
 		public string ChapterTitleTemplate
 		{
 			get => getTemplate<Templates.ChapterTitleTemplate>();

Source/LibationFileManager/InteropFactory.cs

@@ -95,9 +95,9 @@ namespace LibationFileManager
             var assembly = CurrentDomain_AssemblyResolve_internal(asmName, here: here);
             lowEffortCache[key] = assembly;
 
-            //Let the runtime handle any dll not found exceptions.
+            // Let the runtime handle any dll not found exceptions
             if (assembly is null)
-                Serilog.Log.Logger.Error($"Unable to load module {args.Name}");
+                Serilog.Log.Logger.Warning($"Unable to load module {args.Name}");
 
             return assembly;
         }

Source/LibationFileManager/LibationFileManager.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="NameParserSharp" Version="1.5.0" />
     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
   </ItemGroup>

Source/LibationFileManager/QuickFilters.cs

@@ -1,9 +1,9 @@
-using System;
+using Dinah.Core.Collections.Generic;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Dinah.Core.Collections.Generic;
-using Newtonsoft.Json;
 
 #nullable enable
 namespace LibationFileManager
@@ -14,24 +14,21 @@ namespace LibationFileManager
 
 		public static event EventHandler? UseDefaultChanged;
 
-		internal class FilterState
+        public class FilterState
         {
             public bool UseDefault { get; set; }
-            public List<string> Filters { get; set; } = new List<string>();
+            public List<NamedFilter> Filters { get; set; } = new();
         }
 
         public static string JsonFile => Path.Combine(Configuration.Instance.LibationFiles, "QuickFilters.json");
 
 
-		// load json into memory. if file doesn't exist, nothing to do. save() will create if needed
-		static FilterState inMemoryState { get; }
-            = File.Exists(JsonFile) && JsonConvert.DeserializeObject<FilterState>(File.ReadAllText(JsonFile)) is FilterState inMemState
-            ? inMemState
-            : new FilterState();
+        // load json into memory. if file doesn't exist, nothing to do. save() will create if needed
+        public static FilterState InMemoryState { get; set; } = null!;
 
         public static bool UseDefault
         {
-            get => inMemoryState.UseDefault;
+            get => InMemoryState.UseDefault;
             set
             {
                 if (UseDefault == value)
@@ -39,7 +36,7 @@ namespace LibationFileManager
 
                 lock (locker)
                 {
-                    inMemoryState.UseDefault = value;
+                    InMemoryState.UseDefault = value;
                     save(false);
                 }
 
@@ -47,68 +44,81 @@ namespace LibationFileManager
             }
         }
 
-        public static IEnumerable<string> Filters => inMemoryState.Filters.AsReadOnly();
-
-        public static void Add(string filter)
+        // Note that records overload equality automagically, so should be able to
+        // compare these the same way as comparing simple strings.
+        public record NamedFilter(string Filter, string Name)
         {
-            if (string.IsNullOrWhiteSpace(filter))
+            public string Filter { get; set; } = Filter;
+            public string? Name { get; set; } = Name;
+        }
+
+        public static IEnumerable<NamedFilter> Filters => InMemoryState.Filters.AsReadOnly();
+
+        public static void Add(NamedFilter namedFilter)
+        {
+            if (namedFilter == null) 
+                throw new ArgumentNullException(nameof(namedFilter));
+
+            if (string.IsNullOrWhiteSpace(namedFilter.Filter))
                 return;
-            filter = filter.Trim();
+            namedFilter.Filter = namedFilter.Filter?.Trim() ?? string.Empty;
+            namedFilter.Name = namedFilter.Name?.Trim() ?? null;
 
             lock (locker)
             {
-                // check for duplicate
-                if (inMemoryState.Filters.ContainsInsensative(filter))
+                // check for duplicates
+                if (InMemoryState.Filters.Select(x => x.Filter).ContainsInsensative(namedFilter.Filter))
                     return;
 
-                inMemoryState.Filters.Add(filter);
+                InMemoryState.Filters.Add(namedFilter);
                 save();
             }
         }
 
-        public static void Remove(string filter)
+        public static void Remove(NamedFilter filter)
         {
             lock (locker)
             {
-                inMemoryState.Filters.Remove(filter);
+                InMemoryState.Filters.Remove(filter);
                 save();
             }
         }
 
-        public static void Edit(string oldFilter, string newFilter)
+        public static void Edit(NamedFilter oldFilter, NamedFilter newFilter)
         {
             lock (locker)
             {
-                var index = inMemoryState.Filters.IndexOf(oldFilter);
+                var index = InMemoryState.Filters.IndexOf(oldFilter);
                 if (index < 0)
                     return;
 
-                inMemoryState.Filters = inMemoryState.Filters.Select(f => f == oldFilter ? newFilter : f).ToList();
+                InMemoryState.Filters = InMemoryState.Filters.Select(f => f == oldFilter ? newFilter : f).ToList();
 
                 save();
             }
         }
 
-        public static void ReplaceAll(IEnumerable<string> filters)
+        public static void ReplaceAll(IEnumerable<NamedFilter> filters)
         {
             filters = filters
-                .Where(f => !string.IsNullOrWhiteSpace(f))
-                .Distinct()
-                .Select(f => f.Trim());
+                .Where(f => !string.IsNullOrWhiteSpace(f.Filter))
+                .Distinct();
+            foreach (var filter in filters)
+                filter.Filter = filter.Filter.Trim();
             lock (locker)
             {
-                inMemoryState.Filters = new List<string>(filters);
+                InMemoryState.Filters = new List<NamedFilter>(filters);
                 save();
             }
         }
 
-        private static object locker { get; } = new object();
+        private static object locker { get; } = new();
 
         // ONLY call this within lock()
         private static void save(bool invokeUpdatedEvent = true)
         {
             // create json if not exists
-            void resave() => File.WriteAllText(JsonFile, JsonConvert.SerializeObject(inMemoryState, Formatting.Indented));
+            void resave() => File.WriteAllText(JsonFile, JsonConvert.SerializeObject(InMemoryState, Formatting.Indented));
             try { resave(); }
             catch (IOException)
             {

Source/LibationFileManager/TemplateEditor[T].cs

@@ -51,7 +51,10 @@ namespace LibationFileManager
 			return false;
 		}
 
-		private static readonly LibraryBookDto libraryBookDto
+		public LibraryBookDto FolderBook { get; }
+		public LibraryBookDto LibraryBook { get; }
+
+		private static readonly LibraryBookDto DefaultLibraryBook
 			= new()
 			{
 				Account = "myaccount@example.co",
@@ -60,6 +63,7 @@ namespace LibationFileManager
 				DatePublished = new DateTime(2017, 2, 27, 0, 0, 0),
 				AudibleProductId = "123456789",
 				Title = "A Study in Scarlet",
+				TitleWithSubtitle = "A Study in Scarlet: A Sherlock Holmes Novel",
 				Subtitle = "A Sherlock Holmes Novel",
 				Locale = "us",
 				YearPublished = 2017,
@@ -73,7 +77,7 @@ namespace LibationFileManager
 				Language = "English"
 			};
 
-		private static readonly MultiConvertFileProperties partFileProperties
+		private static readonly MultiConvertFileProperties DefaultMultipartProperties
 			= new()
 			{
 				OutputFileName = "",
@@ -90,23 +94,27 @@ namespace LibationFileManager
 			* subdirectories. Without rooting, we won't be allowed to create a
 			* relative path longer than MAX_PATH.
 			*/
-			var dir = Folder?.GetFilename(libraryBookDto, BaseDirectory, "");
+			var dir = Folder?.GetFilename(FolderBook, BaseDirectory, "");
 			if (dir is null) return null;
 			return Path.GetRelativePath(BaseDirectory, dir);
 		}
 
 		public string? GetFileName()
-			=> File?.GetFilename(libraryBookDto, partFileProperties, "", "");
+			=> File?.GetFilename(LibraryBook, DefaultMultipartProperties, "", "");
 		public string? GetName()
-			=> Name?.GetName(libraryBookDto, partFileProperties);
+			=> Name?.GetName(LibraryBook, DefaultMultipartProperties);
 
 		private TemplateEditor(
+			LibraryBookDto? folderDto,
+			LibraryBookDto? fileDto,
 			Templates editingTemplate,
 			LongPath baseDirectory,
 			string defaultTemplate,
 			string templateName,
 			string templateDescription)
 		{
+			FolderBook = folderDto ?? DefaultLibraryBook;
+			LibraryBook = fileDto ?? DefaultLibraryBook;
 			_editingTemplate = editingTemplate;
 			BaseDirectory = baseDirectory;
 			DefaultTemplate = defaultTemplate;
@@ -114,25 +122,30 @@ namespace LibationFileManager
 			TemplateDescription = templateDescription;
 		}
 
-		public static ITemplateEditor CreateFilenameEditor(LongPath baseDir, string templateText)
+		public static ITemplateEditor CreateFilenameEditor(LongPath baseDir, string templateText, LibraryBookDto? folderDto = null, LibraryBookDto? fileDto = null)
 		{
 			if (!Templates.TryGetTemplate<T>(templateText, out var template))
 				throw new ArgumentException($"Failed to parse {nameof(templateText)}");
 
-			var templateEditor = new TemplateEditor<T>(template, baseDir, T.DefaultTemplate, T.Name, T.Description);
+			var templateEditor = new TemplateEditor<T>(folderDto, fileDto, template, baseDir, T.DefaultTemplate, T.Name, T.Description);
 
 			if (!templateEditor.IsFolder && !templateEditor.IsFilePath)
 				throw new InvalidOperationException($"This method is only for File and Folder templates. Use {nameof(CreateNameEditor)} for name templates");
+			
+			if (templateEditor.IsFolder)
+				templateEditor.File = Templates.File;
+			else
+				templateEditor.Folder = Templates.Folder;
 
 			return templateEditor;
 		}
 
-		public static ITemplateEditor CreateNameEditor(string templateText)
+		public static ITemplateEditor CreateNameEditor(string templateText, LibraryBookDto? libraryBookDto = null)
 		{
 			if (!Templates.TryGetTemplate<T>(templateText, out var nameTemplate))
 				throw new ArgumentException($"Failed to parse {nameof(templateText)}");
 
-			var templateEditor = new TemplateEditor<T>(nameTemplate, "", T.DefaultTemplate, T.Name, T.Description);
+			var templateEditor = new TemplateEditor<T>(null, libraryBookDto, nameTemplate, "", T.DefaultTemplate, T.Name, T.Description);
 
 			if (templateEditor.IsFolder || templateEditor.IsFilePath)
 				throw new InvalidOperationException($"This method is only for name templates. Use {nameof(CreateFilenameEditor)} for file templates");

Source/LibationFileManager/WindowsDirectory.cs

@@ -15,7 +15,7 @@ namespace LibationFileManager
             try
             {
                 //Currently only works for Windows and macOS
-                if (!Configuration.Instance.UseCoverAsFolderIcon || Configuration.IsLinux)
+                if (!Configuration.Instance.UseCoverAsFolderIcon)
                     return;
 
                 // get path of cover art in Images dir. Download first if not exists

Source/LibationSearchEngine/LibationSearchEngine.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LuceneNet303r2" Version="3.0.3.5" />
+    <PackageReference Include="LuceneNet303r2" Version="3.0.3.8" />
   </ItemGroup>
 
   <ItemGroup>

Source/LibationSearchEngine/SearchEngine.cs

@@ -54,6 +54,8 @@ namespace LibationSearchEngine
             { FieldType.Bool, lb => (lb.Book.UserDefinedItem.BookStatus == LiberatedStatus.Error).ToString(), "LiberatedError" },
             { FieldType.Bool, lb => lb.Book.IsEpisodeChild().ToString(), "Podcast", "Podcasts", "IsPodcast", "Episode", "Episodes", "IsEpisode" },
             { FieldType.Bool, lb => lb.AbsentFromLastScan.ToString(), "AbsentFromLastScan", "Absent" },
+            { FieldType.Bool, lb => (!string.IsNullOrWhiteSpace(lb.Book.SeriesNames())).ToString(), "IsInSeries", "InSeries" },
+            { FieldType.Bool, lb => lb.Book.UserDefinedItem.IsFinished.ToString(), nameof(UserDefinedItem.IsFinished), "Finished", "IsFinished" },
             // all numbers are padded to 8 char.s
             // This will allow a single method to auto-pad numbers. The method will match these as well as date: yyyymmdd
             { FieldType.Number, lb => lb.Book.LengthInMinutes.ToLuceneString(), nameof(Book.LengthInMinutes), "Length", "Minutes" },

Source/LibationUiBase/GridView/EntryStatus.cs

@@ -133,7 +133,7 @@ namespace LibationUiBase.GridView
 		private string GetTooltip()
 		{
 			if (IsSeries)
-				return Expanded ? "Click to Collpase" : "Click to Expand";
+				return Expanded ? "Click to Collapse" : "Click to Expand";
 
 			if (IsUnavailable)
 				return "This book cannot be downloaded\nbecause it wasn't found during\nthe most recent library scan";

Source/LibationUiBase/GridView/GridContextMenu.cs

@@ -0,0 +1,98 @@
+using ApplicationServices;
+using DataLayer;
+using FileLiberator;
+using LibationFileManager;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace LibationUiBase.GridView;
+
+public class GridContextMenu
+{
+	public string CopyCellText => $"{Accelerator}Copy Cell Contents";
+	public string LiberateEpisodesText => $"{Accelerator}Liberate All Episodes";
+	public string SetDownloadedText => $"Set Download status to '{Accelerator}Downloaded'";
+	public string SetNotDownloadedText => $"Set Download status to '{Accelerator}Not Downloaded'";
+	public string RemoveText => $"{Accelerator}Remove from library";
+	public string LocateFileText => $"{Accelerator}Locate file...";
+	public string LocateFileDialogTitle => $"Locate the audio file for '{GridEntry.Book.TitleWithSubtitle}'";
+	public string LocateFileErrorMessage => "Error saving book's location";
+	public string ConvertToMp3Text => $"{Accelerator}Convert to Mp3";
+	public string ReDownloadText => "Re-download this audiobook";
+	public string EditTemplatesText => "Edit Templates";
+	public string FolderTemplateText => "Folder Template";
+	public string FileTemplateText => "File Template";
+	public string MultipartTemplateText => "Multipart File Template";
+	public string ViewBookmarksText => "View _Bookmarks/Clips";
+	public string ViewSeriesText => GridEntry.Liberate.IsSeries ? "View All Episodes in Series" : "View All Books in Series";
+
+	public bool LiberateEpisodesEnabled => GridEntry is ISeriesEntry sEntry && sEntry.Children.Any(c => c.Liberate.BookStatus is LiberatedStatus.NotLiberated or LiberatedStatus.PartialDownload);
+	public bool SetDownloadedEnabled => GridEntry.Book.UserDefinedItem.BookStatus != LiberatedStatus.Liberated || GridEntry.Liberate.IsSeries;
+	public bool SetNotDownloadedEnabled => GridEntry.Book.UserDefinedItem.BookStatus != LiberatedStatus.NotLiberated || GridEntry.Liberate.IsSeries;
+	public bool ConvertToMp3Enabled => GridEntry.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated;
+	public bool ReDownloadEnabled => GridEntry.Book.UserDefinedItem.BookStatus is LiberatedStatus.Liberated;
+
+	public IGridEntry GridEntry { get; }
+	public char Accelerator { get; }
+
+	public GridContextMenu(IGridEntry gridEntry, char accelerator)
+	{
+		GridEntry = gridEntry;
+		Accelerator = accelerator;
+	}
+
+	public void SetDownloaded()
+	{
+		if (GridEntry is ISeriesEntry series)
+		{
+			series.Children.Select(c => c.LibraryBook).UpdateBookStatus(LiberatedStatus.Liberated);
+		}
+		else
+		{
+			GridEntry.LibraryBook.UpdateBookStatus(LiberatedStatus.Liberated);
+		}
+	}
+
+	public void SetNotDownloaded()
+	{
+		if (GridEntry is ISeriesEntry series)
+		{
+			series.Children.Select(c => c.LibraryBook).UpdateBookStatus(LiberatedStatus.NotLiberated);
+		}
+		else
+		{
+			GridEntry.LibraryBook.UpdateBookStatus(LiberatedStatus.NotLiberated);
+		}
+	}
+
+	public async Task RemoveAsync()
+	{
+		if (GridEntry is ISeriesEntry series)
+		{
+			await series.Children.Select(c => c.LibraryBook).RemoveBooksAsync();
+		}
+		else
+		{
+			await Task.Run(GridEntry.LibraryBook.RemoveBook);
+		}
+	}
+
+	public ITemplateEditor CreateTemplateEditor<T>(LibraryBook libraryBook, string existingTemplate)
+			where T : Templates, ITemplate, new()
+	{
+		LibraryBookDto fileDto = libraryBook.ToDto(), folderDto = fileDto;
+
+		if (libraryBook.Book.IsEpisodeChild() &&
+			Configuration.Instance.SavePodcastsToParentFolder &&
+			libraryBook.Book.SeriesLink.SingleOrDefault() is SeriesBook series)
+		{
+			using var context = DbContexts.GetContext();
+			var seriesParent = context.GetLibraryBook_Flat_NoTracking(series.Series.AudibleSeriesId);
+			folderDto = seriesParent?.ToDto() ?? fileDto;
+		}
+
+		return TemplateEditor<T>.CreateFilenameEditor(Configuration.Instance.Books, existingTemplate, folderDto, fileDto);
+	}
+}

Source/LibationUiBase/GridView/GridEntry[TStatus].cs

@@ -37,7 +37,7 @@ namespace LibationUiBase.GridView
 		private string _purchasedate;
 		private string _length;
 		private LastDownloadStatus _lastDownload;
-		private object _cover;
+		private Lazy<object> _lazyCover;
 		private string _series;
 		private SeriesOrder _seriesOrder;
 		private string _title;
@@ -55,7 +55,7 @@ namespace LibationUiBase.GridView
 		public string PurchaseDate { get => _purchasedate; protected set => RaiseAndSetIfChanged(ref _purchasedate, value); }
 		public string Length { get => _length; protected set => RaiseAndSetIfChanged(ref _length, value); }
 		public LastDownloadStatus LastDownload { get => _lastDownload; protected set => RaiseAndSetIfChanged(ref _lastDownload, value); }
-		public object Cover { get => _cover; private set => RaiseAndSetIfChanged(ref _cover, value); }
+		public object Cover { get => _lazyCover.Value; }
 		public string Series { get => _series; private set => RaiseAndSetIfChanged(ref _series, value); }
 		public SeriesOrder SeriesOrder { get => _seriesOrder; private set => RaiseAndSetIfChanged(ref _seriesOrder, value); }
 		public string Title { get => _title; private set => RaiseAndSetIfChanged(ref _title, value); }
@@ -132,7 +132,7 @@ namespace LibationUiBase.GridView
 			int bookLenMins = GetLengthInMinutes();
 			return bookLenMins == 0 ? "" : $"{bookLenMins / 60} hr {bookLenMins % 60} min";
 		}
-
+		
 		#endregion
 
 		#region detect changes to the model, update the view.
@@ -200,36 +200,31 @@ namespace LibationUiBase.GridView
 
 		#region Sorting
 
-		public GridEntry()
+		public object GetMemberValue(string memberName) => memberName switch
 		{
-			memberValues = new()
-			{
-				{ nameof(Remove), () => Remove.HasValue ? Remove.Value ? RemoveStatus.Removed : RemoveStatus.NotRemoved : RemoveStatus.SomeRemoved },
-				{ nameof(Title), () => Book.TitleSortable() },
-				{ nameof(Series), () => Book.SeriesSortable() },
-				{ nameof(SeriesOrder), () => SeriesOrder },
-				{ nameof(Length), () => GetLengthInMinutes() },
-				{ nameof(MyRating), () => Book.UserDefinedItem.Rating },
-				{ nameof(PurchaseDate), () => GetPurchaseDate() },
-				{ nameof(ProductRating), () => Book.Rating },
-				{ nameof(Authors), () => Authors },
-				{ nameof(Narrators), () => Narrators },
-				{ nameof(Description), () => Description },
-				{ nameof(Category), () => Category },
-				{ nameof(Misc), () => Misc },
-				{ nameof(LastDownload), () => LastDownload },
-				{ nameof(BookTags), () => BookTags ?? string.Empty },
-				{ nameof(Liberate), () => Liberate },
-				{ nameof(DateAdded), () => DateAdded },
-			};
-		}
+			nameof(Remove) => Remove.HasValue ? Remove.Value ? RemoveStatus.Removed : RemoveStatus.NotRemoved : RemoveStatus.SomeRemoved,
+			nameof(Title) => Book.TitleSortable(),
+			nameof(Series) => Book.SeriesSortable(),
+			nameof(SeriesOrder) => SeriesOrder,
+			nameof(Length) => GetLengthInMinutes(),
+			nameof(MyRating) => Book.UserDefinedItem.Rating,
+			nameof(PurchaseDate) => GetPurchaseDate(),
+			nameof(ProductRating) => Book.Rating,
+			nameof(Authors) => Authors,
+			nameof(Narrators) => Narrators,
+			nameof(Description) => Description,
+			nameof(Category) => Category,
+			nameof(Misc) => Misc,
+			nameof(LastDownload) => LastDownload,
+			nameof(BookTags) => BookTags ?? string.Empty,
+			nameof(Liberate) => Liberate,
+			nameof(DateAdded) => DateAdded,
+			_ => null
+		};
 
-		public object GetMemberValue(string memberName) => memberValues[memberName]();
 		public IComparer GetMemberComparer(Type memberType)
 			=> memberTypeComparers.TryGetValue(memberType, out IComparer value) ? value : memberTypeComparers[memberType.BaseType];
 
-		private readonly Dictionary<string, Func<object>> memberValues;
-
 		// Instantiate comparers for every exposed member object type.
 		private static readonly Dictionary<Type, IComparer> memberTypeComparers = new()
 		{
@@ -258,7 +253,7 @@ namespace LibationUiBase.GridView
 				PictureStorage.PictureCached += PictureStorage_PictureCached;
 
 			// Mutable property. Set the field so PropertyChanged isn't fired.
-			_cover = Liberate.LoadImage(picture);
+			_lazyCover = new Lazy<object>(() => Liberate.LoadImage(picture));
 		}
 
 		private void PictureStorage_PictureCached(object sender, PictureCachedEventArgs e)
@@ -272,7 +267,8 @@ namespace LibationUiBase.GridView
 			// logic validation
 			if (e.Definition.PictureId == Book.PictureId)
 			{
-				Cover = Liberate.LoadImage(e.Picture);
+				_lazyCover = new Lazy<object>(() => Liberate.LoadImage(e.Picture));
+				RaisePropertyChanged(nameof(Cover));
 				PictureStorage.PictureCached -= PictureStorage_PictureCached;
 			}
 		}

Source/LibationUiBase/LibationUiBase.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFramework>net7.0</TargetFramework>
+	<TargetFramework>net8.0</TargetFramework>
 	  <IsPublishable>true</IsPublishable>
 	  <PublishReadyToRun>true</PublishReadyToRun>
 	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
+	<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
   </ItemGroup>
 
   <ItemGroup>

Source/LibationWinForms/AccessibleDataGridViewButtonCell.cs

@@ -0,0 +1,46 @@
+using System.Windows.Forms;
+
+namespace LibationWinForms
+{
+    public class AccessibleDataGridViewButtonCell : DataGridViewButtonCell
+    {
+        private string accessibilityDescription;
+
+        protected string AccessibilityName { get; }
+
+        /// <summary>
+        /// Get or set description for accessibility. eg: screen readers. Also sets the ToolTipText
+        /// </summary>
+        protected string AccessibilityDescription
+        {
+            get => accessibilityDescription;
+            set
+            {
+                accessibilityDescription = value;
+                ToolTipText = value;
+            }
+        }
+
+        protected override AccessibleObject CreateAccessibilityInstance() => new ButtonCellAccessibilityObject(this, name: AccessibilityName, description: AccessibilityDescription);
+
+        public AccessibleDataGridViewButtonCell(string accessibilityName) : base()
+        {
+            AccessibilityName = accessibilityName;
+        }
+
+        protected class ButtonCellAccessibilityObject : DataGridViewButtonCellAccessibleObject
+        {
+            private string _name;
+            public override string Name => _name;
+
+            private string _description;
+            public override string Description => _description;
+
+            public ButtonCellAccessibilityObject(DataGridViewCell owner, string name, string description) : base(owner)
+            {
+                _name = name;
+                _description = description;
+            }
+        }
+    }
+}

Source/LibationWinForms/AccessibleDataGridViewTextBoxCell.cs

@@ -0,0 +1,46 @@
+using System.Windows.Forms;
+
+namespace LibationWinForms
+{
+    internal class AccessibleDataGridViewTextBoxCell : DataGridViewTextBoxCell
+    {
+        private string accessibilityDescription;
+
+        protected string AccessibilityName { get; }
+
+        /// <summary>
+        /// Get or set description for accessibility. eg: screen readers. Also sets the ToolTipText
+        /// </summary>
+        protected string AccessibilityDescription
+        {
+            get => accessibilityDescription;
+            set
+            {
+                accessibilityDescription = value;
+                ToolTipText = value;
+            }
+        }
+
+        protected override AccessibleObject CreateAccessibilityInstance() => new TextBoxCellAccessibilityObject(this, name: AccessibilityName, description: AccessibilityDescription);
+
+        public AccessibleDataGridViewTextBoxCell(string accessibilityName) : base()
+        {
+            AccessibilityName = accessibilityName;
+        }
+
+        protected class TextBoxCellAccessibilityObject : DataGridViewTextBoxCellAccessibleObject
+        {
+            private string _name;
+            public override string Name => _name;
+
+            private string _description;
+            public override string Description => _description;
+
+            public TextBoxCellAccessibilityObject(DataGridViewCell owner, string name, string description) : base(owner)
+            {
+                _name = name;
+                _description = description;
+            }
+        }
+    }
+}

Source/LibationWinForms/Dialogs/AccountsDialog.cs

@@ -51,13 +51,13 @@ namespace LibationWinForms.Dialogs
 
 		private void AddAccountToGrid(Account account)
 		{
-			int row = dataGridView1.Rows.Add(
-					"X",
-					"Export",
-					account.LibraryScan,
-					account.AccountId,
-					account.Locale.Name,
-					account.AccountName);
+			var row = dataGridView1.Rows.Add(
+				"X",
+				"Export",
+				account.LibraryScan,
+				account.AccountId,
+				account.Locale.Name,
+				account.AccountName);
 
 			dataGridView1[COL_Export, row].ToolTipText = "Export account authorization to audible-cli";
 		}

Source/LibationWinForms/Dialogs/EditQuickFilters.Designer.cs

@@ -28,116 +28,127 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.cancelBtn = new System.Windows.Forms.Button();
-            this.saveBtn = new System.Windows.Forms.Button();
-            this.dataGridView1 = new System.Windows.Forms.DataGridView();
-            this.Original = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Delete = new DisableButtonColumn();
-            this.Filter = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.MoveUp = new DisableButtonColumn();
-            this.MoveDown = new DisableButtonColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
-            this.SuspendLayout();
+            cancelBtn = new System.Windows.Forms.Button();
+            saveBtn = new System.Windows.Forms.Button();
+            dataGridView1 = new System.Windows.Forms.DataGridView();
+            Original = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            Delete = new DisableButtonColumn();
+            FilterName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            Filter = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            MoveUp = new DisableButtonColumn();
+            MoveDown = new DisableButtonColumn();
+            ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit();
+            SuspendLayout();
             // 
             // cancelBtn
             // 
-            this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelBtn.Location = new System.Drawing.Point(713, 415);
-            this.cancelBtn.Name = "cancelBtn";
-            this.cancelBtn.Size = new System.Drawing.Size(75, 23);
-            this.cancelBtn.TabIndex = 2;
-            this.cancelBtn.Text = "Cancel";
-            this.cancelBtn.UseVisualStyleBackColor = true;
-            this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
+            cancelBtn.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
+            cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            cancelBtn.Location = new System.Drawing.Point(1248, 726);
+            cancelBtn.Margin = new System.Windows.Forms.Padding(5);
+            cancelBtn.Name = "cancelBtn";
+            cancelBtn.Size = new System.Drawing.Size(131, 40);
+            cancelBtn.TabIndex = 2;
+            cancelBtn.Text = "Cancel";
+            cancelBtn.UseVisualStyleBackColor = true;
+            cancelBtn.Click += cancelBtn_Click;
             // 
             // saveBtn
             // 
-            this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.saveBtn.Location = new System.Drawing.Point(612, 415);
-            this.saveBtn.Name = "saveBtn";
-            this.saveBtn.Size = new System.Drawing.Size(75, 23);
-            this.saveBtn.TabIndex = 1;
-            this.saveBtn.Text = "Save";
-            this.saveBtn.UseVisualStyleBackColor = true;
-            this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
+            saveBtn.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
+            saveBtn.Location = new System.Drawing.Point(1071, 726);
+            saveBtn.Margin = new System.Windows.Forms.Padding(5);
+            saveBtn.Name = "saveBtn";
+            saveBtn.Size = new System.Drawing.Size(131, 40);
+            saveBtn.TabIndex = 1;
+            saveBtn.Text = "Save";
+            saveBtn.UseVisualStyleBackColor = true;
+            saveBtn.Click += saveBtn_Click;
             // 
             // dataGridView1
             // 
-            this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
-            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Original,
-            this.Delete,
-            this.Filter,
-            this.MoveUp,
-            this.MoveDown});
-            this.dataGridView1.Location = new System.Drawing.Point(12, 12);
-            this.dataGridView1.MultiSelect = false;
-            this.dataGridView1.Name = "dataGridView1";
-            this.dataGridView1.Size = new System.Drawing.Size(776, 397);
-            this.dataGridView1.TabIndex = 0;
-            this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView1_CellContentClick);
-            this.dataGridView1.DefaultValuesNeeded += new System.Windows.Forms.DataGridViewRowEventHandler(this.dataGridView1_DefaultValuesNeeded);
+            dataGridView1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+            dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
+            dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { Original, Delete, FilterName, Filter, MoveUp, MoveDown });
+            dataGridView1.Location = new System.Drawing.Point(21, 21);
+            dataGridView1.Margin = new System.Windows.Forms.Padding(5);
+            dataGridView1.MultiSelect = false;
+            dataGridView1.Name = "dataGridView1";
+            dataGridView1.RowHeadersWidth = 72;
+            dataGridView1.Size = new System.Drawing.Size(1358, 695);
+            dataGridView1.TabIndex = 0;
+            dataGridView1.CellContentClick += DataGridView1_CellContentClick;
+            dataGridView1.DefaultValuesNeeded += dataGridView1_DefaultValuesNeeded;
             // 
             // Original
             // 
-            this.Original.HeaderText = "Original";
-            this.Original.Name = "Original";
-            this.Original.ReadOnly = true;
-            this.Original.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Original.Visible = false;
-            this.Original.Width = 48;
+            Original.HeaderText = "Original";
+            Original.MinimumWidth = 9;
+            Original.Name = "Original";
+            Original.ReadOnly = true;
+            Original.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            Original.Visible = false;
+            Original.Width = 150;
             // 
             // Delete
             // 
-            this.Delete.HeaderText = "Delete";
-            this.Delete.Name = "Delete";
-            this.Delete.ReadOnly = true;
-            this.Delete.Text = "x";
-            this.Delete.Width = 44;
+            Delete.HeaderText = "Delete";
+            Delete.MinimumWidth = 9;
+            Delete.Name = "Delete";
+            Delete.ReadOnly = true;
+            Delete.Text = "x";
+            Delete.Width = 127;
+            // 
+            // FilterName
+            // 
+            FilterName.HeaderText = "Name";
+            FilterName.MinimumWidth = 300;
+            FilterName.Name = "FilterName";
+            FilterName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            FilterName.Width = 300;
             // 
             // Filter
             // 
-            this.Filter.HeaderText = "Filter";
-            this.Filter.Name = "Filter";
-            this.Filter.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.Filter.Width = 35;
+            Filter.HeaderText = "Filter";
+            Filter.MinimumWidth = 400;
+            Filter.Name = "Filter";
+            Filter.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            Filter.Width = 400;
             // 
             // MoveUp
             // 
-            this.MoveUp.HeaderText = "Move Up";
-            this.MoveUp.Name = "MoveUp";
-            this.MoveUp.ReadOnly = true;
-            this.MoveUp.Text = "^";
-            this.MoveUp.Width = 57;
+            MoveUp.HeaderText = "Move Up";
+            MoveUp.MinimumWidth = 9;
+            MoveUp.Name = "MoveUp";
+            MoveUp.ReadOnly = true;
+            MoveUp.Text = "^";
+            MoveUp.Width = 169;
             // 
             // MoveDown
             // 
-            this.MoveDown.HeaderText = "Move Down";
-            this.MoveDown.Name = "MoveDown";
-            this.MoveDown.ReadOnly = true;
-            this.MoveDown.Text = "v";
-            this.MoveDown.Width = 71;
+            MoveDown.HeaderText = "Move Down";
+            MoveDown.MinimumWidth = 9;
+            MoveDown.Name = "MoveDown";
+            MoveDown.ReadOnly = true;
+            MoveDown.Text = "v";
+            MoveDown.Width = 215;
             // 
             // EditQuickFilters
             // 
-            this.AcceptButton = this.saveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.CancelButton = this.cancelBtn;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.dataGridView1);
-            this.Controls.Add(this.cancelBtn);
-            this.Controls.Add(this.saveBtn);
-            this.Name = "EditQuickFilters";
-            this.Text = "Edit Quick Filters";
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
-            this.ResumeLayout(false);
-
+            AcceptButton = saveBtn;
+            AutoScaleDimensions = new System.Drawing.SizeF(168F, 168F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            CancelButton = cancelBtn;
+            ClientSize = new System.Drawing.Size(1400, 788);
+            Controls.Add(dataGridView1);
+            Controls.Add(cancelBtn);
+            Controls.Add(saveBtn);
+            Margin = new System.Windows.Forms.Padding(5);
+            Name = "EditQuickFilters";
+            Text = "Edit Quick Filters";
+            ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit();
+            ResumeLayout(false);
         }
 
         #endregion
@@ -146,6 +157,7 @@
         private System.Windows.Forms.DataGridView dataGridView1;
         private System.Windows.Forms.DataGridViewTextBoxColumn Original;
         private DisableButtonColumn Delete;
+        private System.Windows.Forms.DataGridViewTextBoxColumn FilterName;
         private System.Windows.Forms.DataGridViewTextBoxColumn Filter;
         private DisableButtonColumn MoveUp;
         private DisableButtonColumn MoveDown;

Source/LibationWinForms/Dialogs/EditQuickFilters.cs

@@ -6,14 +6,6 @@ using LibationFileManager;
 
 namespace LibationWinForms.Dialogs
 {
-	public class DisableButtonColumn : DataGridViewButtonColumn
-	{
-		public DisableButtonColumn()
-		{
-			CellTemplate = new EditQuickFilters.DisableButtonCell();
-		}
-	}
-
 	public partial class EditQuickFilters : Form
 	{
 		private const string BLACK_UP_POINTING_TRIANGLE = "\u25B2";
@@ -21,26 +13,43 @@ namespace LibationWinForms.Dialogs
 		private const string COL_Original = nameof(Original);
 		private const string COL_Delete = nameof(Delete);
 		private const string COL_Filter = nameof(Filter);
-		private const string COL_MoveUp = nameof(MoveUp);
+        private const string COL_FilterName = nameof(FilterName);
+        private const string COL_MoveUp = nameof(MoveUp);
 		private const string COL_MoveDown = nameof(MoveDown);
 
-		internal class DisableButtonCell : DataGridViewButtonCell
-		{
-			protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState, object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
+		internal class DisableButtonCell : AccessibleDataGridViewButtonCell
+        {
+            private int LastRowIndex => DataGridView.Rows[^1].IsNewRow ? DataGridView.Rows[^1].Index - 1 : DataGridView.Rows[^1].Index;
+
+			public DisableButtonCell() : base("Edit Filter button") { }
+
+            protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState, object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
 			{
-				if ((OwningColumn.Name == COL_MoveUp && rowIndex == 0)
-					|| (OwningColumn.Name == COL_MoveDown && rowIndex == LastRowIndex)
-					|| OwningRow.IsNewRow)
-				{
+				var isMoveUp = OwningColumn.Name == COL_MoveUp;
+				var isMoveDown = OwningColumn.Name == COL_MoveDown;
+				var isDelete = OwningColumn.Name == COL_Delete;
+                var isNewRow = OwningRow.IsNewRow;
+
+                if (isNewRow
+                    || (isMoveUp && rowIndex == 0)
+					|| (isMoveDown && rowIndex == LastRowIndex))
+                {
 					base.Paint(graphics, clipBounds, cellBounds, rowIndex, elementState, null, null, null, cellStyle, advancedBorderStyle, paintParts ^ (DataGridViewPaintParts.ContentBackground | DataGridViewPaintParts.ContentForeground | DataGridViewPaintParts.SelectionBackground));
 
 					ButtonRenderer.DrawButton(graphics, cellBounds, value as string, cellStyle.Font, false, System.Windows.Forms.VisualStyles.PushButtonState.Disabled);
-				}
+                }
 				else
-					base.Paint(graphics, clipBounds, cellBounds, rowIndex, elementState, value, formattedValue, errorText, cellStyle, advancedBorderStyle, paintParts);
-			}
+				{
+                    base.Paint(graphics, clipBounds, cellBounds, rowIndex, elementState, value, formattedValue, errorText, cellStyle, advancedBorderStyle, paintParts);
 
-			int LastRowIndex => DataGridView.Rows[^1].IsNewRow ? DataGridView.Rows[^1].Index - 1 : DataGridView.Rows[^1].Index;
+					if (isMoveUp)
+						AccessibilityDescription = "Move up";
+					else if (isMoveDown)
+						AccessibilityDescription = "Move down";
+					else if (isDelete)
+						AccessibilityDescription = "Delete";
+                }
+			}
 		}
 
 		public EditQuickFilters()
@@ -60,10 +69,11 @@ namespace LibationWinForms.Dialogs
 				return;
 
 			foreach (var filter in filters)
-				dataGridView1.Rows.Add(filter, "X", filter, BLACK_UP_POINTING_TRIANGLE, BLACK_DOWN_POINTING_TRIANGLE);
-		}
+                dataGridView1.Rows.Add(filter.Filter, "X", filter.Name, filter.Filter, BLACK_UP_POINTING_TRIANGLE, BLACK_DOWN_POINTING_TRIANGLE);
+              //dataGridView1.Rows.Add(filter, "X", filter, BLACK_UP_POINTING_TRIANGLE, BLACK_DOWN_POINTING_TRIANGLE);
+        }
 
-		private void dataGridView1_DefaultValuesNeeded(object sender, DataGridViewRowEventArgs e)
+        private void dataGridView1_DefaultValuesNeeded(object sender, DataGridViewRowEventArgs e)
 		{
 			e.Row.Cells[COL_Delete].Value = "X";
 			e.Row.Cells[COL_MoveUp].Value = BLACK_UP_POINTING_TRIANGLE;
@@ -74,7 +84,9 @@ namespace LibationWinForms.Dialogs
 		{
 			var list = dataGridView1.Rows
 				.OfType<DataGridViewRow>()
-				.Select(r => r.Cells[COL_Filter].Value?.ToString())
+				.Select(r => new QuickFilters.NamedFilter(
+						         r.Cells[COL_Filter].Value?.ToString(), 
+						         r.Cells[COL_FilterName].Value?.ToString()))
 				.ToList();
 			QuickFilters.ReplaceAll(list);
 
@@ -121,4 +133,12 @@ namespace LibationWinForms.Dialogs
 			}
 		}
 	}
+    public class DisableButtonColumn : DataGridViewButtonColumn
+    {
+        public DisableButtonColumn()
+        {
+            CellTemplate = new EditQuickFilters.DisableButtonCell();
+        }
+    }
+
 }

Source/LibationWinForms/Dialogs/EditQuickFilters.resx

@@ -1,5 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
@@ -61,16 +120,10 @@
   <metadata name="Original.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Delete.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="FilterName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="Filter.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="MoveUp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="MoveDown.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

Source/LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -229,7 +229,7 @@
 			badBookGb.Controls.Add(badBookAskRb);
 			badBookGb.Location = new System.Drawing.Point(7, 6);
 			badBookGb.Name = "badBookGb";
-			badBookGb.Size = new System.Drawing.Size(836, 76);
+			badBookGb.Size = new System.Drawing.Size(841, 76);
 			badBookGb.TabIndex = 13;
 			badBookGb.TabStop = false;
 			badBookGb.Text = "[bad book desc]";
@@ -397,6 +397,7 @@
 			// 
 			// tab1ImportantSettings
 			// 
+			tab1ImportantSettings.AutoScroll = true;
 			tab1ImportantSettings.Controls.Add(groupBox1);
 			tab1ImportantSettings.Controls.Add(booksGb);
 			tab1ImportantSettings.Controls.Add(logsBtn);
@@ -412,6 +413,7 @@
 			// 
 			// groupBox1
 			// 
+			groupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			groupBox1.Controls.Add(applyDisplaySettingsBtn);
 			groupBox1.Controls.Add(gridScaleFactorLbl);
 			groupBox1.Controls.Add(gridScaleFactorTbar);
@@ -426,6 +428,7 @@
 			// 
 			// applyDisplaySettingsBtn
 			// 
+			applyDisplaySettingsBtn.Anchor = System.Windows.Forms.AnchorStyles.Right;
 			applyDisplaySettingsBtn.Location = new System.Drawing.Point(689, 26);
 			applyDisplaySettingsBtn.Name = "applyDisplaySettingsBtn";
 			applyDisplaySettingsBtn.Size = new System.Drawing.Size(148, 34);
@@ -554,6 +557,7 @@
 			// 
 			// tab2ImportLibrary
 			// 
+			tab2ImportLibrary.AutoScroll = true;
 			tab2ImportLibrary.Controls.Add(autoDownloadEpisodesCb);
 			tab2ImportLibrary.Controls.Add(autoScanCb);
 			tab2ImportLibrary.Controls.Add(showImportedStatsCb);
@@ -599,6 +603,7 @@
 			// 
 			// tab3DownloadDecrypt
 			// 
+			tab3DownloadDecrypt.AutoScroll = true;
 			tab3DownloadDecrypt.Controls.Add(saveMetadataToFileCbox);
 			tab3DownloadDecrypt.Controls.Add(useCoverAsFolderIconCb);
 			tab3DownloadDecrypt.Controls.Add(inProgressFilesGb);
@@ -764,6 +769,7 @@
 			// 
 			// tab4AudioFileOptions
 			// 
+			tab4AudioFileOptions.AutoScroll = true;
 			tab4AudioFileOptions.Controls.Add(fileDownloadQualityCb);
 			tab4AudioFileOptions.Controls.Add(fileDownloadQualityLbl);
 			tab4AudioFileOptions.Controls.Add(combineNestedChapterTitlesCbox);
@@ -845,7 +851,7 @@
 			audiobookFixupsGb.Controls.Add(stripAudibleBrandingCbox);
 			audiobookFixupsGb.Location = new System.Drawing.Point(6, 200);
 			audiobookFixupsGb.Name = "audiobookFixupsGb";
-			audiobookFixupsGb.Size = new System.Drawing.Size(403, 182);
+			audiobookFixupsGb.Size = new System.Drawing.Size(385, 182);
 			audiobookFixupsGb.TabIndex = 19;
 			audiobookFixupsGb.TabStop = false;
 			audiobookFixupsGb.Text = "Audiobook Fix-ups";
@@ -872,6 +878,7 @@
 			// 
 			// chapterTitleTemplateGb
 			// 
+			chapterTitleTemplateGb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			chapterTitleTemplateGb.Controls.Add(chapterTitleTemplateBtn);
 			chapterTitleTemplateGb.Controls.Add(chapterTitleTemplateTb);
 			chapterTitleTemplateGb.Location = new System.Drawing.Point(3, 388);
@@ -903,6 +910,7 @@
 			// 
 			// lameOptionsGb
 			// 
+			lameOptionsGb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			lameOptionsGb.Controls.Add(label20);
 			lameOptionsGb.Controls.Add(label21);
 			lameOptionsGb.Controls.Add(encoderQualityCb);
@@ -912,9 +920,9 @@
 			lameOptionsGb.Controls.Add(label1);
 			lameOptionsGb.Controls.Add(lameQualityGb);
 			lameOptionsGb.Controls.Add(groupBox2);
-			lameOptionsGb.Location = new System.Drawing.Point(415, 6);
+			lameOptionsGb.Location = new System.Drawing.Point(397, 6);
 			lameOptionsGb.Name = "lameOptionsGb";
-			lameOptionsGb.Size = new System.Drawing.Size(433, 376);
+			lameOptionsGb.Size = new System.Drawing.Size(450, 376);
 			lameOptionsGb.TabIndex = 14;
 			lameOptionsGb.TabStop = false;
 			lameOptionsGb.Text = "Mp3 Encoding Options";
@@ -930,6 +938,7 @@
 			// 
 			// label21
 			// 
+			label21.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label21.AutoSize = true;
 			label21.Location = new System.Drawing.Point(239, 89);
 			label21.Name = "label21";
@@ -939,33 +948,37 @@
 			// 
 			// encoderQualityCb
 			// 
+			encoderQualityCb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			encoderQualityCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			encoderQualityCb.FormattingEnabled = true;
 			encoderQualityCb.Location = new System.Drawing.Point(337, 86);
 			encoderQualityCb.Name = "encoderQualityCb";
-			encoderQualityCb.Size = new System.Drawing.Size(90, 23);
+			encoderQualityCb.Size = new System.Drawing.Size(107, 23);
 			encoderQualityCb.TabIndex = 2;
 			// 
 			// maxSampleRateCb
 			// 
+			maxSampleRateCb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			maxSampleRateCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			maxSampleRateCb.FormattingEnabled = true;
 			maxSampleRateCb.Location = new System.Drawing.Point(119, 86);
 			maxSampleRateCb.Name = "maxSampleRateCb";
-			maxSampleRateCb.Size = new System.Drawing.Size(101, 23);
+			maxSampleRateCb.Size = new System.Drawing.Size(76, 23);
 			maxSampleRateCb.TabIndex = 2;
 			// 
 			// lameDownsampleMonoCbox
 			// 
-			lameDownsampleMonoCbox.Location = new System.Drawing.Point(237, 30);
+			lameDownsampleMonoCbox.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+			lameDownsampleMonoCbox.Location = new System.Drawing.Point(247, 29);
 			lameDownsampleMonoCbox.Name = "lameDownsampleMonoCbox";
-			lameDownsampleMonoCbox.Size = new System.Drawing.Size(184, 34);
+			lameDownsampleMonoCbox.Size = new System.Drawing.Size(197, 34);
 			lameDownsampleMonoCbox.TabIndex = 1;
 			lameDownsampleMonoCbox.Text = "Downsample stereo to mono?\r\n(Recommended)\r\n";
 			lameDownsampleMonoCbox.UseVisualStyleBackColor = true;
 			// 
 			// lameBitrateGb
 			// 
+			lameBitrateGb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			lameBitrateGb.Controls.Add(LameMatchSourceBRCbox);
 			lameBitrateGb.Controls.Add(lameConstantBitrateCbox);
 			lameBitrateGb.Controls.Add(label7);
@@ -977,15 +990,16 @@
 			lameBitrateGb.Controls.Add(lameBitrateTb);
 			lameBitrateGb.Location = new System.Drawing.Point(6, 116);
 			lameBitrateGb.Name = "lameBitrateGb";
-			lameBitrateGb.Size = new System.Drawing.Size(421, 113);
+			lameBitrateGb.Size = new System.Drawing.Size(438, 113);
 			lameBitrateGb.TabIndex = 0;
 			lameBitrateGb.TabStop = false;
 			lameBitrateGb.Text = "Bitrate";
 			// 
 			// LameMatchSourceBRCbox
 			// 
+			LameMatchSourceBRCbox.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
 			LameMatchSourceBRCbox.AutoSize = true;
-			LameMatchSourceBRCbox.Location = new System.Drawing.Point(275, 76);
+			LameMatchSourceBRCbox.Location = new System.Drawing.Point(254, 76);
 			LameMatchSourceBRCbox.Name = "LameMatchSourceBRCbox";
 			LameMatchSourceBRCbox.Size = new System.Drawing.Size(140, 19);
 			LameMatchSourceBRCbox.TabIndex = 3;
@@ -1005,6 +1019,7 @@
 			// 
 			// label7
 			// 
+			label7.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label7.AutoSize = true;
 			label7.BackColor = System.Drawing.SystemColors.ControlLightLight;
 			label7.Location = new System.Drawing.Point(390, 52);
@@ -1015,6 +1030,7 @@
 			// 
 			// label6
 			// 
+			label6.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label6.AutoSize = true;
 			label6.BackColor = System.Drawing.SystemColors.ControlLightLight;
 			label6.Location = new System.Drawing.Point(309, 52);
@@ -1025,6 +1041,7 @@
 			// 
 			// label5
 			// 
+			label5.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label5.AutoSize = true;
 			label5.BackColor = System.Drawing.SystemColors.ControlLightLight;
 			label5.Location = new System.Drawing.Point(228, 52);
@@ -1035,6 +1052,7 @@
 			// 
 			// label4
 			// 
+			label4.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label4.AutoSize = true;
 			label4.BackColor = System.Drawing.SystemColors.ControlLightLight;
 			label4.Location = new System.Drawing.Point(147, 52);
@@ -1045,6 +1063,7 @@
 			// 
 			// label11
 			// 
+			label11.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label11.AutoSize = true;
 			label11.BackColor = System.Drawing.SystemColors.ControlLightLight;
 			label11.Location = new System.Drawing.Point(10, 52);
@@ -1055,6 +1074,7 @@
 			// 
 			// label3
 			// 
+			label3.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label3.AutoSize = true;
 			label3.BackColor = System.Drawing.SystemColors.ControlLightLight;
 			label3.Location = new System.Drawing.Point(71, 52);
@@ -1071,7 +1091,7 @@
 			lameBitrateTb.Maximum = 320;
 			lameBitrateTb.Minimum = 16;
 			lameBitrateTb.Name = "lameBitrateTb";
-			lameBitrateTb.Size = new System.Drawing.Size(409, 45);
+			lameBitrateTb.Size = new System.Drawing.Size(408, 45);
 			lameBitrateTb.SmallChange = 8;
 			lameBitrateTb.TabIndex = 0;
 			lameBitrateTb.TickFrequency = 16;
@@ -1090,6 +1110,7 @@
 			// 
 			// lameQualityGb
 			// 
+			lameQualityGb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			lameQualityGb.Controls.Add(label19);
 			lameQualityGb.Controls.Add(label18);
 			lameQualityGb.Controls.Add(label17);
@@ -1105,13 +1126,14 @@
 			lameQualityGb.Controls.Add(lameVBRQualityTb);
 			lameQualityGb.Location = new System.Drawing.Point(6, 235);
 			lameQualityGb.Name = "lameQualityGb";
-			lameQualityGb.Size = new System.Drawing.Size(421, 109);
+			lameQualityGb.Size = new System.Drawing.Size(438, 109);
 			lameQualityGb.TabIndex = 0;
 			lameQualityGb.TabStop = false;
 			lameQualityGb.Text = "Quality";
 			// 
 			// label19
 			// 
+			label19.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label19.AutoSize = true;
 			label19.Location = new System.Drawing.Point(349, 52);
 			label19.Name = "label19";
@@ -1121,6 +1143,7 @@
 			// 
 			// label18
 			// 
+			label18.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label18.AutoSize = true;
 			label18.Location = new System.Drawing.Point(307, 52);
 			label18.Name = "label18";
@@ -1130,6 +1153,7 @@
 			// 
 			// label17
 			// 
+			label17.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label17.AutoSize = true;
 			label17.Location = new System.Drawing.Point(265, 52);
 			label17.Name = "label17";
@@ -1139,6 +1163,7 @@
 			// 
 			// label16
 			// 
+			label16.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label16.AutoSize = true;
 			label16.Location = new System.Drawing.Point(223, 52);
 			label16.Name = "label16";
@@ -1148,6 +1173,7 @@
 			// 
 			// label12
 			// 
+			label12.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label12.AutoSize = true;
 			label12.Location = new System.Drawing.Point(182, 52);
 			label12.Name = "label12";
@@ -1157,6 +1183,7 @@
 			// 
 			// label15
 			// 
+			label15.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label15.AutoSize = true;
 			label15.Location = new System.Drawing.Point(140, 52);
 			label15.Name = "label15";
@@ -1166,6 +1193,7 @@
 			// 
 			// label9
 			// 
+			label9.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label9.AutoSize = true;
 			label9.Location = new System.Drawing.Point(97, 52);
 			label9.Name = "label9";
@@ -1175,6 +1203,7 @@
 			// 
 			// label8
 			// 
+			label8.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label8.AutoSize = true;
 			label8.Location = new System.Drawing.Point(391, 52);
 			label8.Name = "label8";
@@ -1202,6 +1231,7 @@
 			// 
 			// label14
 			// 
+			label14.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label14.AutoSize = true;
 			label14.Location = new System.Drawing.Point(56, 52);
 			label14.Name = "label14";
@@ -1211,6 +1241,7 @@
 			// 
 			// label2
 			// 
+			label2.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			label2.AutoSize = true;
 			label2.Location = new System.Drawing.Point(14, 52);
 			label2.Name = "label2";
@@ -1225,25 +1256,27 @@
 			lameVBRQualityTb.Location = new System.Drawing.Point(10, 22);
 			lameVBRQualityTb.Maximum = 9;
 			lameVBRQualityTb.Name = "lameVBRQualityTb";
-			lameVBRQualityTb.Size = new System.Drawing.Size(405, 45);
+			lameVBRQualityTb.Size = new System.Drawing.Size(404, 45);
 			lameVBRQualityTb.TabIndex = 0;
 			lameVBRQualityTb.Value = 9;
 			// 
 			// groupBox2
 			// 
+			groupBox2.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			groupBox2.Controls.Add(lameTargetQualityRb);
 			groupBox2.Controls.Add(lameTargetBitrateRb);
 			groupBox2.Location = new System.Drawing.Point(6, 22);
 			groupBox2.Name = "groupBox2";
-			groupBox2.Size = new System.Drawing.Size(214, 58);
+			groupBox2.Size = new System.Drawing.Size(189, 58);
 			groupBox2.TabIndex = 0;
 			groupBox2.TabStop = false;
 			groupBox2.Text = "Target";
 			// 
 			// lameTargetQualityRb
 			// 
+			lameTargetQualityRb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
 			lameTargetQualityRb.AutoSize = true;
-			lameTargetQualityRb.Location = new System.Drawing.Point(139, 22);
+			lameTargetQualityRb.Location = new System.Drawing.Point(118, 22);
 			lameTargetQualityRb.Name = "lameTargetQualityRb";
 			lameTargetQualityRb.Size = new System.Drawing.Size(63, 19);
 			lameTargetQualityRb.TabIndex = 0;
@@ -1321,7 +1354,6 @@
 			Controls.Add(tabControl);
 			Controls.Add(cancelBtn);
 			Controls.Add(saveBtn);
-			FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
 			Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			MaximizeBox = false;
 			MinimizeBox = false;

Source/LibationWinForms/Dialogs/SettingsDialog.resx

@@ -18,7 +18,7 @@
     <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
     <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
         <value>[base64 mime encoded serialized .NET Framework object]</value>
     </data>

Source/LibationWinForms/Form1.QuickFilters.cs

@@ -34,9 +34,9 @@ namespace LibationWinForms
 				var quickFilterMenuItem = new ToolStripMenuItem
 				{
 					Tag = quickFilterTag,
-					Text = $"&{++index}: {filter}"
+					Text = $"&{++index}: {(string.IsNullOrWhiteSpace(filter.Name) ? filter.Filter : filter.Name)}"
 				};
-				quickFilterMenuItem.Click += (_, __) => performFilter(filter);
+				quickFilterMenuItem.Click += (_, __) => performFilter(filter.Filter);
 				quickFiltersToolStripMenuItem.DropDownItems.Add(quickFilterMenuItem);
 			}
 		}
@@ -47,14 +47,17 @@ namespace LibationWinForms
 		private void firstFilterIsDefaultToolStripMenuItem_Click(object sender, EventArgs e)
 			=> QuickFilters.UseDefault = !firstFilterIsDefaultToolStripMenuItem.Checked;
 
-		private void addQuickFilterBtn_Click(object sender, EventArgs e) => QuickFilters.Add(this.filterSearchTb.Text);
+		private void addQuickFilterBtn_Click(object sender, EventArgs e)
+        {
+            QuickFilters.Add(new QuickFilters.NamedFilter(this.filterSearchTb.Text, null));
+        }
 
-		private void editQuickFiltersToolStripMenuItem_Click(object sender, EventArgs e) => new EditQuickFilters().ShowDialog();
+        private void editQuickFiltersToolStripMenuItem_Click(object sender, EventArgs e) => new EditQuickFilters().ShowDialog();
 
 		private void productsDisplay_InitialLoaded(object sender, EventArgs e)
 		{
 			if (QuickFilters.UseDefault)
-				performFilter(QuickFilters.Filters.FirstOrDefault());
+				performFilter(QuickFilters.Filters.FirstOrDefault().Filter);
 		}
 	}
 }

Source/LibationWinForms/GridView/DataGridViewImageButtonCell.cs

@@ -1,11 +1,12 @@
 using System.Drawing;
-using System.Windows.Forms;
 
 namespace LibationWinForms.GridView
 {
-	public class DataGridViewImageButtonCell : DataGridViewButtonCell
-	{
-		protected void DrawButtonImage(Graphics graphics, Image image, Rectangle cellBounds)
+    public class DataGridViewImageButtonCell : AccessibleDataGridViewButtonCell
+    {
+        public DataGridViewImageButtonCell(string accessibilityName) : base(accessibilityName) { }
+
+        protected void DrawButtonImage(Graphics graphics, Image image, Rectangle cellBounds)
 		{
 			var scaleFactor = OwningColumn is IDataGridScaleColumn scCol ? scCol.ScaleFactor : 1f;