Merge branch 'master' of https://github.com/rmcrackan/Libation

Bugfixes and Feature Requests

.cdmurls.json

@@ -0,0 +1,5 @@
+{
+  "CdmUrls": [
+    "https://ollj0gz40d.execute-api.us-west-2.amazonaws.com/default/AudibleCdm"
+  ]
+}

.github/workflows/build-windows.yml

@@ -89,14 +89,6 @@ jobs:
         run: |
           $bin_dir = "${{ matrix.os }}-${{ matrix.release_name }}\"
           $delfiles = @(
-            "libmp3lame.x64.so",
-            "libmp3lame.arm64.so",
-            "libmp3lame.x64.dylib",
-            "libmp3lame.arm64.dylib",
-            "ffmpegaac.x64.so",
-            "ffmpegaac.arm64.so",
-            "ffmpegaac.x64.dylib",
-            "ffmpegaac.arm64.dylib",
             "WindowsConfigApp.exe",
             "WindowsConfigApp.runtimeconfig.json",
             "WindowsConfigApp.deps.json"

Documentation/Advanced.md

@@ -11,6 +11,7 @@
 - [Settings](#settings)
 - [Custom File Naming](NamingTemplates.md)
 - [Command Line Interface](#command-line-interface)
+- [Custom Theme Colors](#custom-theme-colors) (Chardonnay Only)
 
 
 
@@ -86,3 +87,25 @@ CLI: Full library. No prompt
   libationcli set-status -n
   libationcli set-status -d -n
 ```
+### Custom Theme Colors
+
+In Libation Chardonnay (not Classic), you may adjust the app colors using the built-in theme editor. Open the Settings window (from the menu bar: Settings > Settings). On the "Important" settings tab, click "Edit Theme Colors".
+
+#### Theme Editor Window
+
+The theme editor has a list of style names and their currently assigned colors. To change a style color, click on the color swatch in the left-hand column to open the color editor for that style. Observe the color changes in real-time on the built-in preview panel on the right-hand side of the theme editor.
+
+You may import or export themes using the buttons at the bottom-left of the theme editor.
+"Cancel" or closing the window will revert any changes you've made in the theme editor.
+"Reset" will reset any changes you've made in the theme editor.
+"Defaults" will restore the application default colors for the active theme ("Light" or "Dark")
+"Save" will save the theme colors to the ChardonnayTheme.json file and close the editor.
+
+Note: you may only edit the currently applied theme ("Light" or "Dark").
+
+#### Video Walkthrough
+The below video demonstrates using the theme editor to make changes to the Dark theme color pallet.
+
+[](https://github.com/user-attachments/assets/05c0cb7f-578f-4465-9691-77d694111349)
+
+

Documentation/InstallOnMac.md

@@ -8,7 +8,7 @@
 # Run Libation on MacOS
 This walkthrough should get you up and running with Libation on your Mac.
 
-## Supports macOS 10.15 (Catalina) and above
+## Supports macOS 13 (Ventura) and above
 
 ## Install Libation
 

Documentation/NamingTemplates.md

@@ -17,6 +17,9 @@ These templates apply to both GUI and CLI.
   - [Conditional Tags](#conditional-tags)
 - [Tag Formatters](#tag-formatters)
   - [Text Formatters](#text-formatters)
+  - [Series Formatters](#series-formatters)
+  - [Series List Formatters](#series-list-formatters)
+  - [Name Formatters](#name-formatters)
   - [Name List Formatters](#name-list-formatters)
   - [Number Formatters](#number-formatters)
   - [Date Formatters](#date-formatters)
@@ -32,32 +35,33 @@ These tags will be replaced in the template with the audiobook's values.
 |Tag|Description|Type|
 |-|-|-|
 |\<id\> **†**|Audible book ID (ASIN)|Text|
-|\<title\>|Full title with subtitle|Text|
-|\<title short\>|Title. Stop at first colon|Text|
-|\<audible title\>|Audible's title (does not include subtitle)|Text|
-|\<audible subtitle\>|Audible's subtitle|Text|
-|\<author\>|Author(s)|Name List|
-|\<first author\>|First author|Text|
-|\<narrator\>|Narrator(s)|Name List|
-|\<first narrator\>|First narrator|Text|
-|\<series\>|Name of series|Text|
-|\<series#\>|Number order in series|Number|
-|\<bitrate\>|File's original bitrate (Kbps)|Number|
-|\<samplerate\>|File's original audio sample rate|Number|
-|\<channels\>|Number of audio channels|Number|
-|\<account\>|Audible account of this book|Text|
-|\<account nickname\>|Audible account nickname of this book|Text|
-|\<locale\>|Region/country|Text|
-|\<year\>|Year published|Number|
-|\<language\>|Book's language|Text|
+|\<title\>|Full title with subtitle|[Text](#text-formatters)|
+|\<title short\>|Title. Stop at first colon|[Text](#text-formatters)|
+|\<audible title\>|Audible's title (does not include subtitle)|[Text](#text-formatters)|
+|\<audible subtitle\>|Audible's subtitle|[Text](#text-formatters)|
+|\<author\>|Author(s)|[Name List](#name-list-formatters)|
+|\<first author\>|First author|[Name](#name-formatters)|
+|\<narrator\>|Narrator(s)|[Name List](#name-list-formatters)|
+|\<first narrator\>|First narrator|[Name](#name-formatters)|
+|\<series\>|All series to which the book belongs (if any)|[Series List](#series-list-formatters)|
+|\<first series\>|First series|[Series](#series-formatters)|
+|\<series#\>|Number order in series (alias for \<first series[{#}]\>|[Number](#number-formatters)|
+|\<bitrate\>|File's original bitrate (Kbps)|[Number](#number-formatters)|
+|\<samplerate\>|File's original audio sample rate|[Number](#number-formatters)|
+|\<channels\>|Number of audio channels|[Number](#number-formatters)|
+|\<account\>|Audible account of this book|[Text](#text-formatters)|
+|\<account nickname\>|Audible account nickname of this book|[Text](#text-formatters)|
+|\<locale\>|Region/country|[Text](#text-formatters)|
+|\<year\>|Year published|[Number](#number-formatters)|
+|\<language\>|Book's language|[Text](#text-formatters)|
 |\<language short\> **†**|Book's language abbreviated. Eg: ENG|Text|
-|\<file date\>|File creation date/time.|DateTime|
-|\<pub date\>|Audiobook publication date|DateTime|
-|\<date added\>|Date the book added to your Audible account|DateTime|
-|\<ch count\> **‡**|Number of chapters|Number|
-|\<ch title\> **‡**|Chapter title|Text|
-|\<ch#\> **‡**|Chapter number|Number|
-|\<ch# 0\> **‡**|Chapter number with leading zeros|Number|
+|\<file date\>|File creation date/time.|[DateTime](#date-formatters)|
+|\<pub date\>|Audiobook publication date|[DateTime](#date-formatters)|
+|\<date added\>|Date the book added to your Audible account|[DateTime](#date-formatters)|
+|\<ch count\> **‡**|Number of chapters|[Number](#number-formatters)|
+|\<ch title\> **‡**|Chapter title|[Text](#text-formatters)|
+|\<ch#\> **‡**|Chapter number|[Number](#number-formatters)|
+|\<ch# 0\> **‡**|Chapter number with leading zeros|[Number](#number-formatters)|
 
 **†** Does not support custom formatting
 
@@ -95,11 +99,28 @@ As an example, this folder template will place all Liberated podcasts into a "Po
 |L|Converts text to lowercase|\<title[L]\>|a study in scarlet꞉ a sherlock holmes novel|
 |U|Converts text to uppercase|\<title short[U]\>|A STUDY IN SCARLET|
 
+## Series Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|\{N \| # \| ID\}|Formats the series using<br>the series part tags.<br>\{N\} = Series Name<br>\{#\} = Number order in series<br>\{ID\} = Audible Series ID<br><br>Default is \{N\}|`<first series>`<hr>`<first series[{N}]>`<hr>`<first series[{N}, {#}, {ID}]>`|Sherlock Holmes<hr>Sherlock Holmes<hr>Sherlock Holmes, 1, B08376S3R2|
+
+## Series List Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|separator()|Speficy the text used to join<br>multiple series names.<br><br>Default is ", "|`<series[separator(; )]>`|Sherlock Holmes; Some Other Series|
+|format(\{N \| # \| ID\})|Formats the series properties<br>using the name series tags.<br>See [Series Formatter Usage](#series-formatters) above.|`<series[format({N}, {#})`<br>`separator(; )]>`<hr>`<author[format({L}, {ID}) separator(; )]>`|Sherlock Holmes, 1; Some Other Series, 1<hr>herlock Holmes, B08376S3R2; Some Other Series, B000000000|
+|max(#)|Only use the first # of series<br><br>Default is all series|`<series[max(1)]>`|Sherlock Holmes|
+
+## Name Formatters
+|Formatter|Description|Example Usage|Example Result|
+|-|-|-|-|
+|\{T \| F \| M \| L \| S \| ID\}|Formats the human name using<br>the name part tags.<br>\{T\} = Title (e.g. "Dr.")<br>\{F\} = First name<br>\{M\} = Middle name<br>\{L\} = Last Name<br>\{S\} = Suffix (e.g. "PhD")<br>\{ID\} = Audible Contributor ID<br><br>Default is \{P\} \{F\} \{M\} \{L\} \{S\}|`<first narrator[{L}, {F}]>`<hr>`<first author[{L}, {F} _{ID}_]>`|Fry, Stephen<hr>Doyle, Arthur \_B000AQ43GQ\_;<br>Fry, Stephen \_B000APAGVS\_|
+
 ## Name List Formatters
 |Formatter|Description|Example Usage|Example Result|
 |-|-|-|-|
 |separator()|Speficy the text used to join<br>multiple people's names.<br><br>Default is ", "|`<author[separator(; )]>`|Arthur Conan Doyle; Stephen Fry|
-|format(\{T \| F \| M \| L \| S\})|Formats the human name using<br>the name part tags.<br>\{T\} = Title (e.g. "Dr.")<br>\{F\} = First name<br>\{M\} = Middle name<br>\{L\} = Last Name<br>\{S\} = Suffix (e.g. "PhD")<br><br>Default is \{P\} \{F\} \{M\} \{L\} \{S\}|`<author[format({L}, {F})`<br>`separator(; )]>`|Doyle, Arthur; Fry, Stephen|
+|format(\{T \| F \| M \| L \| S \| ID\})|Formats the human name using<br>the name part tags.<br>See [Name Formatter Usage](#name-formatters) above.|`<author[format({L}, {F})`<br>`separator(; )]>`<hr>`<author[format({L}, {F}`<br>`_{ID}_) separator(; )]>`|Doyle, Arthur; Fry, Stephen<hr>Doyle, Arthur \_B000AQ43GQ\_;<br>Fry, Stephen \_B000APAGVS\_|
 |sort(F \| M \| L)|Sorts the names by first, middle,<br>or last name<br><br>Default is unsorted|`<author[sort(M)]>`|Stephen Fry, Arthur Conan Doyle|
 |max(#)|Only use the first # of names<br><br>Default is all names|`<author[max(1)]>`|Arthur Conan Doyle|
 

Images/libation_glass.svg

@@ -1,34 +1,36 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 524 524" enable-background="new 0 0 524 524">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 288 288" enable-background="new 0 0 288 288">
 	<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
+			<path transform="translate(16 16)" fill-rule="evenodd" d=
+				"M177,16
+					H79
+					A 32.0781 63.7932 -1.5106 0 0 66 80
+					A 158.789 471.1259 41.9466 0 0 90 131
+					A 81.7197 122.0515 35.3745 0 0 128 143.3484
+					A 81.7197 122.0515 -35.3745 0 0 166 131
+					A 158.789 471.1259 -41.9466 0 0 190 80
+					A 32.0781 63.7932 1.5106 0 0 177 16
+					L 184 0
+					A 44.7901 78.5247 1.1521 0 1 194 122
+					A 97.0039 135.3148 -36.2124 0 1 136 159
+					V 240
+					H 176
+					A 8 8 0 0 1 176 256
+					H 80
+					A 8 8 0 0 1 80 240
+					H 120
+					V 159					
+					A 97.0039 135.3148 36.2124 0 1 62 122
+					A 44.7901 78.5247 -1.1521 0 1 72 0
+					H184
 				z"/>
 		</g>
-		<g id="wine-level">
+		<g transform="translate(16 16)" id="wine-level">
 			<path d=
-				"M158,136
-					a 168,305 35 0 0 104,136
-					a 168,305 -35 0 0 104,-136
+				"M182,64
+					H 74
+					A 115.9979 308.8033 38.9474 0 0 128 134.4277
+					A 115.9979 308.8033 -38.9474 0 0 182,64
 				z"/>
 		</g>
 	</defs>	

Images/libation_hangover.svg

@@ -1,30 +1,31 @@
-<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">
-
-<g transform="translate(0 80) rotate(90 256,256)">
-<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=
-"M345,44
-	A 192,184 0 0 1 366,126
-	A 320,180 55 0 1 345,226
-z"/>
-</g>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 288 288" enable-background="new 0 0 288 288">
+	<g>
+		<path transform="rotate(90 128,128) translate(60 -16)" fill-rule="evenodd" d=
+			"M177,16
+				H79
+				A 32.0781 63.7932 -1.5106 0 0 66 80
+				A 158.789 471.1259 41.9466 0 0 90 131
+				A 81.7197 122.0515 35.3745 0 0 128 143.3484
+				A 81.7197 122.0515 -35.3745 0 0 166 131
+				A 158.789 471.1259 -41.9466 0 0 190 80
+				A 32.0781 63.7932 1.5106 0 0 177 16
+				L 184 0
+				A 44.7901 78.5247 1.1521 0 1 194 122
+				A 97.0039 135.3148 -36.2124 0 1 136 159
+				V 240
+				H 176
+				A 8 8 0 0 1 176 256
+				H 80
+				A 8 8 0 0 1 80 240
+				H 120
+				V 159					
+				A 97.0039 135.3148 36.2124 0 1 62 122
+				A 44.7901 78.5247 -1.1521 0 1 72 0
+				H184
+			M170,115
+				V24
+				A 19.5181 45.9183 -3.3549 0 1 182.4322 69.5
+				A 19.5181 45.9183 3.3549 0 1 170 115
+			z"/>
+	</g>
 </svg>

README.md

@@ -32,6 +32,7 @@
     - [Settings](Documentation/Advanced.md#settings)
     - [Custom File Naming](Documentation/NamingTemplates.md)
     - [Command Line Interface](Documentation/Advanced.md#command-line-interface)
+    - [Custom Theme Colors](Documentation/Advanced.md#custom-theme-colors) (Chardonnay Only)
 - [Docker](Documentation/Docker.md)
 - [Frequently Asked Questions](Documentation/FrequentlyAskedQuestions.md)
 

Scripts/Bundle_Debian.sh

@@ -53,13 +53,7 @@ if [ $? -ne 0 ]
 fi
 
 
-delfiles=('libmp3lame.arm64.dylib' 'libmp3lame.x64.dylib' 'libmp3lame.x64.dll' 'libmp3lame.x86.dll' 'ffmpegaac.arm64.dylib' 'ffmpegaac.x64.dylib' 'ffmpegaac.x64.dll' 'ffmpegaac.x86.dll' 'LinuxConfigApp' 'LinuxConfigApp.deps.json' 'LinuxConfigApp.runtimeconfig.json')
-if [[ "$ARCH" == "arm64" ]]
-then
-  delfiles+=('libmp3lame.x64.so' 'ffmpegaac.x64.so')
-else
-  delfiles+=('libmp3lame.arm64.so' 'ffmpegaac.arm64.so')
-fi
+delfiles=('LinuxConfigApp' 'LinuxConfigApp.deps.json' 'LinuxConfigApp.runtimeconfig.json')
 
 for n in "${delfiles[@]}"
 do

Scripts/Bundle_MacOS.sh

@@ -82,18 +82,7 @@ echo "Set CFBundleVersion to $VERSION"
 sed -i -e "s/VERSION_STRING/$VERSION/" $BUNDLE_CONTENTS/Info.plist
 
 
-delfiles=( 'libmp3lame.arm64.so' 'libmp3lame.x64.so' 'libmp3lame.x64.dll' 'libmp3lame.x86.dll' 'ffmpegaac.arm64.so' 'ffmpegaac.x64.so' 'ffmpegaac.x64.dll' 'ffmpegaac.x86.dll' 'MacOSConfigApp' 'MacOSConfigApp.deps.json' 'MacOSConfigApp.runtimeconfig.json')
-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
-
+delfiles=('MacOSConfigApp' 'MacOSConfigApp.deps.json' 'MacOSConfigApp.runtimeconfig.json')
 
 for n in "${delfiles[@]}"
 do

Scripts/Bundle_Redhat.sh

@@ -38,14 +38,12 @@ fi
 
 BASEDIR=$(pwd)
 
-delfiles=('libmp3lame.arm64.dylib' 'libmp3lame.x64.dylib' 'libmp3lame.x64.dll' 'libmp3lame.x86.dll' 'ffmpegaac.arm64.dylib' 'ffmpegaac.x64.dylib' 'ffmpegaac.x64.dll' 'ffmpegaac.x86.dll' 'LinuxConfigApp' 'LinuxConfigApp.deps.json' 'LinuxConfigApp.runtimeconfig.json')
+delfiles=('LinuxConfigApp' 'LinuxConfigApp.deps.json' 'LinuxConfigApp.runtimeconfig.json')
 if [[ "$ARCH" == "x64" ]]
 then
-  delfiles+=('libmp3lame.arm64.so' 'ffmpegaac.arm64.so')
   ARCH_RPM="x86_64"
   ARCH="amd64"
 else
-  delfiles+=('libmp3lame.x64.so' 'ffmpegaac.x64.so')
   ARCH_RPM="aarch64"
 fi
 

Source/AaxDecrypter/AaxDecrypter.csproj

@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="1.1.4" />
+	  <PackageReference Include="AAXClean.Codecs" Version="2.0.1.1" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/AaxDecrypter/AaxcDownloadConvertBase.cs

@@ -8,7 +8,7 @@ namespace AaxDecrypter
 	{
 		public event EventHandler<AppleTags> RetrievedMetadata;
 
-		protected AaxFile AaxFile { get; private set; }
+		protected Mp4File AaxFile { get; private set; }
 		protected Mp4Operation AaxConversion { get; set; }
 
 		protected AaxcDownloadConvertBase(string outFileName, string cacheDirectory, IDownloadOptions dlOptions)
@@ -29,14 +29,34 @@ namespace AaxDecrypter
 			FinalizeDownload();
 		}
 
+		private Mp4File Open()
+		{
+			if (DownloadOptions.InputType is FileType.Dash)
+			{
+				var dash = new DashFile(InputFileStream);
+				dash.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
+				return dash;
+			}
+			else if (DownloadOptions.InputType is FileType.Aax)
+			{
+				var aax = new AaxFile(InputFileStream);
+				aax.SetDecryptionKey(DownloadOptions.AudibleKey);
+				return aax;
+			}
+			else if (DownloadOptions.InputType is FileType.Aaxc)
+			{
+				var aax = new AaxFile(InputFileStream);
+				aax.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
+				return aax;
+			}
+			else throw new InvalidOperationException($"{nameof(DownloadOptions.InputType)} of '{DownloadOptions.InputType}' is unknown.");
+		}
+
 		protected bool Step_GetMetadata()
 		{
-			AaxFile = new AaxFile(InputFileStream);
+			AaxFile = Open();
 
-			if (DownloadOptions.AudibleKey?.Length == 8 && DownloadOptions.AudibleIV is null)
-				AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey);
-			else
-				AaxFile.SetDecryptionKey(DownloadOptions.AudibleKey, DownloadOptions.AudibleIV);
+			RetrievedMetadata?.Invoke(this, AaxFile.AppleTags);
 
 			if (DownloadOptions.StripUnabridged)
 			{
@@ -83,12 +103,10 @@ namespace AaxDecrypter
 
 			OnInitialized();
 			OnRetrievedTitle(AaxFile.AppleTags.TitleSansUnabridged);
-			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor ?? "[unknown]");
-			OnRetrievedNarrators(AaxFile.AppleTags.Narrator ?? "[unknown]");
+			OnRetrievedAuthors(AaxFile.AppleTags.FirstAuthor);
+			OnRetrievedNarrators(AaxFile.AppleTags.Narrator);
 			OnRetrievedCoverArt(AaxFile.AppleTags.Cover);
 
-			RetrievedMetadata?.Invoke(this, AaxFile.AppleTags);
-
 			return !IsCanceled;
 		}
 

Source/AaxDecrypter/AaxcDownloadMultiConverter.cs

@@ -114,7 +114,7 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 					DownloadOptions.LameConfig
 				);
 
-			void newSplit(int currentChapter, ChapterInfo splitChapters, NewSplitCallback newSplitCallback)
+			void newSplit(int currentChapter, ChapterInfo splitChapters, INewSplitCallback newSplitCallback)
 			{
 				MultiConvertFileProperties props = new()
 				{
@@ -151,7 +151,7 @@ That naming may not be desirable for everyone, but it's an easy change to instea
 			{
 				return Mp4File.RelocateMoovAsync(filename);
 			}
-			else return Mp4Operation.CompletedOperation;
+			else return Mp4Operation.FromCompleted(AaxFile);
 		}
 	}
 }

Source/AaxDecrypter/AudiobookDownloadBase.cs

@@ -23,7 +23,7 @@ namespace AaxDecrypter
 		public bool IsCanceled { get; protected set; }
 		protected AsyncStepSequence AsyncSteps { get; } = new();
 		protected string OutputFileName { get; }
-		protected IDownloadOptions DownloadOptions { get; }
+		public IDownloadOptions DownloadOptions { get; }
 		protected NetworkFileStream InputFileStream => nfsPersister.NetworkFileStream;
 		protected virtual long InputFilePosition => InputFileStream.Position;
 		private bool downloadFinished;
@@ -178,19 +178,33 @@ namespace AaxDecrypter
 			FileUtility.SaferDelete(jsonDownloadState);
 
 			if (!string.IsNullOrEmpty(DownloadOptions.AudibleKey) &&
-				DownloadOptions.RetainEncryptedFile)
+				DownloadOptions.RetainEncryptedFile &&
+				DownloadOptions.InputType is AAXClean.FileType fileType)
 			{
-				string aaxPath = Path.ChangeExtension(tempFilePath, ".aax");
-				FileUtility.SaferMove(tempFilePath, aaxPath);
-
 				//Write aax decryption key
-				string keyPath = Path.ChangeExtension(aaxPath, ".key");
+				string keyPath = Path.ChangeExtension(tempFilePath, ".key");
 				FileUtility.SaferDelete(keyPath);
+				string aaxPath;
 
-				if (string.IsNullOrEmpty(DownloadOptions.AudibleIV))
+				if (fileType is AAXClean.FileType.Aax)
+				{
 					await File.WriteAllTextAsync(keyPath, $"ActivationBytes={DownloadOptions.AudibleKey}");
-				else
+					aaxPath = Path.ChangeExtension(tempFilePath, ".aax");
+				}
+				else if (fileType is AAXClean.FileType.Aaxc)
+				{
 					await File.WriteAllTextAsync(keyPath, $"Key={DownloadOptions.AudibleKey}{Environment.NewLine}IV={DownloadOptions.AudibleIV}");
+					aaxPath = Path.ChangeExtension(tempFilePath, ".aaxc");
+				}
+				else if (fileType is AAXClean.FileType.Dash)
+				{
+					await File.WriteAllTextAsync(keyPath, $"KeyId={DownloadOptions.AudibleKey}{Environment.NewLine}Key={DownloadOptions.AudibleIV}");
+					aaxPath = Path.ChangeExtension(tempFilePath, ".dash");
+				}
+				else
+					throw new InvalidOperationException($"Unknown file type: {fileType}");
+
+				FileUtility.SaferMove(tempFilePath, aaxPath);
 
 				OnFileCreated(aaxPath);
 				OnFileCreated(keyPath);
@@ -217,6 +231,7 @@ namespace AaxDecrypter
 			}
 			catch
 			{
+				nfsp?.Target?.Dispose();
 				FileUtility.SaferDelete(jsonDownloadState);
 				FileUtility.SaferDelete(tempFilePath);
 				return nfsp = newNetworkFilePersister();

Source/AaxDecrypter/AverageSpeed.cs

@@ -105,7 +105,7 @@ public class AverageSpeed
 	public AverageSpeed() : this(TimeSpan.FromSeconds(15), Significance.P10, TimeSpan.FromSeconds(3), Significance.P01) { }
 
 	/// <param name="slowWindow">Total moving average time window</param>
-	/// <param name="slowSignificance">T-test signifance level at which the newest speed will be considered different from the slow window's mean speed.</param>
+	/// <param name="slowSignificance">T-test significance level at which the newest speed will be considered different from the slow window's mean speed.</param>
 	/// <param name="fastWindow">A shorter moving window of the most resent speeds. The average speed in <paramref name="fastWindow"/> is compared to the average speed in the rest of <paramref name="slowWindow"/> to quickly detect large changes in speed.</param>
 	/// <param name="fastSignificance">T-test significance level at which the mean speed in <paramref name="fastWindow"/> will be considered different from the mean speed of the remainder of <paramref name="slowWindow"/>.</param>
 	public AverageSpeed(TimeSpan slowWindow, Significance slowSignificance, TimeSpan fastWindow, Significance fastSignificance)
@@ -119,7 +119,7 @@ public class AverageSpeed
 	/// <summary>Add a new position to the moving average</summary>
 	public void AddPosition(double position)
 	{
-		var now = DateTime.Now;
+		var now = DateTime.UtcNow;
 		if (start == default)
 			start = now;
 

Source/AaxDecrypter/IDownloadOptions.cs

@@ -35,5 +35,6 @@ namespace AaxDecrypter
         string GetMultipartFileName(MultiConvertFileProperties props);
         string GetMultipartTitle(MultiConvertFileProperties props);
         Task<string> SaveClipsAndBookmarksAsync(string fileName);
+        public FileType? InputType { get; }
     }
 }

Source/AaxDecrypter/NetworkFileStream.cs

@@ -55,18 +55,20 @@ namespace AaxDecrypter
 		private CancellationTokenSource _cancellationSource { get; } = new();
 		private EventWaitHandle _downloadedPiece { get; set; }
 
+		private DateTime NextUpdateTime { get; set; }
+
 		#endregion
 
 		#region Constants
 
-		//Download buffer size
-		private const int DOWNLOAD_BUFF_SZ = 32 * 1024;
+		//Download memory buffer size
+		private const int DOWNLOAD_BUFF_SZ = 8 * 1024;
 
 		//NetworkFileStream will flush all data in _writeFile to disk after every
 		//DATA_FLUSH_SZ bytes are written to the file stream.
 		private const int DATA_FLUSH_SZ = 1024 * 1024;
 
-		//Number of times per second the download rate is checkd and throttled
+		//Number of times per second the download rate is checked and throttled
 		private const int THROTTLE_FREQUENCY = 8;
 
 		//Minimum throttle rate. The minimum amount of data that can be throttled
@@ -110,10 +112,14 @@ namespace AaxDecrypter
 		/// <summary> Update the <see cref="Dinah.Core.IO.JsonFilePersister{T}"/>. </summary>
 		private void OnUpdate()
 		{
-			RequestHeaders["Range"] = $"bytes={WritePosition}-";
 			try
 			{
-				Updated?.Invoke(this, EventArgs.Empty);
+				if (DateTime.UtcNow > NextUpdateTime)
+				{
+					Updated?.Invoke(this, EventArgs.Empty);
+					//JsonFilePersister Will not allow update intervals shorter than 100 milliseconds
+					NextUpdateTime = DateTime.UtcNow.AddMilliseconds(110);
+				}
 			}
 			catch (Exception ex)
 			{
@@ -135,7 +141,6 @@ namespace AaxDecrypter
 				throw new InvalidOperationException("Cannot change Uri after download has started.");
 
 			Uri = uriToSameFile;
-			RequestHeaders["Range"] = $"bytes={WritePosition}-";
 		}
 
 		/// <summary> Begins downloading <see cref="Uri"/> to <see cref="SaveFilePath"/> in a background thread. </summary>
@@ -151,39 +156,103 @@ namespace AaxDecrypter
 			if (ContentLength != 0 && WritePosition > ContentLength)
 				throw new WebException($"Specified write position (0x{WritePosition:X10}) is larger than  {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
-			var request = new HttpRequestMessage(HttpMethod.Get, Uri);
+			//Initiate connection with the first request block and
+			//get the total content length before returning.
+			var client = new HttpClient();
+			var response = await RequestNextByteRangeAsync(client);
+
+			if (ContentLength != 0 && ContentLength != response.FileSize)
+				throw new WebException($"Content length of 0x{response.FileSize:X10} differs from partially downloaded content length of 0x{ContentLength:X10}");
+			
+			ContentLength = response.FileSize;
+
+			_downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
+			//Hand off the client and the open request to the downloader to download and write data to file.
+			DownloadTask = Task.Run(() => DownloadLoopInternal(client , response), _cancellationSource.Token);
+		}
+
+		private async Task DownloadLoopInternal(HttpClient client, BlockResponse blockResponse)
+		{
+			try
+			{
+				long startPosition = WritePosition;
+
+				while (WritePosition < ContentLength && !IsCancelled)
+				{
+					try
+					{
+						await DownloadToFile(blockResponse);
+					}
+					catch (HttpIOException e)
+						when (e.HttpRequestError is HttpRequestError.ResponseEnded
+								&& WritePosition != startPosition
+								&& WritePosition < ContentLength && !IsCancelled)
+					{
+						Serilog.Log.Logger.Debug($"The download connection ended before the file completed downloading all 0x{ContentLength:X10} bytes");
+
+						//the download made *some* progress since the last attempt.
+						//Try again to complete the download from where it left off.
+						//Make sure to rewind file to last flush position.
+						_writeFile.Position = startPosition = WritePosition;
+						blockResponse.Dispose();
+						blockResponse = await RequestNextByteRangeAsync(client);
+
+						Serilog.Log.Logger.Debug($"Resuming the file download starting at position 0x{WritePosition:X10}.");
+					}
+				}
+			}
+			finally
+			{
+				_writeFile.Dispose();
+				blockResponse.Dispose();
+				client.Dispose();
+			}
+		}
+
+		private async Task<BlockResponse> RequestNextByteRangeAsync(HttpClient client)
+		{
+			using var request = new HttpRequestMessage(HttpMethod.Get, Uri);
+
+			//Just in case it snuck in the saved json (Issue #1232)
+			RequestHeaders.Remove("Range");
 
 			foreach (var header in RequestHeaders)
 				request.Headers.Add(header.Key, header.Value);
 
-			var response = await new HttpClient().SendAsync(request, HttpCompletionOption.ResponseHeadersRead, _cancellationSource.Token);
+			request.Headers.Add("Range", $"bytes={WritePosition}-");
+
+			var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, _cancellationSource.Token);
 
 			if (response.StatusCode != HttpStatusCode.PartialContent)
 				throw new WebException($"Server at {Uri.Host} responded with unexpected status code: {response.StatusCode}.");
 
-			//Content length is the length of the range request, and it is only equal
-			//to the complete file length if requesting Range: bytes=0-
-			if (WritePosition == 0)
-				ContentLength = response.Content.Headers.ContentLength.GetValueOrDefault();
+			var totalSize = response.Content.Headers.ContentRange?.Length ??
+				throw new WebException("The response did not contain a total content length.");
 
-			var networkStream = await response.Content.ReadAsStreamAsync(_cancellationSource.Token);
-			_downloadedPiece = new EventWaitHandle(false, EventResetMode.AutoReset);
+			var rangeSize = response.Content.Headers.ContentLength ??
+				throw new WebException($"The response did not contain a {nameof(response.Content.Headers.ContentLength)};");
 
-			//Download the file in the background.
+			return new BlockResponse(response, rangeSize, totalSize);
+		}
 
-			DownloadTask = Task.Run(() => DownloadFile(networkStream), _cancellationSource.Token);
+		private readonly record struct BlockResponse(HttpResponseMessage Response, long BlockSize, long FileSize) : IDisposable
+		{
+			public void Dispose() => Response?.Dispose();
 		}
 
 		/// <summary> Download <see cref="Uri"/> to <see cref="SaveFilePath"/>.</summary>
-		private async Task DownloadFile(Stream networkStream)
+		private async Task DownloadToFile(BlockResponse block)
 		{
+			var endPosition = WritePosition + block.BlockSize;
+			using var networkStream = await block.Response.Content.ReadAsStreamAsync(_cancellationSource.Token);
+
 			var downloadPosition = WritePosition;
 			var nextFlush = downloadPosition + DATA_FLUSH_SZ;
 			var buff = new byte[DOWNLOAD_BUFF_SZ];
 
 			try
 			{
-				DateTime startTime = DateTime.Now;
+				DateTime startTime = DateTime.UtcNow;
 				long bytesReadSinceThrottle = 0;
 				int bytesRead;
 				do
@@ -218,14 +287,15 @@ namespace AaxDecrypter
 
 					#endregion
 
-				} while (downloadPosition < ContentLength && !IsCancelled && bytesRead > 0);
+				} while (downloadPosition < endPosition && !IsCancelled && bytesRead > 0);
 
+				await _writeFile.FlushAsync(_cancellationSource.Token);
 				WritePosition = downloadPosition;
 
-				if (!IsCancelled && WritePosition < ContentLength)
+				if (!IsCancelled && WritePosition < endPosition)
 					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is less than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 
-				if (WritePosition > ContentLength)
+				if (WritePosition > endPosition)
 					throw new WebException($"Downloaded size (0x{WritePosition:X10}) is greater than {nameof(ContentLength)} (0x{ContentLength:X10}).");
 			}
 			catch (TaskCanceledException)
@@ -234,8 +304,6 @@ namespace AaxDecrypter
 			}
 			finally
 			{
-				networkStream.Close();
-				_writeFile.Close();
 				_downloadedPiece.Set();
 				OnUpdate();
 			}

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,14 +2,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>12.0.4.2</Version>
+    <Version>12.4.0.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="14.0.0" />
     <!-- 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.File" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.ZipFile" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>

Source/AppScaffolding/LibationScaffolding.cs

@@ -418,7 +418,6 @@ namespace AppScaffolding
             public List<string> Filters { get; set; } = new();
         }
 
-
 		public static void migrate_to_v12_0_1(Configuration config)
 		{
 #nullable enable

Source/ApplicationServices/ApplicationServices.csproj

@@ -6,7 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="33.0.1" />
-    <PackageReference Include="NPOI" Version="2.7.2" />
+    <PackageReference Include="NPOI" Version="2.7.3" />
   </ItemGroup>
 
   <ItemGroup>

Source/ApplicationServices/LibraryExporter.cs

@@ -104,9 +104,6 @@ namespace ApplicationServices
 		[Name("Content Type")]
 		public string ContentType { get; set; }
 
-        [Name("Audio Format")]
-		public string AudioFormat { get; set; }
-
 		[Name("Language")]
         public string Language { get; set; }
 
@@ -152,7 +149,6 @@ namespace ApplicationServices
 				BookStatus = a.Book.UserDefinedItem.BookStatus.ToString(),
 				PdfStatus = a.Book.UserDefinedItem.PdfStatus.ToString(),
 				ContentType = a.Book.ContentType.ToString(),
-				AudioFormat = a.Book.AudioFormat.ToString(),
 				Language = a.Book.Language,
 				LastDownloaded = a.Book.UserDefinedItem.LastDownloaded,
 				LastDownloadedVersion = a.Book.UserDefinedItem.LastDownloadedVersion?.ToString() ?? "",
@@ -228,7 +224,6 @@ namespace ApplicationServices
 				nameof(ExportDto.BookStatus),
 				nameof(ExportDto.PdfStatus),
 				nameof(ExportDto.ContentType),
-				nameof(ExportDto.AudioFormat),
                 nameof(ExportDto.Language),
                 nameof(ExportDto.LastDownloaded),
                 nameof(ExportDto.LastDownloadedVersion),
@@ -299,7 +294,6 @@ namespace ApplicationServices
 				row.CreateCell(col++).SetCellValue(dto.BookStatus);
 				row.CreateCell(col++).SetCellValue(dto.PdfStatus);
 				row.CreateCell(col++).SetCellValue(dto.ContentType);
-                row.CreateCell(col++).SetCellValue(dto.AudioFormat);
                 row.CreateCell(col++).SetCellValue(dto.Language);
 
 				if (dto.LastDownloaded.HasValue)

Source/AudibleUtilities/AccountsSettings.cs

@@ -47,6 +47,22 @@ namespace AudibleUtilities
 				update_no_validate();
 			}
 		}
+
+		private string _cdm;
+		[JsonProperty]
+		public string Cdm
+		{
+			get => _cdm;
+			set
+			{
+				if (value is null)
+					return;
+
+				_cdm = value;
+				update_no_validate();
+			}
+		}
+
 		[JsonIgnore]
 		public IReadOnlyList<Account> Accounts => _accounts_json.AsReadOnly();
 		#endregion

Source/AudibleUtilities/AudibleUtilities.csproj

@@ -5,7 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudibleApi" Version="9.3.2.1" />
+    <PackageReference Include="AudibleApi" Version="9.4.0.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.30.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -20,4 +21,9 @@
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
 
+	<ItemGroup>
+		<Compile Update="Widevine\Cdm.*.cs">
+			<DependentUpon>Cdm.cs</DependentUpon>
+		</Compile>
+	</ItemGroup>
 </Project>

Source/AudibleUtilities/Widevine/Cdm.Api.cs

@@ -0,0 +1,189 @@
+using AudibleApi;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Net.Http;
+using AudibleApi.Cryptography;
+using Newtonsoft.Json.Linq;
+using Dinah.Core.Net.Http;
+using System.Text.Json.Nodes;
+
+#nullable enable
+namespace AudibleUtilities.Widevine;
+
+public partial class Cdm
+{
+	/// <summary>
+	/// Get a <see cref="Cdm"/> from <see cref="AccountsSettings"/> or from the API.
+	/// </summary>
+	/// <returns>A <see cref="Cdm"/> if successful, otherwise <see cref="null"/></returns>
+	public static async Task<Cdm?> GetCdmAsync()
+	{
+		using var persister = AudibleApiStorage.GetAccountsSettingsPersister();
+
+		//Check if there are any Android accounts. If not, we can't use Widevine.
+		if (!persister.Target.Accounts.Any(a => a.IdentityTokens.DeviceType == Resources.DeviceType))
+			return null;
+
+		if (!string.IsNullOrEmpty(persister.Target.Cdm))
+		{
+			try
+			{
+				var cdm = Convert.FromBase64String(persister.Target.Cdm);
+				return new Cdm(new Device(cdm));
+			}
+			catch (Exception ex)
+			{
+				Serilog.Log.Logger.Error(ex, "Error loading CDM from account settings.");
+				persister.Target.Cdm = string.Empty;
+				//Clear the stored Cdm and try getting a fresh one from the server.
+			}
+		}
+
+		if (string.IsNullOrEmpty(persister.Target.Cdm))
+		{
+			using var client = new HttpClient();
+			if (await GetCdmUris(client) is not Uri[] uris)
+				return null;
+
+			//try to get a CDM file for any account that's registered as an android device.
+			//CDMs are not account-specific, so it doesn't matter which account we're successful with.
+			foreach (var account in persister.Target.Accounts.Where(a => a.IdentityTokens.DeviceType == Resources.DeviceType))
+			{
+				try
+				{
+					var requestMessage = CreateApiRequest(account);
+
+					await TestApiRequest(client, new JsonObject { { "body", requestMessage.ToString() } });
+
+					//Try all CDM URIs until a CDM has been retrieved successfully
+					foreach (var uri in uris)
+					{
+						try
+						{
+							var resp = await client.PostAsync(uri, ((HttpBody)requestMessage).Content);
+
+							if (!resp.IsSuccessStatusCode)
+							{
+								var message = await resp.Content.ReadAsStringAsync();
+								throw new ApiErrorException(uri, null, message);
+							}
+
+							var cdmBts = await resp.Content.ReadAsByteArrayAsync();
+							var device = new Device(cdmBts);
+							persister.Target.Cdm = Convert.ToBase64String(cdmBts);
+							return new Cdm(device);
+						}
+						catch (Exception ex)
+						{
+							Serilog.Log.Logger.Error(ex, "Error getting a CDM from URI: " + uri);
+							//try the next URI
+						}
+					}
+				}
+				catch (Exception ex)
+				{
+					Serilog.Log.Logger.Error(ex, "Error getting a CDM for account: " + account.MaskedLogEntry);
+					//try the next Account
+				}
+			}
+		}
+
+		return null;
+	}
+
+	/// <summary>
+	/// Get a list of CDM API URIs from the main Gitgub repository's .cdmurls.json file.
+	/// </summary>
+	/// <returns>If successful, an array of URIs to try. Otherwise null</returns>
+	private static async Task<Uri[]?> GetCdmUris(HttpClient httpClient)
+	{
+		const string CdmUrlListFile = "https://raw.githubusercontent.com/rmcrackan/Libation/refs/heads/master/.cdmurls.json";
+
+		try
+		{
+			var fileContents = await httpClient.GetStringAsync(CdmUrlListFile);
+			var releaseIndex = JObject.Parse(fileContents);
+			var urlArray = releaseIndex["CdmUrls"] as JArray;
+			if (urlArray is null)
+				throw new System.IO.InvalidDataException("CDM url list not found in JSON: " + fileContents);
+
+			var uris = urlArray.Select(u => u.Value<string>()).OfType<string>().Select(u => new Uri(u)).ToArray();
+
+			if (uris.Length == 0)
+				throw  new System.IO.InvalidDataException("No CDM url found in JSON: " + fileContents);
+
+			return uris;
+		}
+		catch (Exception ex)
+		{
+			Serilog.Log.Logger.Error(ex, "Error getting CDM URLs");
+			return null;
+		}
+	}
+
+
+	static readonly string[] TLDs = ["com", "co.uk", "com.au", "com.br", "ca", "fr", "de", "in", "it", "co.jp", "es"];
+
+	//Ensure that the request can be made successfully before sending it to the API
+	//The API uses System.Text.Json, so perform test with same.
+	private static async Task TestApiRequest(HttpClient client, JsonObject input)
+	{
+		if (input["body"]?.GetValue<string>() is not string body
+				|| JsonNode.Parse(body) is not JsonNode bodyJson)
+			throw new Exception("Api request doesn't contain a body");
+
+		if (bodyJson?["Url"]?.GetValue<string>() is not string url
+			|| !Uri.TryCreate(url, UriKind.Absolute, out var uri))
+			throw new Exception("Api request doesn't contain a url");
+
+		if (!TLDs.Select(tld => "api.audible." + tld).Contains(uri.Host.ToLower()))
+			throw new Exception($"Unknown Audible Api domain: {uri.Host}");
+
+		if (bodyJson?["Headers"] is not JsonObject headers)
+			throw new Exception($"Api request doesn't contain any headers");
+
+		using var request = new HttpRequestMessage(HttpMethod.Get, uri);
+
+		Dictionary<string, string>? headersDict = null;
+		try
+		{
+			headersDict = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, string>>(headers);
+		}
+		catch (Exception ex)
+		{
+			throw new Exception("Failed to read Audible Api headers.", ex);
+		}
+
+		if (headersDict is null)
+			throw new Exception("Failed to read Audible Api headers.");
+
+		foreach (var kvp in headersDict)
+			request.Headers.Add(kvp.Key, kvp.Value);
+
+		using var resp = await client.SendAsync(request);
+		resp.EnsureSuccessStatusCode();
+	}
+
+	/// <summary>
+	/// Create a request body to send to the API
+	/// </summary>
+	/// <param name="account">An authenticated account</param>
+	private static JObject CreateApiRequest(Account account)
+	{
+		const string ACCOUNT_INFO_PATH = "/1.0/account/information";
+
+		var message = new HttpRequestMessage(HttpMethod.Get, ACCOUNT_INFO_PATH);
+		message.SignRequest(
+					DateTime.UtcNow,
+					account.IdentityTokens.AdpToken,
+					account.IdentityTokens.PrivateKey);
+
+		return new JObject
+		{
+			{ "Url", new Uri(account.Locale.AudibleApiUri(), ACCOUNT_INFO_PATH) },
+			{ "Headers", JObject.FromObject(message.Headers.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.Single())) }
+		};
+	}
+}

Source/AudibleUtilities/Widevine/Cdm.cs

@@ -0,0 +1,300 @@
+using Google.Protobuf;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+
+#nullable enable
+namespace AudibleUtilities.Widevine;
+
+public enum KeyType
+{
+	/// <summary>
+	/// Exactly one key of this type must appear.
+	/// </summary>
+	Signing = 1,
+	/// <summary>
+	/// Content key.
+	/// </summary>
+	Content = 2,
+	/// <summary>
+	/// Key control block for license renewals. No key.
+	/// </summary>
+	KeyControl = 3,
+	/// <summary>
+	/// wrapped keys for auxiliary crypto operations.
+	/// </summary>
+	OperatorSession = 4,
+	/// <summary>
+	/// Entitlement keys.
+	/// </summary>
+	Entitlement = 5,
+	/// <summary>
+	/// Partner-specific content key.
+	/// </summary>
+	OemContent = 6,
+}
+
+public interface ISession : IDisposable
+{
+	string? GetLicenseChallenge(MpegDash dash);
+	WidevineKey[] ParseLicense(string licenseMessage);
+}
+
+public class WidevineKey
+{
+	public Guid Kid { get; }
+	public KeyType Type { get; }
+	public byte[] Key { get; }
+	internal WidevineKey(Guid kid, License.Types.KeyContainer.Types.KeyType type, byte[] key)
+	{
+		Kid = kid;
+		Type = (KeyType)type;
+		Key = key;
+	}
+	public override string ToString() => $"{Convert.ToHexString(Kid.ToByteArray()).ToLower()}:{Convert.ToHexString(Key).ToLower()}";
+}
+
+public partial class Cdm
+{
+	public static Guid WidevineContentProtection { get; } = new("edef8ba9-79d6-4ace-a3c8-27dcd51d21ed");
+	private const int MAX_NUM_OF_SESSIONS = 16;
+	internal Device Device { get; }
+
+	private ConcurrentDictionary<Guid, Session> Sessions { get; } = new(-1, MAX_NUM_OF_SESSIONS);
+
+	internal Cdm(Device device)
+	{
+		Device = device;
+	}
+
+	public ISession OpenSession()
+	{
+		if (Sessions.Count == MAX_NUM_OF_SESSIONS)
+			throw new Exception("Too Many Sessions");
+
+		var session = new Session(Sessions.Count + 1, this);
+
+		var ddd = Sessions.TryAdd(session.Id, session);
+		return session;
+	}
+
+	#region Session
+
+	internal class Session : ISession
+	{
+		public Guid Id { get; } = Guid.NewGuid();
+		private int SessionNumber { get; }
+		private Cdm Cdm { get; }
+		private byte[]? EncryptionContext { get; set; }
+		private byte[]? AuthenticationContext { get; set; }
+
+		public Session(int number, Cdm cdm)
+		{
+			SessionNumber = number;
+			Cdm = cdm;
+		}
+
+		private string GetRequestId()
+			=> $"{RandomUint():x8}00000000{Convert.ToHexString(BitConverter.GetBytes((long)SessionNumber)).ToLowerInvariant()}";
+
+		public void Dispose()
+		{
+			if (Cdm.Sessions.ContainsKey(Id))
+				Cdm.Sessions.TryRemove(Id, out var session);
+		}
+
+		public string? GetLicenseChallenge(MpegDash dash)
+		{
+			if (!dash.TryGetPssh(Cdm.WidevineContentProtection, out var pssh))
+				return null;
+
+			var licRequest = new LicenseRequest
+			{
+				ClientId = Cdm.Device.ClientId,
+				ContentId = new()
+				{
+					WidevinePsshData = new()
+					{
+						LicenseType = LicenseType.Offline,
+						RequestId = ByteString.CopyFrom(GetRequestId(), Encoding.ASCII)
+					}
+				},
+				Type = LicenseRequest.Types.RequestType.New,
+				RequestTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
+				ProtocolVersion = ProtocolVersion.Version21,
+				KeyControlNonce = RandomUint()
+			};
+
+			licRequest.ContentId.WidevinePsshData.PsshData.Add(ByteString.CopyFrom(pssh.InitData));
+
+			var licRequestBts = licRequest.ToByteArray();
+			EncryptionContext = CreateContext("ENCRYPTION", 128, licRequestBts);
+			AuthenticationContext = CreateContext("AUTHENTICATION", 512, licRequestBts);
+
+			var signedMessage = new SignedMessage
+			{
+				Type = SignedMessage.Types.MessageType.LicenseRequest,
+				Msg = ByteString.CopyFrom(licRequestBts),
+				Signature = ByteString.CopyFrom(Cdm.Device.SignMessage(licRequestBts))
+			};
+
+			return Convert.ToBase64String(signedMessage.ToByteArray());
+		}
+
+		public WidevineKey[] ParseLicense(string licenseMessage)
+		{
+			if (EncryptionContext is null || AuthenticationContext is null)
+				throw new InvalidOperationException($"{nameof(GetLicenseChallenge)}() must be called before calling {nameof(ParseLicense)}()");
+
+			var signedMessage = SignedMessage.Parser.ParseFrom(Convert.FromBase64String(licenseMessage));
+			if (signedMessage.Type != SignedMessage.Types.MessageType.License)
+				throw new InvalidDataException("Invalid license");
+
+			var sessionKey = Cdm.Device.DecryptSessionKey(signedMessage.SessionKey.ToByteArray());
+
+			if (!VerifySignature(signedMessage, AuthenticationContext, sessionKey))
+				throw new InvalidDataException("Message signature is invalid");
+
+			var license = License.Parser.ParseFrom(signedMessage.Msg);
+			var keyToTheKeys = DeriveKey(sessionKey, EncryptionContext, 1);
+
+			return DecryptKeys(keyToTheKeys, license.Key);
+		}
+
+		private static WidevineKey[] DecryptKeys(byte[] keyToTheKeys, IList<License.Types.KeyContainer> licenseKeys)
+		{
+			using var aes = Aes.Create();
+			aes.Key = keyToTheKeys;
+			var keys = new WidevineKey[licenseKeys.Count];
+
+			for (int i = 0; i < licenseKeys.Count; i++)
+			{
+				var keyContainer = licenseKeys[i];
+
+				var keyBytes = aes.DecryptCbc(keyContainer.Key.ToByteArray(), keyContainer.Iv.ToByteArray(), PaddingMode.PKCS7);
+				var id = keyContainer.Id.ToByteArray();
+
+				if (id.Length > 16)
+				{
+					var tryB64 = new byte[id.Length * 3 / 4];
+					if (Convert.TryFromBase64String(Encoding.ASCII.GetString(id), tryB64, out int bytesWritten))
+					{
+						id = tryB64;
+					}
+					Array.Resize(ref id, 16);
+				}
+				else if (id.Length < 16)
+				{
+					id = id.Append(new byte[16 - id.Length]);
+				}
+
+				keys[i] = new WidevineKey(new Guid(id), keyContainer.Type, keyBytes);
+			}
+			return keys;
+		}
+
+		private static bool VerifySignature(SignedMessage signedMessage, byte[] authContext, byte[] sessionKey)
+		{
+			var mac_key_server = DeriveKey(sessionKey, authContext, 1).Append(DeriveKey(sessionKey, authContext, 2));
+
+			var hmacData = (signedMessage.OemcryptoCoreMessage?.ToByteArray() ?? []).Append(signedMessage.Msg?.ToByteArray() ?? []);
+
+			var computed_signature = HMACSHA256.HashData(mac_key_server, hmacData);
+
+			return computed_signature.SequenceEqual(signedMessage.Signature);
+		}
+
+		private static byte[] DeriveKey(byte[] session_key, byte[] context, int counter)
+		{
+			var data = new byte[context.Length + 1];
+			Array.Copy(context, 0, data, 1, context.Length);
+			data[0] = (byte)counter;
+
+			return AESCMAC(session_key, data);
+		}
+
+		private static byte[] AESCMAC(byte[] key, byte[] data)
+		{
+			using var aes = Aes.Create();
+			aes.Key = key;
+
+			// SubKey generation
+			// step 1, AES-128 with key K is applied to an all-zero input block.
+			byte[] subKey = aes.EncryptCbc(new byte[16], new byte[16], PaddingMode.None);
+
+			nextSubKey();
+
+			// MAC computing
+			if ((data.Length == 0) || (data.Length % 16 != 0))
+			{
+				// If the size of the input message block is not equal to a positive
+				// multiple of the block size (namely, 128 bits), the last block shall
+				// be padded with 10^i
+				nextSubKey();
+				var padLen = 16 - data.Length % 16;
+				Array.Resize(ref data, data.Length + padLen);
+				data[^padLen] = 0x80;
+			}
+
+			// the last block shall be exclusive-OR'ed with K1 before processing
+			for (int j = 0; j < subKey.Length; j++)
+				data[data.Length - 16 + j] ^= subKey[j];
+
+			// The result of the previous process will be the input of the last encryption.
+			byte[] encResult = aes.EncryptCbc(data, new byte[16], PaddingMode.None);
+
+			byte[] HashValue = new byte[16];
+			Array.Copy(encResult, encResult.Length - HashValue.Length, HashValue, 0, HashValue.Length);
+
+			return HashValue;
+
+			void nextSubKey()
+			{
+				const byte const_Rb = 0x87;
+				if (Rol(subKey) != 0)
+					subKey[15] ^= const_Rb;
+
+				static int Rol(byte[] b)
+				{
+					int carry = 0;
+
+					for (int i = b.Length - 1; i >= 0; i--)
+					{
+						ushort u = (ushort)(b[i] << 1);
+						b[i] = (byte)((u & 0xff) + carry);
+						carry = (u & 0xff00) >> 8;
+					}
+					return carry;
+				}
+			}
+		}
+
+		private static byte[] CreateContext(string label, int keySize, byte[] licRequestBts)
+		{
+			var contextSize = label.Length + 1 + licRequestBts.Length + sizeof(int);
+
+			var context = new byte[contextSize];
+			var numChars = Encoding.ASCII.GetBytes(label.AsSpan(), context);
+			Array.Copy(licRequestBts, 0, context, numChars + 1, licRequestBts.Length);
+
+			var numBts = BitConverter.GetBytes(keySize);
+			if (BitConverter.IsLittleEndian)
+				Array.Reverse(numBts);
+			Array.Copy(numBts, 0, context, context.Length - sizeof(int), sizeof(int));
+			return context;
+		}
+
+		private static uint RandomUint()
+		{
+			var bts = new byte[4];
+			new Random().NextBytes(bts);
+			return BitConverter.ToUInt32(bts, 0);
+		}
+	}
+
+	#endregion
+}

Source/AudibleUtilities/Widevine/Device.cs

@@ -0,0 +1,73 @@
+using System;
+using System.IO;
+using System.Security.Cryptography;
+
+#nullable enable
+namespace AudibleUtilities.Widevine;
+
+internal enum DeviceTypes : byte
+{
+	Unknown = 0,
+	Chrome = 1,
+	Android = 2
+}
+
+internal class Device
+{
+	public DeviceTypes Type { get; }
+	public int FileVersion { get; }
+	public int SecurityLevel { get; }
+	public int Flags { get; }
+
+	public RSA CdmKey { get; }
+	internal ClientIdentification ClientId { get; }
+
+	public Device(Span<byte> fileData)
+	{
+		if (fileData.Length < 7 || fileData[0] != 'W' || fileData[1] != 'V' || fileData[2] != 'D')
+			throw new InvalidDataException();
+
+		FileVersion = fileData[3];
+		Type = (DeviceTypes)fileData[4];
+		SecurityLevel = fileData[5];
+		Flags = fileData[6];
+
+		if (FileVersion != 2)
+			throw new InvalidDataException($"Unknown CDM File Version: '{FileVersion}'");
+		if (Type != DeviceTypes.Android)
+			throw new InvalidDataException($"Unknown CDM Type: '{Type}'");
+		if (SecurityLevel != 3)
+			throw new InvalidDataException($"Unknown CDM Security Level: '{SecurityLevel}'");
+
+		var privateKeyLength = (fileData[7] << 8) | fileData[8];
+
+		if (privateKeyLength <= 0 || fileData.Length < 9 + privateKeyLength + 2)
+			throw new InvalidDataException($"Invalid private key length: '{privateKeyLength}'");
+
+		var clientIdLength = (fileData[9 + privateKeyLength] << 8) | fileData[10 + privateKeyLength];
+
+		if (clientIdLength <= 0 || fileData.Length < 11 + privateKeyLength + clientIdLength)
+			throw new InvalidDataException($"Invalid client id length: '{clientIdLength}'");
+
+		ClientId = ClientIdentification.Parser.ParseFrom(fileData.Slice(11 + privateKeyLength));
+		CdmKey = RSA.Create();
+		CdmKey.ImportRSAPrivateKey(fileData.Slice(9, privateKeyLength), out _);
+	}
+
+	public byte[] SignMessage(byte[] message)
+	{
+		using var sha1 = SHA1.Create();
+		var digestion = sha1.ComputeHash(message);
+		return CdmKey.SignHash(digestion, HashAlgorithmName.SHA1, RSASignaturePadding.Pss);
+	}
+
+	public bool VerifyMessage(byte[] message, byte[] signature)
+	{
+		using var sha1 = SHA1.Create();
+		var digestion = sha1.ComputeHash(message);
+		return CdmKey.VerifyHash(digestion, signature, HashAlgorithmName.SHA1, RSASignaturePadding.Pss);
+	}
+
+	public byte[] DecryptSessionKey(byte[] sessionKey)
+		=> CdmKey.Decrypt(sessionKey, RSAEncryptionPadding.OaepSHA1);
+}

Source/AudibleUtilities/Widevine/Extensions.cs

@@ -0,0 +1,15 @@
+using System;
+
+#nullable enable
+namespace AudibleUtilities.Widevine;
+
+internal static class Extensions
+{
+	public static T[] Append<T>(this T[] message, T[] appendData)
+	{
+		var origLength = message.Length;
+		Array.Resize(ref message, origLength + appendData.Length);
+		Array.Copy(appendData, 0, message, origLength, appendData.Length);
+		return message;
+	}
+}

Source/AudibleUtilities/Widevine/MpegDash.cs

@@ -0,0 +1,70 @@
+using Mpeg4Lib.Boxes;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Xml;
+using System.Xml.Linq;
+using System.Xml.XPath;
+
+#nullable enable
+namespace AudibleUtilities.Widevine;
+
+public class MpegDash
+{
+	private const string MpegDashNamespace = "urn:mpeg:dash:schema:mpd:2011";
+	private const string CencNamespace = "urn:mpeg:cenc:2013";
+	private const string UuidPreamble = "urn:uuid:";
+	private XElement DashMpd { get; }
+	private static XmlNamespaceManager NamespaceManager { get; } = new(new NameTable());
+	static MpegDash()
+	{
+		NamespaceManager.AddNamespace("dash", MpegDashNamespace);
+		NamespaceManager.AddNamespace("cenc", CencNamespace);
+	}
+
+	public MpegDash(Stream contents)
+	{
+		DashMpd = XElement.Load(contents);
+	}
+
+	public bool TryGetUri(Uri baseUri, [NotNullWhen(true)] out Uri? fileUri)
+	{
+		foreach (var baseUrl in DashMpd.XPathSelectElements("/dash:Period/dash:AdaptationSet/dash:Representation/dash:BaseURL", NamespaceManager))
+		{
+			try
+			{
+				fileUri = new Uri(baseUri, baseUrl.Value);
+				return true;
+			}
+			catch
+			{
+				fileUri = null;
+				return false;
+			}
+		}
+		fileUri = null;
+		return false;
+	}
+
+	public bool TryGetPssh(Guid protectionSystemId, [NotNullWhen(true)] out PsshBox? pssh)
+	{
+		foreach (var psshEle in DashMpd.XPathSelectElements("/dash:Period/dash:AdaptationSet/dash:ContentProtection/cenc:pssh", NamespaceManager))
+		{
+			if (psshEle?.Value?.Trim() is string psshStr
+				&& psshEle.Parent?.Attribute(XName.Get("schemeIdUri")) is XAttribute scheme
+				&& scheme.Value is string uuid
+				&& uuid.Equals(UuidPreamble + protectionSystemId.ToString(), StringComparison.OrdinalIgnoreCase))
+			{
+				Span<byte> buffer = new byte[psshStr.Length * 3 / 4];
+				if (Convert.TryFromBase64String(psshStr, buffer, out var written))
+				{
+					using var ms = new MemoryStream(buffer.Slice(0, written).ToArray());
+					pssh = BoxFactory.CreateBox(ms, null) as PsshBox;
+					return pssh is not null;
+				}
+			}
+		}
+		pssh = null;
+		return false;
+	}
+}

Source/DataLayer/Configurations/BookConfig.cs

@@ -19,7 +19,6 @@ namespace DataLayer.Configurations
             //
             entity.Ignore(nameof(Book.Authors));
             entity.Ignore(nameof(Book.Narrators));
-            entity.Ignore(nameof(Book.AudioFormat));
             entity.Ignore(nameof(Book.TitleWithSubtitle));
             entity.Ignore(b => b.Categories);
 

Source/DataLayer/DataLayer.csproj

@@ -12,12 +12,12 @@
   <ItemGroup>
     <PackageReference Include="Dinah.Core" Version="9.0.1.1" />
     <PackageReference Include="Dinah.EntityFrameworkCore" Version="9.0.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Source/DataLayer/EfClasses/AudioFormat.cs

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

Source/DataLayer/EfClasses/Book.cs

@@ -43,9 +43,9 @@ namespace DataLayer
         public ContentType ContentType { get; private set; }
         public string Locale { get; private set; }
 
-        internal AudioFormatEnum _audioFormat;
-
-        public AudioFormat AudioFormat { get => AudioFormat.FromEnum(_audioFormat); set => _audioFormat = value.ToEnum(); }
+        //This field is now unused, however, there is little sense in adding a
+        //database migration to remove an unused field. Leave it for compatibility.
+        internal long _audioFormat;
 
         // mutable
         public string PictureId { get; set; }

Source/DataLayer/EfClasses/Contributor.cs

@@ -43,5 +43,7 @@ namespace DataLayer
 		}
 
 		public override string ToString() => Name;
+		public void SetAudibleContributorId(string audibleContributorId)
+			=> AudibleContributorId = audibleContributorId;
 	}
 }

Source/DtoImporterService/BookImporter.cs

@@ -154,9 +154,6 @@ namespace DtoImporterService
 			// Update the book titles, since formatting can change
 			book.UpdateTitle(item.Title, item.Subtitle);
 
-			var codec = item.AvailableCodecs?.Max(f => AudioFormat.FromString(f.EnhancedCodec)) ?? new AudioFormat();
-			book.AudioFormat = codec;
-
 			// set/update book-specific info which may have changed
 			if (item.PictureId is not null)
 				book.PictureId = item.PictureId;

Source/DtoImporterService/ContributorImporter.cs

@@ -61,19 +61,19 @@ namespace DtoImporterService
 
 		private int upsertPeople(List<Person> people)
 		{
-			var hash = people
-				// new people only
-				.Where(p => !Cache.ContainsKey(p.Name))
-				// remove duplicates by Name. first in wins
-				.ToDictionarySafe(p => p.Name);
-
-			foreach (var kvp in hash)
+			var qtyNew = 0;
+			foreach (var person in people)
 			{
-				var person = kvp.Value;
-				addContributor(person.Name, person.Asin);
+				if (!Cache.TryGetValue(person.Name, out var contributor))
+				{
+					contributor = createContributor(person.Name, person.Asin);
+					qtyNew++;
+				}
+
+				updateContributor(person, contributor);
 			}
 
-			return hash.Count;
+			return qtyNew;
 		}
 
 		// only use after loading contributors => local
@@ -86,16 +86,22 @@ namespace DtoImporterService
 				.ToHashSet();
 
 			foreach (var pub in hash)
-				addContributor(pub);
+				createContributor(pub);
 
 			return hash.Count;
 		}
 
-		private Contributor addContributor(string name, string id = null)
+		private void updateContributor(Person person, Contributor contributor)
+		{
+			if (person.Asin != contributor.AudibleContributorId)
+				contributor.SetAudibleContributorId(person.Asin);
+		}
+
+		private Contributor createContributor(string name, string id = null)
 		{
 			try
 			{
-				var newContrib = new Contributor(name);
+				var newContrib = new Contributor(name, id);
 
 				var entityEntry = DbContext.Contributors.Add(newContrib);
 				var entity = entityEntry.Entity;

Source/DtoImporterService/LibraryBookImporter.cs

@@ -62,7 +62,7 @@ namespace DtoImporterService
 						existing.SetAccount(item.AccountId);
 					}
 
-					existing.AbsentFromLastScan = isPlusTitleUnavailable(item);
+					existing.AbsentFromLastScan = isUnavailable(item);
 				}
 				else
 				{
@@ -71,7 +71,7 @@ namespace DtoImporterService
 						item.DtoItem.DateAdded,
 						item.AccountId)
 						{
-							AbsentFromLastScan = isPlusTitleUnavailable(item)
+							AbsentFromLastScan = isUnavailable(item)
 						};
 
 					try
@@ -113,7 +113,13 @@ namespace DtoImporterService
 		}
 
 		private static ImportItem tieBreak(ImportItem item1, ImportItem item2)
-			=> isPlusTitleUnavailable(item1) && !isPlusTitleUnavailable(item2) ? item2 : item1;
+			=> isUnavailable(item1) && !isUnavailable(item2) ? item2 : item1;
+
+		private static bool isUnavailable(ImportItem item)
+			=> isFutureRelease(item) || isPlusTitleUnavailable(item);
+
+        private static bool isFutureRelease(ImportItem item)
+			=> item.DtoItem.IssueDate is DateTimeOffset dt && dt > DateTimeOffset.UtcNow;
 
 		private static bool isPlusTitleUnavailable(ImportItem item)
 			=> item.DtoItem.ContentType is null

Source/FileLiberator/AudioDecodable.cs

@@ -15,53 +15,28 @@ namespace FileLiberator
         public event EventHandler<byte[]> CoverImageDiscovered;
         public abstract Task CancelAsync();
 
-        protected LameConfig GetLameOptions(Configuration config)
-        {
-			LameConfig lameConfig = new()
-			{
-				Mode = MPEGMode.Mono,
-				Quality = config.LameEncoderQuality,
-                OutputSampleRate = (int)config.MaxSampleRate
-			};
-
-			if (config.LameTargetBitrate)
-            {
-                if (config.LameConstantBitrate)
-                    lameConfig.BitRate = config.LameBitrate;
-                else
-                {
-                    lameConfig.ABRRateKbps = config.LameBitrate;
-                    lameConfig.VBR = VBRMode.ABR;
-                    lameConfig.WriteVBRTag = true;
-                }
-            }
-            else
-            {
-                lameConfig.VBR = VBRMode.Default;
-                lameConfig.VBRQuality = config.LameVBRQuality;
-                lameConfig.WriteVBRTag = true;
-            }
-            return lameConfig;
-        }
         protected void OnTitleDiscovered(string title) => OnTitleDiscovered(null, title);
         protected void OnTitleDiscovered(object _, string title)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(TitleDiscovered), Title = title });
-            TitleDiscovered?.Invoke(this, title);
+            if (title != null)
+                TitleDiscovered?.Invoke(this, title);
 		}
 
         protected void OnAuthorsDiscovered(string authors) => OnAuthorsDiscovered(null, authors);
         protected void OnAuthorsDiscovered(object _, string authors)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(AuthorsDiscovered), Authors = authors });
-            AuthorsDiscovered?.Invoke(this, authors);
+			if (authors != null)
+				AuthorsDiscovered?.Invoke(this, authors);
 		}
 
         protected void OnNarratorsDiscovered(string narrators) => OnNarratorsDiscovered(null, narrators);
         protected void OnNarratorsDiscovered(object _, string narrators)
 		{
             Serilog.Log.Logger.Debug("Event fired {@DebugInfo}", new { Name = nameof(NarratorsDiscovered), Narrators = narrators });
-            NarratorsDiscovered?.Invoke(this, narrators);
+			if (narrators != null)
+				NarratorsDiscovered?.Invoke(this, narrators);
 		}
 
         protected byte[] OnRequestCoverArt()

Source/FileLiberator/AudioFileStorageExt.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using DataLayer;
 using LibationFileManager;
+using LibationFileManager.Templates;
 
 namespace FileLiberator
 {
@@ -38,14 +39,20 @@ namespace FileLiberator
 		/// Path: in progress directory.
 		/// File name: final file name.
 		/// </summary>
-		public static string GetInProgressFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
-			=> Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.DecryptInProgressDirectory, extension, returnFirstExisting: true);
+		public static string GetInProgressFilename(this AudioFileStorage _, LibraryBookDto libraryBook, string extension)
+			=> Templates.File.GetFilename(libraryBook, AudibleFileStorage.DecryptInProgressDirectory, extension, returnFirstExisting: true);
 
 		/// <summary>
 		/// PDF: audio file does not exist
 		/// </summary>
 		public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBook libraryBook, string extension)
 			=> Templates.File.GetFilename(libraryBook.ToDto(), AudibleFileStorage.BooksDirectory, extension);
+		
+		/// <summary>
+		/// PDF: audio file does not exist
+		/// </summary>
+		public static string GetBooksDirectoryFilename(this AudioFileStorage _, LibraryBookDto dto, string extension)
+			=> Templates.File.GetFilename(dto, AudibleFileStorage.BooksDirectory, extension);
 
 		/// <summary>
 		/// PDF: audio file already exists

Source/FileLiberator/ConvertToMp3.cs

@@ -44,13 +44,17 @@ namespace FileLiberator
 
 					var m4bBook = await Task.Run(() => new Mp4File(m4bPath, FileAccess.Read));
 
+					//AAXClean.Codecs only supports decoding AAC and E-AC-3 audio.
+					if (m4bBook.AudioSampleEntry.Esds is null && m4bBook.AudioSampleEntry.Dec3 is null)
+						continue;
+
 					OnTitleDiscovered(m4bBook.AppleTags.Title);
 					OnAuthorsDiscovered(m4bBook.AppleTags.FirstAuthor);
 					OnNarratorsDiscovered(m4bBook.AppleTags.Narrator);
 					OnCoverImageDiscovered(m4bBook.AppleTags.Cover);
 
 					var config = Configuration.Instance;
-					var lameConfig = GetLameOptions(config);
+					var lameConfig = DownloadOptions.GetLameOptions(config);
 					var chapters = m4bBook.GetChaptersFromMetadata();
 					//Finishing configuring lame encoder.
 					AaxDecrypter.MpegUtil.ConfigureLameOptions(

Source/FileLiberator/DownloadDecryptBook.cs

@@ -47,13 +47,18 @@ namespace FileLiberator
                 if (libraryBook.Book.Audio_Exists())
                     return new StatusHandler { "Cannot find decrypt. Final audio file already exists" };
 
+                downloadValidation(libraryBook);
+				var api = await libraryBook.GetApiAsync();
+                var config = Configuration.Instance;
+				using var downloadOptions = await DownloadOptions.InitiateDownloadAsync(api, config, libraryBook);
+
                 bool success = false;
                 try
                 {
                     FilePathCache.Inserted += FilePathCache_Inserted;
                     FilePathCache.Removed += FilePathCache_Removed;
 
-                    success = await downloadAudiobookAsync(libraryBook);
+                    success = await downloadAudiobookAsync(api, config, downloadOptions);
                 }
                 finally
                 {
@@ -78,12 +83,12 @@ namespace FileLiberator
                 var finalStorageDir = getDestinationDirectory(libraryBook);
 
                 var moveFilesTask = Task.Run(() => moveFilesToBooksDir(libraryBook, entries));
-                Task[] finalTasks = new[]
-                {
-                    Task.Run(() => downloadCoverArt(libraryBook)),
+                Task[] finalTasks =
+                [
+                    Task.Run(() => downloadCoverArt(downloadOptions)),
                     moveFilesTask,
                     Task.Run(() => WindowsDirectory.SetCoverAsFolderIcon(libraryBook.Book.PictureId, finalStorageDir))
-                };
+                ];
 
 				try
                 {
@@ -116,21 +121,12 @@ namespace FileLiberator
             }
         }
 
-        private async Task<bool> downloadAudiobookAsync(LibraryBook libraryBook)
+        private async Task<bool> downloadAudiobookAsync(AudibleApi.Api api, Configuration config, DownloadOptions dlOptions)
         {
-            var config = Configuration.Instance;
-
-            downloadValidation(libraryBook);
-
-            var quality = (AudibleApi.DownloadQuality)config.FileDownloadQuality;
-            var api = await libraryBook.GetApiAsync();
-            var contentLic = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, quality);
-			using var dlOptions = BuildDownloadOptions(libraryBook, config, contentLic);
-
-            var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(libraryBook, dlOptions.OutputFormat.ToString().ToLower());
+			var outFileName = AudibleFileStorage.Audio.GetInProgressFilename(dlOptions.LibraryBookDto, dlOptions.OutputFormat.ToString().ToLower());
             var cacheDir = AudibleFileStorage.DownloadsInProgressDirectory;
 
-            if (contentLic.DrmType != DrmType.Adrm)
+            if (dlOptions.DrmType is not DrmType.Adrm and not DrmType.Widevine)
                 abDownloader = new UnencryptedAudiobookDownloader(outFileName, cacheDir, dlOptions);
             else
             {
@@ -140,7 +136,7 @@ namespace FileLiberator
                     new AaxcDownloadSingleConverter(outFileName, cacheDir, dlOptions);
 
                 if (config.AllowLibationFixup)
-                    converter.RetrievedMetadata += (_, tags) => tags.Generes = string.Join(", ", libraryBook.Book.LowestCategoryNames());
+                    converter.RetrievedMetadata += Converter_RetrievedMetadata;
 
                 abDownloader = converter;
             }
@@ -151,201 +147,47 @@ namespace FileLiberator
             abDownloader.RetrievedAuthors += OnAuthorsDiscovered;
             abDownloader.RetrievedNarrators += OnNarratorsDiscovered;
             abDownloader.RetrievedCoverArt += AaxcDownloader_RetrievedCoverArt;
-            abDownloader.FileCreated += (_, path) => OnFileCreated(libraryBook, path);
+            abDownloader.FileCreated += (_, path) => OnFileCreated(dlOptions.LibraryBook, path);
 
             // REAL WORK DONE HERE
             var success = await abDownloader.RunAsync();
 
 			if (success && config.SaveMetadataToFile)
             {
-                var metadataFile = Templates.File.GetFilename(dlOptions.LibraryBookDto, Path.GetDirectoryName(outFileName), ".metadata.json");
+                var metadataFile = LibationFileManager.Templates.Templates.File.GetFilename(dlOptions.LibraryBookDto, Path.GetDirectoryName(outFileName), ".metadata.json");
 
-                var item = await api.GetCatalogProductAsync(libraryBook.Book.AudibleProductId, AudibleApi.CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
-				item.SourceJson.Add(nameof(ContentMetadata.ChapterInfo), Newtonsoft.Json.Linq.JObject.FromObject(contentLic.ContentMetadata.ChapterInfo));
-				item.SourceJson.Add(nameof(ContentMetadata.ContentReference), Newtonsoft.Json.Linq.JObject.FromObject(contentLic.ContentMetadata.ContentReference));
+                var item = await api.GetCatalogProductAsync(dlOptions.LibraryBook.Book.AudibleProductId, AudibleApi.CatalogOptions.ResponseGroupOptions.ALL_OPTIONS);
+				item.SourceJson.Add(nameof(ContentMetadata.ChapterInfo), Newtonsoft.Json.Linq.JObject.FromObject(dlOptions.ContentMetadata.ChapterInfo));
+				item.SourceJson.Add(nameof(ContentMetadata.ContentReference), Newtonsoft.Json.Linq.JObject.FromObject(dlOptions.ContentMetadata.ContentReference));
 
-				File.WriteAllText(metadataFile, item.SourceJson.ToString());
-				OnFileCreated(libraryBook, metadataFile);
-			}            
+                File.WriteAllText(metadataFile, item.SourceJson.ToString());
+                OnFileCreated(dlOptions.LibraryBook, metadataFile);
+            }
 			return success;
-        }
+		}
 
-		private DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, ContentLicense contentLic)
-        {
-			//If DrmType != Adrm the delivered file is an unencrypted mp3.
+		private void Converter_RetrievedMetadata(object sender, AAXClean.AppleTags tags)
+		{
+            if (sender is not AaxcDownloadConvertBase converter || converter.DownloadOptions is not DownloadOptions options)
+				return;
 
-            var outputFormat
-                = contentLic.DrmType != DrmType.Adrm || (config.AllowLibationFixup && config.DecryptToLossy)
-                ? OutputFormat.Mp3
-                : OutputFormat.M4b;
-
-            long chapterStartMs
-                = config.StripAudibleBrandAudio
-                ? contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs
-                : 0;
-
-            //Set the requested AudioFormat for use in file naming templates
-			libraryBook.Book.AudioFormat = AudioFormat.FromString(contentLic.ContentMetadata.ContentReference.ContentFormat);
-
-			var dlOptions = new DownloadOptions(config, libraryBook, contentLic?.ContentMetadata?.ContentUrl?.OfflineUrl)
+			tags.Title ??= options.LibraryBookDto.TitleWithSubtitle;
+            tags.Album ??= tags.Title;
+            tags.Artist ??= string.Join("; ", options.LibraryBook.Book.Authors.Select(a => a.Name));
+            tags.AlbumArtists ??= tags.Artist;
+			tags.Generes = string.Join(", ", options.LibraryBook.Book.LowestCategoryNames());
+            tags.ProductID ??= options.ContentMetadata.ContentReference.Sku;
+            tags.Comment ??= options.LibraryBook.Book.Description;
+            tags.LongDescription ??= tags.Comment;
+            tags.Publisher ??= options.LibraryBook.Book.Publisher;
+			tags.Narrator ??= string.Join("; ", options.LibraryBook.Book.Narrators.Select(n => n.Name));
+			tags.Asin = options.LibraryBook.Book.AudibleProductId;
+			tags.Acr = options.ContentMetadata.ContentReference.Acr;
+			tags.Version = options.ContentMetadata.ContentReference.Version;
+			if (options.LibraryBook.Book.DatePublished is DateTime pubDate)
             {
-                AudibleKey = contentLic?.Voucher?.Key,
-                AudibleIV = contentLic?.Voucher?.Iv,
-				OutputFormat = outputFormat,
-				LameConfig = GetLameOptions(config),
-				ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
-				RuntimeLength = TimeSpan.FromMilliseconds(contentLic?.ContentMetadata?.ChapterInfo?.RuntimeLengthMs ?? 0),
-			};
-
-            var titleConcat = config.CombineNestedChapterTitles ? ": " : null;
-            var chapters
-                = flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters, titleConcat)
-                .OrderBy(c => c.StartOffsetMs)
-                .ToList();
-
-            if (config.MergeOpeningAndEndCredits)
-                combineCredits(chapters);
-
-            for (int i = 0; i < chapters.Count; i++)
-            {
-                var chapter = chapters[i];
-                long chapLenMs = chapter.LengthMs;
-
-                if (i == 0)
-                    chapLenMs -= chapterStartMs;
-
-                if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
-                    chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
-
-                dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
-            }
-
-            return dlOptions;
-        }
-
-        /*
-
-		Flatten Audible's new hierarchical chapters, combining children into parents.
-
-		Audible may deliver chapters like this:
-
-		00:00 - 00:10	Opening Credits
-		00:10 - 00:12	Book 1
-		00:12 - 00:14	|	Part 1
-		00:14 - 01:40	|	|	Chapter 1
-		01:40 - 03:20	|	|	Chapter 2
-		03:20 - 03:22	|	Part 2
-		03:22 - 05:00	|	|	Chapter 3
-		05:00 - 06:40	|	|	Chapter 4
-		06:40 - 06:42	Book 2
-		06:42 - 06:44	|	Part 3
-		06:44 - 08:20	|	|	Chapter 5
-		08:20 - 10:00	|	|	Chapter 6
-		10:00 - 10:02	|	Part 4
-		10:02 - 11:40	|	|	Chapter 7
-		11:40 - 13:20	|	|	Chapter 8
-		13:20 - 13:30	End Credits
-
-		And flattenChapters will combine them into this:
-
-		00:00 - 00:10	Opening Credits
-		00:10 - 01:40	Book 1: Part 1: Chapter 1
-		01:40 - 03:20	Book 1: Part 1: Chapter 2
-		03:20 - 05:00	Book 1: Part 2: Chapter 3
-		05:00 - 06:40	Book 1: Part 2: Chapter 4
-		06:40 - 08:20	Book 2: Part 3: Chapter 5
-		08:20 - 10:00	Book 2: Part 3: Chapter 6
-		10:00 - 11:40	Book 2: Part 4: Chapter 7
-		11:40 - 13:20	Book 2: Part 4: Chapter 8
-		13:20 - 13:40	End Credits
-
-		However, if one of the parent chapters is longer than 10000 milliseconds, it's kept as its own
-		chapter. A duration longer than a few seconds implies that the chapter contains more than just
-		the narrator saying the chapter title, so it should probably be preserved as a separate chapter.
-		Using the example above, if "Book 1" was 15 seconds long and "Part 3" was 20 seconds long:
-
-		00:00 - 00:10	Opening Credits
-		00:10 - 00:25	Book 1
-		00:25 - 00:27	|	Part 1
-		00:27 - 01:40	|	|	Chapter 1
-		01:40 - 03:20	|	|	Chapter 2
-		03:20 - 03:22	|	Part 2
-		03:22 - 05:00	|	|	Chapter 3
-		05:00 - 06:40	|	|	Chapter 4
-		06:40 - 06:42	Book 2
-		06:42 - 07:02	|	Part 3
-		07:02 - 08:20	|	|	Chapter 5
-		08:20 - 10:00	|	|	Chapter 6
-		10:00 - 10:02	|	Part 4
-		10:02 - 11:40	|	|	Chapter 7
-		11:40 - 13:20	|	|	Chapter 8
-		13:20 - 13:30	End Credits
-
-		then flattenChapters will combine them into this:
-
-		00:00 - 00:10	Opening Credits
-		00:10 - 00:25	Book 1
-		00:25 - 01:40	Book 1: Part 1: Chapter 1
-		01:40 - 03:20	Book 1: Part 1: Chapter 2
-		03:20 - 05:00	Book 1: Part 2: Chapter 3
-		05:00 - 06:40	Book 1: Part 2: Chapter 4
-		06:40 - 07:02	Book 2: Part 3
-		07:02 - 08:20	Book 2: Part 3: Chapter 5
-		08:20 - 10:00	Book 2: Part 3: Chapter 6
-		10:00 - 11:40	Book 2: Part 4: Chapter 7
-		11:40 - 13:20	Book 2: Part 4: Chapter 8
-		13:20 - 13:40	End Credits
-
-		*/
-
-        public static List<Chapter> flattenChapters(IList<Chapter> chapters, string titleConcat = ": ")
-        {
-            List<Chapter> chaps = new();
-
-            foreach (var c in chapters)
-            {
-                if (c.Chapters is null)
-					chaps.Add(c);
-                else if (titleConcat is null)
-                {
-                    chaps.Add(c);
-					chaps.AddRange(flattenChapters(c.Chapters));
-                }
-				else
-				{
-                    if (c.LengthMs < 10000)
-                    {
-                        c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
-                        c.Chapters[0].StartOffsetSec = c.StartOffsetSec;
-                        c.Chapters[0].LengthMs += c.LengthMs;
-                    }
-                    else
-                        chaps.Add(c);
-
-                    var children = flattenChapters(c.Chapters);
-
-                    foreach (var child in children)
-                        child.Title = $"{c.Title}{titleConcat}{child.Title}";
-
-                    chaps.AddRange(children);
-                }
-            }
-            return chaps;
-        }
-
-        public static void combineCredits(IList<Chapter> chapters)
-        {
-            if (chapters.Count > 1 && chapters[0].Title == "Opening Credits")
-            {
-                chapters[1].StartOffsetMs = chapters[0].StartOffsetMs;
-                chapters[1].StartOffsetSec = chapters[0].StartOffsetSec;
-                chapters[1].LengthMs += chapters[0].LengthMs;
-                chapters.RemoveAt(0);
-            }
-            if (chapters.Count > 1 && chapters[^1].Title == "End Credits")
-            {
-                chapters[^2].LengthMs += chapters[^1].LengthMs;
-                chapters.Remove(chapters[^1]);
+                tags.Year ??= pubDate.Year.ToString();
+                tags.ReleaseDate ??= pubDate.ToString("dd-MMM-yyyy");
             }
         }
 
@@ -436,7 +278,7 @@ namespace FileLiberator
 		private static FilePathCache.CacheEntry getFirstAudioFile(IEnumerable<FilePathCache.CacheEntry> entries)
             => entries.FirstOrDefault(f => f.FileType == FileType.Audio);
 
-		private static void downloadCoverArt(LibraryBook libraryBook)
+		private static void downloadCoverArt(DownloadOptions options)
         {
 			if (!Configuration.Instance.DownloadCoverArt) return;
 
@@ -444,24 +286,24 @@ namespace FileLiberator
 
             try
             {
-                var destinationDir = getDestinationDirectory(libraryBook);
-                coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(libraryBook, ".jpg");
+                var destinationDir = getDestinationDirectory(options.LibraryBook);
+                coverPath = AudibleFileStorage.Audio.GetBooksDirectoryFilename(options.LibraryBookDto, ".jpg");
                 coverPath = Path.Combine(destinationDir, Path.GetFileName(coverPath));
 
                 if (File.Exists(coverPath))
                     FileUtility.SaferDelete(coverPath);
 
-                var picBytes = PictureStorage.GetPictureSynchronously(new(libraryBook.Book.PictureLarge ?? libraryBook.Book.PictureId, PictureSize.Native));
+                var picBytes = PictureStorage.GetPictureSynchronously(new(options.LibraryBook.Book.PictureLarge ?? options.LibraryBook.Book.PictureId, PictureSize.Native));
                 if (picBytes.Length > 0)
                 {
                     File.WriteAllBytes(coverPath, picBytes);
-                    SetFileTime(libraryBook, coverPath);
+                    SetFileTime(options.LibraryBook, coverPath);
                 }
             }
             catch (Exception ex)
             {
                 //Failure to download cover art should not be considered a failure to download the book
-                Serilog.Log.Logger.Error(ex, $"Error downloading cover art of {libraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
+                Serilog.Log.Logger.Error(ex, $"Error downloading cover art of {options.LibraryBook.Book.AudibleProductId} to {coverPath} catalog product.");
             }
         }
     }

Source/FileLiberator/DownloadOptions.Factory.cs

@@ -0,0 +1,406 @@
+using AaxDecrypter;
+using AudibleApi;
+using AudibleApi.Common;
+using AudibleUtilities.Widevine;
+using DataLayer;
+using LibationFileManager;
+using NAudio.Lame;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+#nullable enable
+namespace FileLiberator;
+
+public partial class DownloadOptions
+{
+	private const string Ec3Codec = "ec+3";
+	private const string Ac4Codec = "ac-4";
+
+	/// <summary>
+	/// Initiate an audiobook download from the audible api.
+	/// </summary>
+	public static async Task<DownloadOptions> InitiateDownloadAsync(Api api, Configuration config, LibraryBook libraryBook)
+	{
+		var license = await ChooseContent(api, libraryBook, config);
+		var options = BuildDownloadOptions(libraryBook, config, license);
+
+		return options;
+	}
+
+	private static async Task<ContentLicense> ChooseContent(Api api, LibraryBook libraryBook, Configuration config)
+	{
+		var dlQuality = config.FileDownloadQuality == Configuration.DownloadQuality.Normal ? DownloadQuality.Normal : DownloadQuality.High;
+
+		if (!config.UseWidevine || await Cdm.GetCdmAsync() is not Cdm cdm)
+			return await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
+
+		ContentLicense? contentLic = null, fallback = null;
+
+		try
+		{
+			//try to request a widevine content license using the user's spatial audio settings
+			var codecChoice = config.SpatialAudioCodec switch
+			{
+				Configuration.SpatialCodec.EC_3 => Ec3Codec,
+				Configuration.SpatialCodec.AC_4 => Ac4Codec,
+				_ => throw new NotSupportedException($"Unknown value for {nameof(config.SpatialAudioCodec)}")
+			};
+
+			contentLic
+				= await api.GetDownloadLicenseAsync(
+					libraryBook.Book.AudibleProductId,
+					dlQuality,
+					ChapterTitlesType.Tree,
+					DrmType.Widevine,
+					config.RequestSpatial,
+					codecChoice);
+		}
+		catch (Exception ex)
+		{
+			Serilog.Log.Logger.Error(ex, "Failed to request a Widevine license.");
+			//We failed to get a widevine license, so fall back to AAX(C)
+			return await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
+		}
+
+		if (!contentLic.ContentMetadata.ContentReference.IsSpatial && contentLic.DrmType != DrmType.Adrm)
+		{
+			/*
+			We got a widevine license and we have a Cdm, but we still need to decide if we WANT the file
+			being delivered with widevine. This file is not "spatial", so it may be no better than the
+			audio in the Adrm files. All else being equal, we prefer Adrm files because they have more
+			build-in metadata and always AAC-LC, which is a codec playable by pretty much every device
+			in existence.
+
+			Unfortunately, there appears to be no way to determine which codec/quality combination we'll
+			get until we make the request and see what content gets delivered. For some books,
+			Widevine/High delivers 44.1 kHz / 128 kbps audio and Adrm/High delivers 22.05 kHz / 64 kbps.
+			In those cases, the Widevine content size is much larger. Other books will deliver the same
+			sample rate / bitrate for both Widevine and Adrm, the only difference being codec. Widevine
+			is usually xHE-AAC, but is sometimes AAC-LC. Adrm is always AAC-LC.
+
+			To decide which file we want, use this simple rule: if files are different codecs and
+			Widevine is significantly larger, use Widevine. Otherwise use ADRM.
+			*/
+
+			fallback = await api.GetDownloadLicenseAsync(libraryBook.Book.AudibleProductId, dlQuality);
+
+			var wvCr = contentLic.ContentMetadata.ContentReference;
+			var adrmCr = fallback.ContentMetadata.ContentReference;
+
+			if (wvCr.Codec == adrmCr.Codec ||
+				adrmCr.ContentSizeInBytes > wvCr.ContentSizeInBytes ||
+				RelativePercentDifference(adrmCr.ContentSizeInBytes, wvCr.ContentSizeInBytes) < 0.05)
+			{
+				contentLic = fallback;
+			}
+		}		
+
+		if (contentLic.DrmType == DrmType.Widevine)
+		{
+			try
+			{
+				using var client = new HttpClient();
+				using var mpdResponse = await client.GetAsync(contentLic.LicenseResponse);
+				var dash = new MpegDash(mpdResponse.Content.ReadAsStream());
+
+				if (!dash.TryGetUri(new Uri(contentLic.LicenseResponse), out var contentUri))
+					throw new InvalidDataException("Failed to get mpeg-dash content download url.");
+
+				contentLic.ContentMetadata.ContentUrl = new() { OfflineUrl = contentUri.ToString() };
+
+				using var session = cdm.OpenSession();
+				var challenge = session.GetLicenseChallenge(dash);
+				var licenseMessage = await api.WidevineDrmLicense(libraryBook.Book.AudibleProductId, challenge);
+				var keys = session.ParseLicense(licenseMessage);
+				contentLic.Voucher = new VoucherDtoV10()
+				{
+					Key = Convert.ToHexStringLower(keys[0].Kid.ToByteArray()),
+					Iv = Convert.ToHexStringLower(keys[0].Key)
+				};
+			}
+			catch
+			{
+				if (fallback != null)
+					return fallback;
+
+				//We won't have a fallback if the requested license is for a spatial audio file.
+				//Throw so that the user is aware that spatial audio exists and that they were not able to download it.
+				throw;
+			}
+		}
+		return contentLic;
+	}
+
+
+	private static DownloadOptions BuildDownloadOptions(LibraryBook libraryBook, Configuration config, ContentLicense contentLic)
+	{
+		//If DrmType is not Adrm or Widevine, the delivered file is an unencrypted mp3.
+		var outputFormat
+			= contentLic.DrmType is not DrmType.Adrm and not DrmType.Widevine ||
+			(config.AllowLibationFixup && config.DecryptToLossy && contentLic.ContentMetadata.ContentReference.Codec != "ac-4")
+			? OutputFormat.Mp3
+			: OutputFormat.M4b;
+
+		long chapterStartMs
+			= config.StripAudibleBrandAudio
+			? contentLic.ContentMetadata.ChapterInfo.BrandIntroDurationMs
+			: 0;
+
+		AAXClean.FileType? inputType
+			= contentLic.DrmType is DrmType.Widevine ? AAXClean.FileType.Dash
+			: contentLic.DrmType is DrmType.Adrm && contentLic.Voucher?.Key.Length == 8 && contentLic.Voucher?.Iv == null ? AAXClean.FileType.Aax
+			: contentLic.DrmType is DrmType.Adrm && contentLic.Voucher?.Key.Length == 32 && contentLic.Voucher?.Iv.Length == 32 ? AAXClean.FileType.Aaxc
+			: null;
+
+		var dlOptions = new DownloadOptions(config, libraryBook, contentLic.ContentMetadata.ContentUrl?.OfflineUrl)
+		{
+			AudibleKey = contentLic.Voucher?.Key,
+			AudibleIV = contentLic.Voucher?.Iv,
+			InputType = inputType,
+			OutputFormat = outputFormat,
+			DrmType = contentLic.DrmType,
+			ContentMetadata = contentLic.ContentMetadata,
+			LameConfig = outputFormat == OutputFormat.Mp3 ? GetLameOptions(config) : null,
+			ChapterInfo = new AAXClean.ChapterInfo(TimeSpan.FromMilliseconds(chapterStartMs)),
+			RuntimeLength = TimeSpan.FromMilliseconds(contentLic.ContentMetadata.ChapterInfo.RuntimeLengthMs),
+		};
+
+		dlOptions.LibraryBookDto.Codec = contentLic.ContentMetadata.ContentReference.Codec;
+		if (TryGetAudioInfo(contentLic.ContentMetadata.ContentUrl, out int? bitrate, out int? sampleRate, out int? channels))
+		{
+			dlOptions.LibraryBookDto.BitRate = bitrate;
+			dlOptions.LibraryBookDto.SampleRate = sampleRate;
+			dlOptions.LibraryBookDto.Channels = channels;
+		}
+
+		var titleConcat = config.CombineNestedChapterTitles ? ": " : null;
+		var chapters
+			= flattenChapters(contentLic.ContentMetadata.ChapterInfo.Chapters, titleConcat)
+			.OrderBy(c => c.StartOffsetMs)
+			.ToList();
+
+		if (config.MergeOpeningAndEndCredits)
+			combineCredits(chapters);
+
+		for (int i = 0; i < chapters.Count; i++)
+		{
+			var chapter = chapters[i];
+			long chapLenMs = chapter.LengthMs;
+
+			if (i == 0)
+				chapLenMs -= chapterStartMs;
+
+			if (config.StripAudibleBrandAudio && i == chapters.Count - 1)
+				chapLenMs -= contentLic.ContentMetadata.ChapterInfo.BrandOutroDurationMs;
+
+			dlOptions.ChapterInfo.AddChapter(chapter.Title, TimeSpan.FromMilliseconds(chapLenMs));
+		}
+
+		return dlOptions;
+	}
+
+	/// <summary>
+	/// The most reliable way to get these audio file properties is from the filename itself.
+	/// Using AAXClean to read the metadata works well for everything except AC-4 bitrate.
+	/// </summary>
+	private static bool TryGetAudioInfo(ContentUrl? contentUrl, out int? bitrate, out int? sampleRate, out int? channels)
+	{
+		bitrate = sampleRate = channels = null;
+
+		if (contentUrl?.OfflineUrl is not string url || !Uri.TryCreate(url, default, out var uri))
+			return false;
+
+		var file = Path.GetFileName(uri.LocalPath);
+
+		var match = AdrmAudioProperties().Match(file);
+		if (match.Success)
+		{
+			bitrate = int.Parse(match.Groups[1].Value);
+			sampleRate = int.Parse(match.Groups[2].Value);
+			channels = int.Parse(match.Groups[3].Value);
+			return true;
+		}
+		else if ((match = WidevineAudioProperties().Match(file)).Success)
+		{
+			bitrate = int.Parse(match.Groups[2].Value);
+			sampleRate = int.Parse(match.Groups[1].Value) * 1000;
+			channels = match.Groups[3].Value switch
+			{
+				"ec3" => 6,
+				"ac4" => 3,
+				_ => null
+			};
+			return true;
+		}
+
+		return false;
+	}
+
+	public static LameConfig GetLameOptions(Configuration config)
+	{
+		LameConfig lameConfig = new()
+		{
+			Mode = MPEGMode.Mono,
+			Quality = config.LameEncoderQuality,
+			OutputSampleRate = (int)config.MaxSampleRate
+		};
+
+		if (config.LameTargetBitrate)
+		{
+			if (config.LameConstantBitrate)
+				lameConfig.BitRate = config.LameBitrate;
+			else
+			{
+				lameConfig.ABRRateKbps = config.LameBitrate;
+				lameConfig.VBR = VBRMode.ABR;
+				lameConfig.WriteVBRTag = true;
+			}
+		}
+		else
+		{
+			lameConfig.VBR = VBRMode.Default;
+			lameConfig.VBRQuality = config.LameVBRQuality;
+			lameConfig.WriteVBRTag = true;
+		}
+		return lameConfig;
+	}
+
+	/*
+
+	Flatten Audible's new hierarchical chapters, combining children into parents.
+
+	Audible may deliver chapters like this:
+
+	00:00 - 00:10	Opening Credits
+	00:10 - 00:12	Book 1
+	00:12 - 00:14	|	Part 1
+	00:14 - 01:40	|	|	Chapter 1
+	01:40 - 03:20	|	|	Chapter 2
+	03:20 - 03:22	|	Part 2
+	03:22 - 05:00	|	|	Chapter 3
+	05:00 - 06:40	|	|	Chapter 4
+	06:40 - 06:42	Book 2
+	06:42 - 06:44	|	Part 3
+	06:44 - 08:20	|	|	Chapter 5
+	08:20 - 10:00	|	|	Chapter 6
+	10:00 - 10:02	|	Part 4
+	10:02 - 11:40	|	|	Chapter 7
+	11:40 - 13:20	|	|	Chapter 8
+	13:20 - 13:30	End Credits
+
+	And flattenChapters will combine them into this:
+
+	00:00 - 00:10	Opening Credits
+	00:10 - 01:40	Book 1: Part 1: Chapter 1
+	01:40 - 03:20	Book 1: Part 1: Chapter 2
+	03:20 - 05:00	Book 1: Part 2: Chapter 3
+	05:00 - 06:40	Book 1: Part 2: Chapter 4
+	06:40 - 08:20	Book 2: Part 3: Chapter 5
+	08:20 - 10:00	Book 2: Part 3: Chapter 6
+	10:00 - 11:40	Book 2: Part 4: Chapter 7
+	11:40 - 13:20	Book 2: Part 4: Chapter 8
+	13:20 - 13:40	End Credits
+
+	However, if one of the parent chapters is longer than 10000 milliseconds, it's kept as its own
+	chapter. A duration longer than a few seconds implies that the chapter contains more than just
+	the narrator saying the chapter title, so it should probably be preserved as a separate chapter.
+	Using the example above, if "Book 1" was 15 seconds long and "Part 3" was 20 seconds long:
+
+	00:00 - 00:10	Opening Credits
+	00:10 - 00:25	Book 1
+	00:25 - 00:27	|	Part 1
+	00:27 - 01:40	|	|	Chapter 1
+	01:40 - 03:20	|	|	Chapter 2
+	03:20 - 03:22	|	Part 2
+	03:22 - 05:00	|	|	Chapter 3
+	05:00 - 06:40	|	|	Chapter 4
+	06:40 - 06:42	Book 2
+	06:42 - 07:02	|	Part 3
+	07:02 - 08:20	|	|	Chapter 5
+	08:20 - 10:00	|	|	Chapter 6
+	10:00 - 10:02	|	Part 4
+	10:02 - 11:40	|	|	Chapter 7
+	11:40 - 13:20	|	|	Chapter 8
+	13:20 - 13:30	End Credits
+
+	then flattenChapters will combine them into this:
+
+	00:00 - 00:10	Opening Credits
+	00:10 - 00:25	Book 1
+	00:25 - 01:40	Book 1: Part 1: Chapter 1
+	01:40 - 03:20	Book 1: Part 1: Chapter 2
+	03:20 - 05:00	Book 1: Part 2: Chapter 3
+	05:00 - 06:40	Book 1: Part 2: Chapter 4
+	06:40 - 07:02	Book 2: Part 3
+	07:02 - 08:20	Book 2: Part 3: Chapter 5
+	08:20 - 10:00	Book 2: Part 3: Chapter 6
+	10:00 - 11:40	Book 2: Part 4: Chapter 7
+	11:40 - 13:20	Book 2: Part 4: Chapter 8
+	13:20 - 13:40	End Credits
+
+	*/
+
+	public static List<Chapter> flattenChapters(IList<Chapter> chapters, string? titleConcat = ": ")
+	{
+		List<Chapter> chaps = new();
+
+		foreach (var c in chapters)
+		{
+			if (c.Chapters is null)
+				chaps.Add(c);
+			else if (titleConcat is null)
+			{
+				chaps.Add(c);
+				chaps.AddRange(flattenChapters(c.Chapters));
+			}
+			else
+			{
+				if (c.LengthMs < 10000)
+				{
+					c.Chapters[0].StartOffsetMs = c.StartOffsetMs;
+					c.Chapters[0].StartOffsetSec = c.StartOffsetSec;
+					c.Chapters[0].LengthMs += c.LengthMs;
+				}
+				else
+					chaps.Add(c);
+
+				var children = flattenChapters(c.Chapters);
+
+				foreach (var child in children)
+					child.Title = $"{c.Title}{titleConcat}{child.Title}";
+
+				chaps.AddRange(children);
+			}
+		}
+		return chaps;
+	}
+
+	public static void combineCredits(IList<Chapter> chapters)
+	{
+		if (chapters.Count > 1 && chapters[0].Title == "Opening Credits")
+		{
+			chapters[1].StartOffsetMs = chapters[0].StartOffsetMs;
+			chapters[1].StartOffsetSec = chapters[0].StartOffsetSec;
+			chapters[1].LengthMs += chapters[0].LengthMs;
+			chapters.RemoveAt(0);
+		}
+		if (chapters.Count > 1 && chapters[^1].Title == "End Credits")
+		{
+			chapters[^2].LengthMs += chapters[^1].LengthMs;
+			chapters.Remove(chapters[^1]);
+		}
+	}
+
+	static double RelativePercentDifference(long num1, long num2)
+		=> Math.Abs(num1 - num2) / (double)(num1 + num2);
+
+	[GeneratedRegex(@".+_(\d+)_(\d+)-(\w+).mp4", RegexOptions.Singleline | RegexOptions.IgnoreCase)]
+	private static partial Regex WidevineAudioProperties();
+	[GeneratedRegex(@".+_lc_(\d+)_(\d+)_(\d+).aax", RegexOptions.Singleline | RegexOptions.IgnoreCase)]
+	private static partial Regex AdrmAudioProperties();
+}

Source/FileLiberator/DownloadOptions.cs

@@ -7,10 +7,11 @@ using System.Threading.Tasks;
 using System;
 using System.IO;
 using ApplicationServices;
+using LibationFileManager.Templates;
 
 namespace FileLiberator
 {
-	public class DownloadOptions : IDownloadOptions, IDisposable
+	public partial class DownloadOptions : IDownloadOptions, IDisposable
 	{
 		public event EventHandler<long> DownloadSpeedChanged;
 		public LibraryBook LibraryBook { get; }
@@ -26,8 +27,8 @@ namespace FileLiberator
 		public string Publisher => LibraryBook.Book.Publisher;
 		public string Language => LibraryBook.Book.Language;
 		public string AudibleProductId => LibraryBookDto.AudibleProductId;
-		public string SeriesName => LibraryBookDto.SeriesName;
-		public float? SeriesNumber => LibraryBookDto.SeriesNumber;
+		public string SeriesName => LibraryBookDto.FirstSeries?.Name;
+		public float? SeriesNumber => LibraryBookDto.FirstSeries?.Number;
 		public NAudio.Lame.LameConfig LameConfig { get; init; }
 		public string UserAgent => AudibleApi.Resources.Download_User_Agent;
 		public bool TrimOutputToChapterLength => config.AllowLibationFixup && config.StripAudibleBrandAudio;
@@ -40,6 +41,9 @@ namespace FileLiberator
 		public bool Downsample => config.AllowLibationFixup && config.LameDownsampleMono;
 		public bool MatchSourceBitrate => config.AllowLibationFixup && config.LameMatchSourceBR && config.LameTargetBitrate;
 		public bool MoveMoovToBeginning => config.MoveMoovToBeginning;
+		public AAXClean.FileType? InputType { get; init; }
+		public AudibleApi.Common.DrmType DrmType { get; init; }
+		public AudibleApi.Common.ContentMetadata ContentMetadata { get; init; }
 
 		public string GetMultipartFileName(MultiConvertFileProperties props)
 		{
@@ -82,9 +86,13 @@ namespace FileLiberator
 
 		private readonly Configuration config;
 		private readonly IDisposable cancellation;
-		public void Dispose() => cancellation?.Dispose();
+		public void Dispose()
+		{
+			cancellation?.Dispose();
+			GC.SuppressFinalize(this);
+		}
 
-		public DownloadOptions(Configuration config, LibraryBook libraryBook, string downloadUrl)
+		private DownloadOptions(Configuration config, LibraryBook libraryBook, [System.Diagnostics.CodeAnalysis.NotNull] string downloadUrl)
 		{
 			this.config = ArgumentValidator.EnsureNotNull(config, nameof(config));
 			LibraryBook = ArgumentValidator.EnsureNotNull(libraryBook, nameof(libraryBook));

Source/FileLiberator/FileLiberator.csproj

@@ -19,5 +19,10 @@
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
 
+	<ItemGroup>
+		<Compile Update="DownloadOptions.*.cs">
+			<DependentUpon>DownloadOptions.cs</DependentUpon>
+		</Compile>
+	</ItemGroup>
 
 </Project>

Source/FileLiberator/UtilityExtensions.cs

@@ -5,8 +5,9 @@ using System.Threading.Tasks;
 using AudibleUtilities;
 using DataLayer;
 using Dinah.Core;
-using LibationFileManager;
+using LibationFileManager.Templates;
 
+#nullable enable
 namespace FileLiberator
 {
 	public static class UtilityExtensions
@@ -47,20 +48,31 @@ namespace FileLiberator
 				YearPublished = libraryBook.Book.DatePublished?.Year,
 				DatePublished = libraryBook.Book.DatePublished,
 
-				Authors = libraryBook.Book.Authors.Select(c => c.Name).ToList(),
+				Authors = libraryBook.Book.Authors.Select(c => new ContributorDto(c.Name, c.AudibleContributorId)).ToList(),
+				Narrators = libraryBook.Book.Narrators.Select(c => new ContributorDto(c.Name, c.AudibleContributorId)).ToList(),
 
-				Narrators = libraryBook.Book.Narrators.Select(c => c.Name).ToList(),
-
-				SeriesName = libraryBook.Book.SeriesLink.FirstOrDefault()?.Series.Name,
-				SeriesNumber = libraryBook.Book.SeriesLink.FirstOrDefault()?.Index,
+				Series = getSeries(libraryBook.Book.SeriesLink),
 				IsPodcastParent = libraryBook.Book.IsEpisodeParent(),
 				IsPodcast = libraryBook.Book.IsEpisodeChild() || libraryBook.Book.IsEpisodeParent(),
 
-				BitRate = libraryBook.Book.AudioFormat.Bitrate,
-				SampleRate = libraryBook.Book.AudioFormat.SampleRate,
-				Channels = libraryBook.Book.AudioFormat.Channels,
 				Language = libraryBook.Book.Language
 			};
 		}
+
+		private static List<SeriesDto>? getSeries(IEnumerable<SeriesBook> seriesBooks)
+		{
+			if (!seriesBooks.Any())
+				return null;
+
+			//I don't remember why or if there was a good reason not to have series numbers for
+			//podcast parents, but preserving the behavior for backwards compatibility.
+			return seriesBooks
+				.Select(sb
+					=> new SeriesDto(
+						sb.Series.Name,
+						sb.Book.IsEpisodeParent() ? null : sb.Index,
+						sb.Series.AudibleSeriesId)
+				).ToList();
+		}
 	}
 }

Source/HangoverAvalonia/HangoverAvalonia.csproj

@@ -71,13 +71,13 @@
 	</ItemGroup>
 	<ItemGroup>
 
-		<PackageReference Include="Avalonia" Version="11.2.5" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.2.5" />
+		<PackageReference Include="Avalonia" Version="11.2.8" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.2.8" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.5" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.5" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.8" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.8" />
 		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.5" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.8" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\HangoverBase\HangoverBase.csproj" />

Source/LibationAvalonia/App.axaml

@@ -20,6 +20,11 @@
 			<ControlTheme x:Key="{x:Type DataGridCell}" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
 				<Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
 			</ControlTheme>
+			<ControlTheme x:Key="{x:Type DataGridColumnHeader}" TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+				<Setter Property="Padding" Value="6,0,0,0" />
+			</ControlTheme>
+			<x:Double x:Key="DataGridSortIconMinWidth">0</x:Double>
+
 			<ResourceDictionary.ThemeDictionaries>
 				<ResourceDictionary x:Key="Light">
 					<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush" Opacity="0.3" Color="#abffab" />
@@ -28,17 +33,11 @@
 					<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="Khaki" />
 					<SolidColorBrush x:Key="HyperlinkNew" Color="Blue" />
 					<SolidColorBrush x:Key="HyperlinkVisited" Color="Purple" />
-					<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="White" />
-					<SolidColorBrush x:Key="SystemOpaqueBase" Color="White" />
-
 					<SolidColorBrush x:Key="CancelRed" Color="FireBrick" />
 					<SolidColorBrush x:Key="IconFill" Color="#231F20" />
 					<SolidColorBrush x:Key="StoplightRed" Color="#F06060" />
 					<SolidColorBrush x:Key="StoplightYellow" Color="#F0E160" />
 					<SolidColorBrush x:Key="StoplightGreen" Color="#70FA70" />
-
-					<SolidColorBrush x:Key="DisabledGrayBrush" Opacity="0.4"  Color="{StaticResource SystemChromeMediumColor}" />
-
 				</ResourceDictionary>
 				<ResourceDictionary x:Key="Dark">
 					<SolidColorBrush x:Key="SeriesEntryGridBackgroundBrush" Opacity="0.3" Color="#bed2fa" />
@@ -47,35 +46,32 @@
 					<SolidColorBrush x:Key="ProcessQueueBookCancelledBrush" Color="#4e4b15" />
 					<SolidColorBrush x:Key="HyperlinkNew" Color="CornflowerBlue" />
 					<SolidColorBrush x:Key="HyperlinkVisited" Color="Orchid" />
-					<SolidColorBrush x:Key="ProcessQueueBookDefaultBrush" Color="Black" />
-					<SolidColorBrush x:Key="SystemOpaqueBase" Color="Black" />
-
 					<SolidColorBrush x:Key="CancelRed" Color="#802727" />
 					<SolidColorBrush x:Key="IconFill" Color="#DCE0DF" />
 					<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}" />
-					
+					<SolidColorBrush x:Key="StoplightGreen" Color="#1f7d1f" />					
 				</ResourceDictionary>
 			</ResourceDictionary.ThemeDictionaries>
 		</ResourceDictionary>		
 	</Application.Resources>
 
 	<Application.Styles>
-		<FluentTheme />
-		<StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentTheme.xaml"/>
 		<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
+		<StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml" />
 		<StyleInclude Source="/Assets/LibationVectorIcons.xaml"/>
-		<StyleInclude Source="/Assets/DataGridColumnHeader.xaml"/>
+		<FluentTheme>
+			<FluentTheme.Palettes>
+				<ColorPaletteResources x:Key="Light" />
+				<ColorPaletteResources x:Key="Dark" />
+			</FluentTheme.Palettes>
+		</FluentTheme>
 
 		<Style Selector="TextBox[IsReadOnly=true]">
-			<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
+			<Setter Property="Background" Value="{DynamicResource SystemChromeDisabledHighColor}" />
 			<Setter Property="CaretBrush" Value="{DynamicResource SystemControlTransparentBrush}" />
 			<Style Selector="^ /template/ Border#PART_BorderElement">
-				<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
+				<Setter Property="Background" Value="{DynamicResource SystemChromeDisabledHighColor}" />
 			</Style>
 		</Style>
 		<Style Selector="controls|LinkLabel">
@@ -84,6 +80,9 @@
 		</Style>
 		<Style Selector="Button">
 			<Setter Property="VerticalContentAlignment" Value="Center"/>
+			<Style Selector="^">
+				<Setter Property="Foreground" Value="{DynamicResource SystemChromeAltLowColor}" />
+			</Style>
 		</Style>
 		<Style Selector="ScrollBar">
 			<!-- It's called AutoHide, but this is really the mouseover shrink/expand. -->
@@ -91,61 +90,14 @@
 		</Style>
 
 		<Style Selector="dialogs|DialogWindow">
-			<Style Selector="^[UseCustomTitleBar=false]">
-				<Setter Property="SystemDecorations" Value="Full"/>
-				<Setter Property="Template">
-					<ControlTemplate>
-						<ContentPresenter Background="{DynamicResource SystemControlBackgroundAltHighBrush}" Content="{TemplateBinding Content}" />
-					</ControlTemplate>
-				</Setter>
-			</Style>
-			<Style Selector="^[UseCustomTitleBar=true]">
-				<Style Selector="^[CanResize=false] Border#DialogWindowFormBorder">
-					<Setter Property="BorderThickness" Value="2" />
-				</Style>
-				<Setter Property="SystemDecorations" Value="BorderOnly"/>
-				<Setter Property="Template">
-					<ControlTemplate>
-						<Border Name="DialogWindowFormBorder" BorderBrush="{DynamicResource SystemBaseMediumLowColor}" Background="{DynamicResource SystemControlBackgroundAltHighBrush}">
-							<Grid RowDefinitions="30,*">
-								<Border Name="DialogWindowTitleBorder" Margin="5,0" Background="{DynamicResource SystemAltMediumColor}">
-									<Border.Styles>
-										<Style Selector="Button#DialogCloseButton">
-											<Style Selector="^:pointerover">
-												<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-													<Setter Property="Background" Value="Red" />
-												</Style>
-												<Style Selector="^ Path">
-													<Setter Property="Fill" Value="{DynamicResource IconFill}" />
-												</Style>
-											</Style>
-											<Style Selector="^:not(:pointerover) /template/ ContentPresenter#PART_ContentPresenter">
-												<Setter Property="Background" Value="Transparent" />
-												<Setter Property="BorderBrush" Value="Transparent" />
-											</Style>
-										</Style>
-									</Border.Styles>
-								
-									<Grid ColumnDefinitions="Auto,*,Auto">
-
-										<Path Name="DialogWindowTitleIcon" Margin="3,5,0,5" Fill="{DynamicResource IconFill}" Stretch="Uniform"  Data="{StaticResource LibationGlassIcon}"/>
-									
-										<TextBlock Name="DialogWindowTitleTextBlock" Margin="8,0,0,0" VerticalAlignment="Center" FontWeight="DemiBold" FontSize="12" Grid.Column="1" Text="{TemplateBinding Title}" />
-
-										<Button Name="DialogCloseButton" Grid.Column="2">
-											<Path Fill="{DynamicResource SystemControlBackgroundBaseLowBrush}" VerticalAlignment="Center" Stretch="Uniform" RenderTransform="{StaticResource Rotate45Transform}" Data="{StaticResource CancelButtonIcon}" />
-										</Button>
-									</Grid>
-								</Border>
-								<Path Stroke="{DynamicResource SystemBaseMediumLowColor}" StrokeThickness="1" VerticalAlignment="Bottom" Stretch="Fill" Data="M0,0 L1,0" />
-								<ContentPresenter Grid.Row="1" Content="{TemplateBinding Content}" />
-							</Grid>
-						</Border>
-					</ControlTemplate>
-				</Setter>
-			</Style>
-		</Style>
-		
+			<Setter Property="SystemDecorations" Value="Full"/>
+			<Setter Property="Icon" Value="/Assets/libation.ico"/>
+			<Setter Property="Template">
+				<ControlTemplate>
+					<ContentPresenter Background="{DynamicResource SystemRegionColor}" Content="{TemplateBinding Content}" />
+				</ControlTemplate>
+			</Setter>
+		</Style>		
 	</Application.Styles>
 
 	<NativeMenu.Menu>

Source/LibationAvalonia/App.axaml.cs

@@ -2,7 +2,6 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using LibationAvalonia.Dialogs;
@@ -13,19 +12,22 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Threading;
+using Dinah.Core;
+using LibationAvalonia.Themes;
+using Avalonia.Data.Core.Plugins;
+using System.Linq;
 
+#nullable enable
 namespace LibationAvalonia
 {
 	public class App : Application
 	{
-		public static MainWindow MainWindow { get; private set; }
-		public static IBrush ProcessQueueBookFailedBrush { get; private set; }
-		public static IBrush ProcessQueueBookCompletedBrush { get; private set; }
-		public static IBrush ProcessQueueBookCancelledBrush { get; private set; }
-		public static IBrush ProcessQueueBookDefaultBrush { get; private set; }
-		public static IBrush SeriesEntryGridBackgroundBrush { get; private set; }
+		public static Task<List<DataLayer.LibraryBook>>? LibraryTask { get; set; }
+		public static ChardonnayTheme? DefaultThemeColors { get; private set; }
+		public static MainWindow? MainWindow { get; private set; }
+		public static Uri AssetUriBase { get; } = new("avares://Libation/Assets/");
+		public static new Application Current => Application.Current ?? throw new InvalidOperationException("The Avalonia app hasn't started yet.");
 
-		public static readonly Uri AssetUriBase = new("avares://Libation/Assets/");
 		public static Stream OpenAsset(string assetRelativePath)
 			=> AssetLoader.Open(new Uri(AssetUriBase, assetRelativePath));
 
@@ -34,12 +36,16 @@ namespace LibationAvalonia
 			AvaloniaXamlLoader.Load(this);
 		}
 
-		public static Task<List<DataLayer.LibraryBook>> LibraryTask;
-
 		public override void OnFrameworkInitializationCompleted()
 		{
+			DefaultThemeColors = ChardonnayTheme.GetLiveTheme();
+
 			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
 			{
+				// Avoid duplicate validations from both Avalonia and the CommunityToolkit. 
+				// More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
+				DisableAvaloniaDataAnnotationValidation();
+
 				var config = Configuration.Instance;
 
 				if (!config.LibationSettingsAreValid)
@@ -69,11 +75,23 @@ namespace LibationAvalonia
 
 			base.OnFrameworkInitializationCompleted();
 		}
-
-		private async void Setup_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		private void DisableAvaloniaDataAnnotationValidation()
 		{
-			var setupDialog = sender as SetupDialog;
-			var desktop = ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
+			// Get an array of plugins to remove
+			var dataValidationPluginsToRemove =
+				BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
+
+			// remove each entry found
+			foreach (var plugin in dataValidationPluginsToRemove)
+			{
+				BindingPlugins.DataValidators.Remove(plugin);
+			}
+		}
+
+		private async void Setup_Closing(object? sender, System.ComponentModel.CancelEventArgs e)
+		{
+			if (sender is not SetupDialog setupDialog || ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
+				return;
 
 			try
 			{
@@ -87,7 +105,7 @@ namespace LibationAvalonia
 
 					if (setupDialog.Config.LibationSettingsAreValid)
 					{
-                        string theme = setupDialog.SelectedTheme.Content as string;
+						string? theme = setupDialog.SelectedTheme.Content as string;
 						
 						setupDialog.Config.SetString(theme, nameof(ThemeVariant));
 
@@ -143,7 +161,7 @@ namespace LibationAvalonia
 			desktop.MainWindow = libationFilesDialog;
 			libationFilesDialog.Show();
 
-			void WindowClosing(object sender, System.ComponentModel.CancelEventArgs e)
+			void WindowClosing(object? sender, System.ComponentModel.CancelEventArgs e)
 			{
 				libationFilesDialog.Closing -= WindowClosing;
 				e.Cancel = true;
@@ -201,16 +219,9 @@ namespace LibationAvalonia
 
 		private static void ShowMainWindow(IClassicDesktopStyleApplicationLifetime desktop)
 		{
-            Current.RequestedThemeVariant = Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)) switch
-            {
-                nameof(ThemeVariant.Dark) => ThemeVariant.Dark,
-                nameof(ThemeVariant.Light) => ThemeVariant.Light,
-				// "System"
-                _ => ThemeVariant.Default
-            };
+			Configuration.Instance.PropertyChanged += ThemeVariant_PropertyChanged;
+			OpenAndApplyTheme(Configuration.Instance.GetString(propertyName: nameof(ThemeVariant)));
 
-            //Reload colors for current theme
-			LoadStyles();
 			var mainWindow = new MainWindow();
 			desktop.MainWindow = MainWindow = mainWindow;
 			mainWindow.Loaded += MainWindow_Loaded;
@@ -218,19 +229,23 @@ namespace LibationAvalonia
 			mainWindow.Show();
 		}
 
-		private static async void MainWindow_Loaded(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		[PropertyChangeFilter(nameof(ThemeVariant))]
+		private static void ThemeVariant_PropertyChanged(object sender, PropertyChangedEventArgsEx e)
+			=> OpenAndApplyTheme(e.NewValue as string);
+
+		private static void OpenAndApplyTheme(string? themeVariant)
 		{
-			var library = await LibraryTask;
-			await Dispatcher.UIThread.InvokeAsync(() => MainWindow.OnLibraryLoadedAsync(library));
+			using var themePersister = ChardonnayThemePersister.Create();
+			themePersister?.Target.ApplyTheme(themeVariant);
 		}
 
-		private static void LoadStyles()
+		private static async void MainWindow_Loaded(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			ProcessQueueBookFailedBrush = AvaloniaUtils.GetBrushFromResources(nameof(ProcessQueueBookFailedBrush));
-			ProcessQueueBookCompletedBrush = AvaloniaUtils.GetBrushFromResources(nameof(ProcessQueueBookCompletedBrush));
-			ProcessQueueBookCancelledBrush = AvaloniaUtils.GetBrushFromResources(nameof(ProcessQueueBookCancelledBrush));
-			SeriesEntryGridBackgroundBrush = AvaloniaUtils.GetBrushFromResources(nameof(SeriesEntryGridBackgroundBrush));
-			ProcessQueueBookDefaultBrush = AvaloniaUtils.GetBrushFromResources(nameof(ProcessQueueBookDefaultBrush));
+			if (LibraryTask is not null && MainWindow is not null)
+			{
+				var library = await LibraryTask;
+				await Dispatcher.UIThread.InvokeAsync(() => MainWindow.OnLibraryLoadedAsync(library));
+			}
 		}
 	}
 }

Source/LibationAvalonia/Assets/DataGridColumnHeader.xaml

@@ -1,104 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-		xmlns:collections="using:Avalonia.Collections">
-	<Styles.Resources>
-		<!--
-		Based on Fluent template from v11.0.0-preview8
-		Modified sort arrow positioning to make more room for header text
-		-->
-		<ControlTheme x:Key="{x:Type DataGridColumnHeader}" TargetType="DataGridColumnHeader">
-			<Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderForegroundBrush}" />
-			<Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderBackgroundBrush}" />
-			<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-			<Setter Property="VerticalContentAlignment" Value="Center" />
-			<Setter Property="SeparatorBrush" Value="{DynamicResource DataGridGridLinesBrush}" />
-			<Setter Property="Padding" Value="8,0,0,0" />
-			<Setter Property="FontSize" Value="12" />
-			<Setter Property="MinHeight" Value="32" />
-			<Setter Property="Template">
-				<ControlTemplate>
-					<Border x:Name="HeaderBorder"
-							Background="{TemplateBinding Background}"
-							BorderBrush="{TemplateBinding BorderBrush}"
-							BorderThickness="{TemplateBinding BorderThickness}"
-							CornerRadius="{TemplateBinding CornerRadius}">
-						<Grid Name="PART_ColumnHeaderRoot" ColumnDefinitions="*,Auto">
-
-							<Grid Margin="{TemplateBinding Padding}"
-								  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-								  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="*" />
-									<ColumnDefinition Width="16" />
-								</Grid.ColumnDefinitions>
-
-								<ContentPresenter Content="{TemplateBinding Content}"
-												  ContentTemplate="{TemplateBinding ContentTemplate}" />
-
-								<Path Name="SortIcon"
-									  IsVisible="False"
-									  Grid.Column="1"
-									  Height="12"
-									  HorizontalAlignment="Left"
-									  VerticalAlignment="Center"
-									  Fill="{TemplateBinding Foreground}"
-									  Stretch="Uniform" />
-							</Grid>
-
-							<Rectangle Name="VerticalSeparator"
-									   Grid.Column="1"
-									   Width="1"
-									   VerticalAlignment="Stretch"
-									   Fill="{TemplateBinding SeparatorBrush}"
-									   IsVisible="{TemplateBinding AreSeparatorsVisible}" />
-
-							<Grid x:Name="FocusVisual" IsHitTestVisible="False"
-								  IsVisible="False">
-								<Rectangle x:Name="FocusVisualPrimary"
-										   HorizontalAlignment="Stretch"
-										   VerticalAlignment="Stretch"
-										   Fill="Transparent"
-										   IsHitTestVisible="False"
-										   Stroke="{DynamicResource DataGridCellFocusVisualPrimaryBrush}"
-										   StrokeThickness="2" />
-								<Rectangle x:Name="FocusVisualSecondary"
-										   Margin="2"
-										   HorizontalAlignment="Stretch"
-										   VerticalAlignment="Stretch"
-										   Fill="Transparent"
-										   IsHitTestVisible="False"
-										   Stroke="{DynamicResource DataGridCellFocusVisualSecondaryBrush}"
-										   StrokeThickness="1" />
-							</Grid>
-						</Grid>
-					</Border>
-				</ControlTemplate>
-			</Setter>
-
-			<Style Selector="^:focus-visible /template/ Grid#FocusVisual">
-				<Setter Property="IsVisible" Value="True" />
-			</Style>
-
-			<Style Selector="^:pointerover /template/ Grid#PART_ColumnHeaderRoot">
-				<Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderHoveredBackgroundBrush}" />
-			</Style>
-
-			<Style Selector="^:pressed /template/ Grid#PART_ColumnHeaderRoot">
-				<Setter Property="Background" Value="{DynamicResource DataGridColumnHeaderPressedBackgroundBrush}" />
-			</Style>
-
-			<Style Selector="^:dragIndicator">
-				<Setter Property="Opacity" Value="0.5" />
-			</Style>
-
-			<Style Selector="^:sortascending /template/ Path#SortIcon">
-				<Setter Property="IsVisible" Value="True" />
-				<Setter Property="Data" Value="{StaticResource DataGridSortIconAscendingPath}" />
-			</Style>
-
-			<Style Selector="^:sortdescending /template/ Path#SortIcon">
-				<Setter Property="IsVisible" Value="True" />
-				<Setter Property="Data" Value="{StaticResource DataGridSortIconDescendingPath}" />
-			</Style>
-		</ControlTheme>
-	</Styles.Resources>
-</Styles>

Source/LibationAvalonia/AvaloniaUtils.cs

@@ -1,8 +1,8 @@
-using Avalonia.Controls;
-using Avalonia.Media;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Media.Imaging;
 using Avalonia.VisualTree;
-using LibationAvalonia.Dialogs;
 using LibationFileManager;
 using System.Threading.Tasks;
 
@@ -11,17 +11,21 @@ namespace LibationAvalonia
 {
 	internal static class AvaloniaUtils
 	{
-		public static IBrush GetBrushFromResources(string name)
-			=> GetBrushFromResources(name, Brushes.Transparent);
-		public static IBrush GetBrushFromResources(string name, IBrush defaultBrush)
+		public static T DynamicResource<T>(this T control, AvaloniaProperty prop, object resourceKey) where T : Control
 		{
-			if ((App.Current?.TryGetResource(name, App.Current.ActualThemeVariant, out var value) ?? false) && value is IBrush brush)
-				return brush;
-			return defaultBrush;
+			control[!prop] = new DynamicResourceExtension(resourceKey);
+			return control;
 		}
 
-		public static Task<DialogResult> ShowDialogAsync(this DialogWindow dialogWindow, Window? owner = null)
-			=> dialogWindow.ShowDialog<DialogResult>(owner ?? App.MainWindow);
+		public static Task<DialogResult> ShowDialogAsync(this Dialogs.DialogWindow dialogWindow, Window? owner = null)
+			=> ((owner ?? App.MainWindow) is Window window)
+			? dialogWindow.ShowDialog<DialogResult>(window)
+			: Task.FromResult(DialogResult.None);
+
+		public static Task<DialogResult> ShowDialogAsync(this Dialogs.Login.WebLoginDialog dialogWindow, Window? owner = null)
+			=> ((owner ?? App.MainWindow) is Window window)
+			? dialogWindow.ShowDialog<DialogResult>(window)
+			: Task.FromResult(DialogResult.None);
 
 		public static Window? GetParentWindow(this Control control) => control.GetVisualRoot() as Window;
 

Source/LibationAvalonia/Controls/DataGridContextMenus.cs

@@ -2,6 +2,7 @@
 using Avalonia.Controls;
 using LibationUiBase.GridView;
 using System;
+using System.Linq;
 using System.Reflection;
 
 namespace LibationAvalonia.Controls
@@ -12,11 +13,13 @@ namespace LibationAvalonia.Controls
 		private static readonly ContextMenu ContextMenu = new();
 		private static readonly AvaloniaList<Control> MenuItems = new();
 		private static readonly PropertyInfo OwningColumnProperty;
+		private static readonly PropertyInfo OwningGridProperty;
 
 		static DataGridContextMenus()
 		{
 			ContextMenu.ItemsSource = MenuItems;
 			OwningColumnProperty = typeof(DataGridCell).GetProperty("OwningColumn", BindingFlags.Instance | BindingFlags.NonPublic);
+			OwningGridProperty = typeof(DataGridColumn).GetProperty("OwningGrid", BindingFlags.Instance | BindingFlags.NonPublic);
 		}
 
 		public static void AttachContextMenu(this DataGridCell cell)
@@ -30,19 +33,35 @@ namespace LibationAvalonia.Controls
 
 		private static void Cell_ContextRequested(object sender, ContextRequestedEventArgs e)
 		{
-			if (sender is DataGridCell cell && cell.DataContext is IGridEntry entry)
+			if (sender is DataGridCell cell &&
+				cell.DataContext is IGridEntry clickedEntry &&
+				OwningColumnProperty.GetValue(cell) is DataGridColumn column &&
+				OwningGridProperty.GetValue(column) is DataGrid grid)
 			{
+				var allSelected = grid.SelectedItems.OfType<IGridEntry>().ToArray();
+				var clickedIndex = Array.IndexOf(allSelected, clickedEntry);
+				if (clickedIndex == -1)
+				{
+					//User didn't right-click on a selected cell
+					grid.SelectedItem = clickedEntry;
+					allSelected = [clickedEntry];
+				}
+				else if (clickedIndex > 0)
+				{
+					//Ensure the clicked entry is first in the list
+					(allSelected[0], allSelected[clickedIndex]) = (allSelected[clickedIndex], allSelected[0]);
+				}
+
 				var args = new DataGridCellContextMenuStripNeededEventArgs
 				{
-					Column = OwningColumnProperty.GetValue(cell) as DataGridColumn,
-					GridEntry = entry,
+					Column = column,
+					Grid = grid,
+					GridEntries = allSelected,
 					ContextMenu = ContextMenu
 				};
 
 				args.ContextMenuItems.Clear();
-
 				CellContextMenuStripNeeded?.Invoke(sender, args);
-
 				e.Handled = args.ContextMenuItems.Count == 0;
 			}
 			else
@@ -61,10 +80,37 @@ namespace LibationAvalonia.Controls
 		private static string GetCellValue(DataGridColumn column, object item)
 			=> GetCellValueMethod.Invoke(column, new object[] { item, column.ClipboardContentBinding })?.ToString() ?? "";
 
-		public string CellClipboardContents => GetCellValue(Column, GridEntry);
-		public DataGridColumn Column { get; init; }
-		public IGridEntry GridEntry { get; init; }
-		public ContextMenu ContextMenu { get; init; }
+		public string CellClipboardContents => GetCellValue(Column, GridEntries[0]);
+		public string GetRowClipboardContents()
+		{
+			if (GridEntries is null || GridEntries.Length == 0)
+				return string.Empty;
+			else if (GridEntries.Length == 1)
+				return HeaderNames + Environment.NewLine + GetRowClipboardContents(GridEntries[0]);
+			else
+				return string.Join(Environment.NewLine, GridEntries.Select(GetRowClipboardContents).Prepend(HeaderNames));
+		}
+
+		private string HeaderNames
+			=> string.Join("\t",
+				Grid.Columns
+				.Where(c => c.IsVisible)
+				.OrderBy(c => c.DisplayIndex)
+				.Select(c => RemoveLineBreaks(c.Header.ToString())));
+
+		private static string RemoveLineBreaks(string text)
+			=> text.Replace("\r\n", "").Replace('\r', ' ').Replace('\n', ' ');
+
+		private string GetRowClipboardContents(IGridEntry gridEntry)
+		{
+			var contents = Grid.Columns.Where(c => c.IsVisible).OrderBy(c => c.DisplayIndex).Select(c => RemoveLineBreaks(GetCellValue(c, gridEntry))).ToArray();
+			return string.Join("\t", contents);
+		}
+
+		public required DataGrid Grid { get; init; }
+		public required DataGridColumn Column { get; init; }
+		public required IGridEntry[] GridEntries { get; init; }
+		public required ContextMenu ContextMenu { get; init; }
 		public AvaloniaList<Control> ContextMenuItems
 			=> ContextMenu.ItemsSource as AvaloniaList<Control>;
 	}

Source/LibationAvalonia/Controls/GroupBox.axaml

@@ -8,7 +8,7 @@
 
 	<ContentControl.Styles>
 		<Style Selector="controls|GroupBox">
-			<Setter Property="BorderBrush" Value="{DynamicResource SystemBaseMediumLowColor}" /> 
+			<Setter Property="BorderBrush" Value="{DynamicResource SystemBaseMediumColor}" /> 
 			<Setter Property="BorderThickness" Value="1" />
 			<Setter Property="CornerRadius" Value="3" />
 			<Setter Property="Template">
@@ -28,7 +28,7 @@
 							<TextBlock
 								Name="PART_Label"
 								Padding="4,0"
-								Background="{DynamicResource SystemAltHighColor}"
+								Background="{DynamicResource SystemRegionColor}"
 								Text="{TemplateBinding Label}"
 								/>
 						</Grid>

Source/LibationAvalonia/Controls/Settings/Audio.axaml

@@ -47,6 +47,53 @@
 					SelectedItem="{CompiledBinding FileDownloadQuality}"/>
 			</Grid>
 
+
+			<Grid ColumnDefinitions="*,*">
+
+				<CheckBox
+					IsChecked="{CompiledBinding UseWidevine, Mode=TwoWay}"
+					IsCheckedChanged="UseWidevine_IsCheckedChanged"
+					ToolTip.Tip="{CompiledBinding UseWidevineTip}">
+					<TextBlock Text="{CompiledBinding UseWidevineText}" />
+				</CheckBox>
+				
+				<CheckBox
+					Grid.Column="1"
+					HorizontalAlignment="Right"
+					ToolTip.Tip="{CompiledBinding RequestSpatialTip}"
+					IsEnabled="{CompiledBinding UseWidevine}"
+					IsChecked="{CompiledBinding RequestSpatial, Mode=TwoWay}">
+					<TextBlock Text="{CompiledBinding RequestSpatialText}" />
+				</CheckBox>
+			</Grid>
+
+			<Grid ColumnDefinitions="*,Auto"
+				  ToolTip.Tip="{CompiledBinding SpatialAudioCodecTip}">
+				<Grid.IsEnabled>
+					<MultiBinding Converter="{x:Static BoolConverters.And}">
+						<MultiBinding.Bindings>
+							<CompiledBinding Path="UseWidevine"/>
+							<CompiledBinding Path="RequestSpatial"/>
+						</MultiBinding.Bindings>
+					</MultiBinding>
+				</Grid.IsEnabled>
+				
+				<TextBlock
+					VerticalAlignment="Center"
+					Text="{CompiledBinding SpatialAudioCodecText}" />
+
+				<controls:WheelComboBox
+					Margin="5,0,0,0"
+					Grid.Column="1"
+					ItemsSource="{CompiledBinding SpatialAudioCodecs}"
+					SelectedItem="{CompiledBinding SpatialAudioCodec}"/>
+			</Grid>
+			
+			
+			
+			
+			
+
 			<CheckBox IsChecked="{CompiledBinding CreateCueSheet, Mode=TwoWay}">
 				<TextBlock Text="{CompiledBinding CreateCueSheetText}" />
 			</CheckBox>

Source/LibationAvalonia/Controls/Settings/Audio.axaml.cs

@@ -1,7 +1,10 @@
+using AudibleUtilities;
 using Avalonia.Controls;
 using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
+using LibationFileManager.Templates;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Controls.Settings
@@ -19,6 +22,25 @@ namespace LibationAvalonia.Controls.Settings
 			}
 		}
 
+		private async void UseWidevine_IsCheckedChanged(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (sender is CheckBox cbox && cbox.IsChecked is true)
+			{
+				using var accounts = AudibleApiStorage.GetAccountsSettingsPersister();
+
+				if (!accounts.AccountsSettings.Accounts.Any(a => a.IdentityTokens.DeviceType == AudibleApi.Resources.DeviceType))
+				{
+					if (VisualRoot is Window parent)
+						await MessageBox.Show(parent,
+						"Your must remove account(s) from Libation and then re-add them to enable widwvine content.",
+						"Widevine Content Unavailable",
+						MessageBoxButtons.OK);
+
+					_viewModel.UseWidevine = false;
+				}
+			}
+		}
+
 		public async void EditChapterTitleTemplateButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
 			if (_viewModel is null) return;

Source/LibationAvalonia/Controls/Settings/DownloadDecrypt.axaml.cs

@@ -2,6 +2,7 @@ using Avalonia.Controls;
 using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
+using LibationFileManager.Templates;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Controls.Settings

Source/LibationAvalonia/Controls/Settings/Important.axaml

@@ -158,15 +158,24 @@
 			<TextBlock
 				Grid.Column="0"
 				FontSize="16"
+				Margin="0,0,15,0"
 				VerticalAlignment="Center"
-				Text="Theme:  "/>
+				Text="Theme:"/>
 
 			<controls:WheelComboBox
+				Name="ThemeComboBox"
 				Grid.Column="1"
 				MinWidth="80"
 				SelectedItem="{CompiledBinding ThemeVariant, Mode=TwoWay}"
 				ItemsSource="{CompiledBinding Themes}"/>
 			
+			<Button
+				Grid.Column="2"
+				HorizontalAlignment="Right"
+				Padding="20,0"
+				VerticalAlignment="Stretch"
+				Content="Edit Theme Colors"
+				Click="EditThemeColors_Click"/>
 		</Grid>
 	</Grid>
 </UserControl>

Source/LibationAvalonia/Controls/Settings/Important.axaml.cs

@@ -1,13 +1,18 @@
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Dinah.Core;
 using FileManager;
+using LibationAvalonia.Dialogs;
 using LibationAvalonia.ViewModels.Settings;
 using LibationFileManager;
+using System.Linq;
 
+#nullable enable
 namespace LibationAvalonia.Controls.Settings
 {
 	public partial class Important : UserControl
 	{
+		private ImportantSettingsVM? ViewModel => DataContext as ImportantSettingsVM;
 		public Important()
 		{
 			InitializeComponent();
@@ -16,6 +21,42 @@ namespace LibationAvalonia.Controls.Settings
 				_ = Configuration.Instance.LibationFiles;
 				DataContext = new ImportantSettingsVM(Configuration.Instance);
 			}
+
+			ThemeComboBox.SelectionChanged += ThemeComboBox_SelectionChanged;
+		}
+
+		private void EditThemeColors_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		{
+			if (App.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime lifetime)
+			{
+				//Only allow a single instance of the theme picker
+				//Show it as a window, not a dialog, so users can preview
+				//their changes throughout the entire app.
+				if (lifetime.Windows.OfType<ThemePickerDialog>().FirstOrDefault() is ThemePickerDialog dialog)
+				{
+					dialog.BringIntoView();
+				}
+				else
+				{
+					var themePicker = new ThemePickerDialog();
+					themePicker.Show();
+				}
+			}
+		}
+
+		private void ThemeComboBox_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+		{
+			//Remove the combo box before changing the theme, then re-add it.
+			//This is a workaround to a crash that will happen if the theme
+			//is changed while the combo box is open
+			ThemeComboBox.SelectionChanged -= ThemeComboBox_SelectionChanged;
+			var parent = ThemeComboBox.Parent as Panel;
+			if (parent?.Children.Remove(ThemeComboBox) ?? false)
+			{
+				Configuration.Instance.SetString(ViewModel?.ThemeVariant, nameof(ViewModel.ThemeVariant));
+				parent.Children.Add(ThemeComboBox);
+			}
+			ThemeComboBox.SelectionChanged += ThemeComboBox_SelectionChanged;
 		}
 
 		public void OpenLogFolderButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)

Source/LibationAvalonia/Controls/ThemePreviewControl.axaml

@@ -0,0 +1,52 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="650"
+		     xmlns:views="clr-namespace:LibationAvalonia.Views"
+		     xmlns:controls="clr-namespace:LibationAvalonia.Controls"
+             x:Class="LibationAvalonia.Controls.ThemePreviewControl">
+	<Grid RowDefinitions="Auto,Auto,*">
+		<controls:GroupBox>
+			<WrapPanel>
+				<RadioButton Margin="5,0" Content="This is an option" IsChecked="True" />
+				<RadioButton Margin="5,0" Content="This is another option" />
+				<CheckBox Margin="5,0" Content="This is a check box" />
+				<controls:WheelComboBox
+					Margin="5,0"
+					ItemsSource="{Binding ComboBoxItems}"
+					SelectedIndex="{Binding ComboBoxSelectedIndex}" />
+				<TextBox Margin="5,0" Text="This is an editable text box" />
+				<TextBox Margin="5,0" Text="This is a read-only text box" IsReadOnly="True" />
+				<NumericUpDown Margin="5,0" Value="100" />
+				<controls:LinkLabel VerticalAlignment="Center" Margin="5,5" Text="This is an unvisited link" />
+				<controls:LinkLabel VerticalAlignment="Center" Margin="5,5" Text="This is a visited link" Foreground="{DynamicResource HyperlinkVisited}" />
+				<StackPanel Margin="5,0" Height="25" Orientation="Horizontal">
+					<StackPanel.Styles>
+						<Style Selector="Path">
+							<Setter Property="Stretch" Value="Uniform" />
+							<Setter Property="Margin" Value="3,5" />
+							<Setter Property="Fill" Value="{DynamicResource IconFill}" />
+						</Style>
+					</StackPanel.Styles>
+					<Path Data="{StaticResource QueuedIcon}" />
+					<Path Data="{StaticResource QueueCompletedIcon}" />
+					<Path Data="{StaticResource QueueErrorIcon}"/>
+				</StackPanel>
+			</WrapPanel>
+		</controls:GroupBox>
+		<WrapPanel Orientation="Horizontal" Grid.Row="1">
+			<views:ProcessBookControl DataContext="{Binding QueuedBook}" ProcessBookStatus="{Binding Status}"  />
+			<views:ProcessBookControl DataContext="{Binding WorkingBook}" ProcessBookStatus="{Binding Status}"  />
+			<views:ProcessBookControl DataContext="{Binding CompletedBook}" ProcessBookStatus="{Binding Status}"  />
+			<views:ProcessBookControl DataContext="{Binding CancelledBook}" ProcessBookStatus="{Binding Status}"  />
+			<views:ProcessBookControl DataContext="{Binding FailedBook}" ProcessBookStatus="{Binding Status}"  />
+
+		</WrapPanel>
+		
+		<views:ProductsDisplay
+			Grid.Row="2"
+			DataContext="{Binding ProductsDisplay}"	/>
+		
+	</Grid>
+</UserControl>

Source/LibationAvalonia/Controls/ThemePreviewControl.axaml.cs

@@ -0,0 +1,94 @@
+using Avalonia.Controls;
+using Avalonia.Media.Imaging;
+using DataLayer;
+using Dinah.Core.ErrorHandling;
+using LibationAvalonia.ViewModels;
+using LibationFileManager;
+using NPOI.Util.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+
+namespace LibationAvalonia.Controls;
+
+public partial class ThemePreviewControl : UserControl
+{
+	public ProductsDisplayViewModel ProductsDisplay { get; set; }
+	public string[] ComboBoxItems { get; } = Enumerable.Range(1, 9).Select(n => $"Combo box item {n}").ToArray();
+	public int ComboBoxSelectedIndex { get; set; }
+
+	public ProcessBookViewModel QueuedBook { get; }
+	public ProcessBookViewModel WorkingBook { get; }
+	public ProcessBookViewModel CompletedBook { get; }
+	public ProcessBookViewModel CancelledBook { get; }
+	public ProcessBookViewModel FailedBook { get; }
+	public ThemePreviewControl()
+    {
+		InitializeComponent();
+		List<LibraryBook> sampleEntries;
+		sampleEntries = CreateMockBooks().ToList();
+
+		if (Design.IsDesignMode)
+		{
+			using var ms1 = new MemoryStream();
+			App.OpenAsset("img-coverart-prod-unavailable_80x80.jpg").CopyTo(ms1);
+			PictureStorage.SetDefaultImage(PictureSize._80x80, ms1.ToArray());
+		}
+
+		QueuedBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Queued };
+		WorkingBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Working };
+		CompletedBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Completed };
+		CancelledBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Cancelled };
+		FailedBook = new ProcessBookViewModel(sampleEntries[0], null) { Status = ProcessBookStatus.Failed };
+
+		//Set the current processable so that the empty queue doesn't try to advance.
+		QueuedBook.AddDownloadPdf();
+		WorkingBook.AddDownloadPdf();
+
+		typeof(ProcessBookViewModel).GetProperty(nameof(ProcessBookViewModel.Progress)).SetValue(WorkingBook, 50);
+
+		ProductsDisplay = new ProductsDisplayViewModel();
+		_ = ProductsDisplay.BindToGridAsync(sampleEntries);
+		DataContext = this;
+    }
+
+	private IEnumerable<LibraryBook> CreateMockBooks()
+	{
+		var author = new Contributor("Some Author", "asin_contributor");
+		var narrator = new Contributor("Some Narrator", "asin_narrator");
+
+		var book1 = new Book(new AudibleProductId("asin_book1"), "Some Book 1", "The Theming", "Demo Book Entry", 525600, ContentType.Product, [author], [narrator], "us");
+		var book2 = new Book(new AudibleProductId("asin_book2"), "Some Book 2", "The Theming", "Demo Book Entry", 525600, ContentType.Product, [author], [narrator], "us");
+		var book3 = new Book(new AudibleProductId("asin_book3"), "Some Book 3", "The Theming", "Demo Book Entry", 525600, ContentType.Product, [author], [narrator], "us");
+		var book4 = new Book(new AudibleProductId("asin_book4"), "Some Book 4", "The Theming", "Demo Book Entry", 525600, ContentType.Product, [author], [narrator], "us");
+		var seriesParent = new Book(new AudibleProductId("asin_series"), "Some Series", "", "Demo Series Entry", 0, ContentType.Parent, [author], [narrator], "us");
+		var episode = new Book(new AudibleProductId("asin_episode"), "Some Episode", "Episode 1", "Demo Episode Entry", 56, ContentType.Episode, [author], [narrator], "us");
+
+		var series = new Series(new AudibleSeriesId(seriesParent.AudibleProductId), seriesParent.Title);
+
+		seriesParent.UpsertSeries(series, "");
+		episode.UpsertSeries(series, "1");
+
+		book1.UserDefinedItem.BookStatus = LiberatedStatus.Liberated;
+		book4.UserDefinedItem.BookStatus = LiberatedStatus.Error;
+		//Set the backing field directly to preserve LiberatedStatus.PartialDownload
+		typeof(UserDefinedItem).GetField("_bookStatus", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(book2.UserDefinedItem, LiberatedStatus.PartialDownload);
+
+		yield return new LibraryBook(book1, System.DateTime.Now.AddDays(4), "someone@email.co");
+		yield return new LibraryBook(book2, System.DateTime.Now.AddDays(3), "someone@email.co");
+		yield return new LibraryBook(book3, System.DateTime.Now.AddDays(2), "someone@email.co") { AbsentFromLastScan = true };
+		yield return new LibraryBook(book4, System.DateTime.Now.AddDays(1), "someone@email.co");
+		yield return new LibraryBook(seriesParent, System.DateTime.Now, "someone@email.co");
+		yield return new LibraryBook(episode, System.DateTime.Now, "someone@email.co");
+	}
+
+	private class MockProcessable : FileLiberator.Processable
+	{
+		public override string Name => nameof(MockProcessable);
+		public override Task<StatusHandler> ProcessAsync(LibraryBook libraryBook) => Task.FromResult(new StatusHandler());
+		public override bool Validate(LibraryBook libraryBook) => false;
+	}
+}

Source/LibationAvalonia/Dialogs/AboutDialog.axaml

@@ -2,13 +2,12 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-		mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="520"
-		MinWidth="400" MinHeight="520"
-		Width="400" Height="520"
+		mc:Ignorable="d" d:DesignWidth="450" d:DesignHeight="540"
+		MinWidth="450" MinHeight="540"
+		Width="450" Height="540"
         x:Class="LibationAvalonia.Dialogs.AboutDialog"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
-        Title="About Libation"
-		Icon="/Assets/libation.ico">
+        Title="About Libation">
 	
 	<Grid Margin="10" ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,*">
 		
@@ -42,30 +41,38 @@
 
 		<controls:GroupBox Grid.Row="3" Label="Acknowledgements" Grid.ColumnSpan="2">
 			<StackPanel>
+				<StackPanel.Styles>
+					<Style Selector="controls|LinkLabel">
+						<Setter Property="Margin" Value="5,0" />
+						<Setter Property="FontSize" Value="13" />
+					</Style>
+				</StackPanel.Styles>
 
-				<Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
-					<controls:LinkLabel FontWeight="Bold" Text="rmcrackan" Tapped="Link_GithubUser" />
-					<TextBlock Grid.Column="1" Margin="10,0" Text="Creator" />
-					<controls:LinkLabel Grid.Row="1" FontWeight="Bold" Text="Mbucari" Tapped="Link_GithubUser" />
-					<TextBlock Grid.Row="1" Grid.Column="1" Margin="10,0" Text="Developer" />
-				</Grid>
+				<ItemsControl ItemsSource="{Binding PrimaryContributors}">
+					<ItemsControl.ItemTemplate>
+						<DataTemplate>
+							<StackPanel Orientation="Horizontal">
+								<controls:LinkLabel FontWeight="Bold" Text="{Binding Name}" Tapped="ContributorLink_Tapped" />
+								<TextBlock Grid.Column="1" Margin="10,0" Text="{Binding Type}" />								
+							</StackPanel>
+						</DataTemplate>
+					</ItemsControl.ItemTemplate>
+				</ItemsControl>
 				
 				<TextBlock Margin="0,10" FontSize="12" Text="Additional Contributions by:" TextDecorations="Underline"/>
 
-				<WrapPanel>
-					<WrapPanel.Styles>
-						<Style Selector="controls|LinkLabel">
-							<Setter Property="Margin" Value="5,0" />
-							<Setter Property="FontSize" Value="13" />
-						</Style>
-					</WrapPanel.Styles>
-					<controls:LinkLabel Text="pixil98" Tapped="Link_GithubUser" />
-					<controls:LinkLabel Text="hutattedonmyarm" Tapped="Link_GithubUser" />
-					<controls:LinkLabel Text="seanke" Tapped="Link_GithubUser" />
-					<controls:LinkLabel Text="wtanksleyjr" Tapped="Link_GithubUser" />
-					<controls:LinkLabel Text="Dr.Blank" Tapped="Link_GithubUser" />
-					<controls:LinkLabel Text="CharlieRussel" Tapped="Link_GithubUser" />
-				</WrapPanel>
+				<ItemsControl ItemsSource="{Binding AdditionalContributors}">
+					<ItemsControl.ItemsPanel>
+						<ItemsPanelTemplate>
+							<WrapPanel />
+						</ItemsPanelTemplate>
+					</ItemsControl.ItemsPanel>
+					<ItemsControl.ItemTemplate>
+						<DataTemplate>
+							<controls:LinkLabel Text="{Binding Name}" Tapped="ContributorLink_Tapped" />
+						</DataTemplate>
+					</ItemsControl.ItemTemplate>
+				</ItemsControl>
 			</StackPanel>			
 		</controls:GroupBox>
 		

Source/LibationAvalonia/Dialogs/AboutDialog.axaml.cs

@@ -5,6 +5,7 @@ using LibationFileManager;
 using LibationUiBase;
 using ReactiveUI;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace LibationAvalonia.Dialogs
@@ -48,11 +49,11 @@ namespace LibationAvalonia.Dialogs
 			}
 		}
 
-		private void Link_GithubUser(object sender, Avalonia.Input.TappedEventArgs e)
+		private void ContributorLink_Tapped(object sender, Avalonia.Input.TappedEventArgs e)
 		{
-			if (sender is LinkLabel lbl)
+			if (sender is LinkLabel lbl && lbl.DataContext is LibationContributor contributor)
 			{
-				Dinah.Core.Go.To.Url($"ht" + $"tps://github.com/{lbl.Text.Replace('.','-')}");
+				Dinah.Core.Go.To.Url(contributor.Link.AbsoluteUri);
 			}
 		}
 
@@ -72,6 +73,9 @@ namespace LibationAvalonia.Dialogs
 		private bool canCheckForUpgrade = true;
 		private string upgradeButtonText = "Check for Upgrade";
 
+		public IEnumerable<LibationContributor> PrimaryContributors => LibationContributor.PrimaryContributors;
+		public IEnumerable<LibationContributor> AdditionalContributors => LibationContributor.AdditionalContributors;
+
 		public AboutVM()
 		{
 			Version = $"Libation {AppScaffolding.LibationScaffolding.Variety} v{AppScaffolding.LibationScaffolding.BuildVersion}";

Source/LibationAvalonia/Dialogs/AccountsDialog.axaml

@@ -5,8 +5,7 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         Width="800" Height="450"
         x:Class="LibationAvalonia.Dialogs.AccountsDialog"
-        Title="Audible Accounts"
-		Icon="/Assets/libation.ico">
+        Title="Audible Accounts">
 	<Grid RowDefinitions="*,Auto">
 
 		<Grid.Styles>

Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml

@@ -7,8 +7,7 @@
 		Width="650" Height="500"
         x:Class="LibationAvalonia.Dialogs.BookDetailsDialog"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
-        Title="Book Details" Name="BookDetails"
-		Icon="/Assets/libation.ico">
+        Title="Book Details" Name="BookDetails">
 
 	<Grid RowDefinitions="*,Auto,Auto,40">
 		<Grid.Styles>

Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs

@@ -114,7 +114,6 @@ Title: {title}
 Author(s): {Book.AuthorNames()}
 Narrator(s): {Book.NarratorNames()}
 Length: {(Book.LengthInMinutes == 0 ? "" : $"{Book.LengthInMinutes / 60} hr {Book.LengthInMinutes % 60} min")}
-Audio Bitrate: {Book.AudioFormat}
 Category: {string.Join(", ", Book.LowestCategoryNames())}
 Purchase Date: {libraryBook.DateAdded:d}
 Language: {Book.Language}

Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml

@@ -5,8 +5,7 @@
         mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="450"
 		Width="700" Height="450"
         x:Class="LibationAvalonia.Dialogs.BookRecordsDialog"
-        Title="BookRecordsDialog"
-		Icon="/Assets/libation.ico">
+        Title="BookRecordsDialog">
 
 	<Grid RowDefinitions="*,Auto">
 

Source/LibationAvalonia/Dialogs/DialogWindow.cs

@@ -10,103 +10,43 @@ namespace LibationAvalonia.Dialogs
 {
 	public abstract class DialogWindow : Window
 	{
-		public bool SaveAndRestorePosition { get; set; } = true;
+		protected bool CancelOnEscape { get; set; } = true;
+		protected bool SaveOnEnter { get; set; } = true;
+		public bool SaveAndRestorePosition { get; set; }
 		public Control ControlToFocusOnShow { get; set; }
 		protected override Type StyleKeyOverride => typeof(DialogWindow);
 
-		public static readonly StyledProperty<bool> UseCustomTitleBarProperty =
-		AvaloniaProperty.Register<DialogWindow, bool>(nameof(UseCustomTitleBar));
-
-		public bool UseCustomTitleBar
-		{
-			get { return GetValue(UseCustomTitleBarProperty); }
-			set { SetValue(UseCustomTitleBarProperty, value); }
-		}
-
-		public DialogWindow()
+		public DialogWindow(bool saveAndRestorePosition = true)
 		{
+			SaveAndRestorePosition = saveAndRestorePosition;
 			KeyDown += DialogWindow_KeyDown;
 			Initialized += DialogWindow_Initialized;
 			Opened += DialogWindow_Opened;
+			Loaded += DialogWindow_Loaded;
 			Closing += DialogWindow_Closing;
 
-			UseCustomTitleBar = Configuration.IsWindows;
-
 			if (Design.IsDesignMode)
 				RequestedThemeVariant = ThemeVariant.Dark;
 		}
 
-		private bool fixedMinHeight = false;
-		private bool fixedMaxHeight = false;
-		private bool fixedHeight = false;
-
-		protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+		private void DialogWindow_Loaded(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
-			const int customTitleBarHeight = 30;
-			if (UseCustomTitleBar)
-			{
-				if (change.Property == MinHeightProperty && !fixedMinHeight)
-				{
-					fixedMinHeight = true;
-					MinHeight += customTitleBarHeight;
-					fixedMinHeight = false;
-				}
-				if (change.Property == MaxHeightProperty && !fixedMaxHeight)
-				{
-					fixedMaxHeight = true;
-					MaxHeight += customTitleBarHeight;
-					fixedMaxHeight = false;
-				}
-				if (change.Property == HeightProperty && !fixedHeight)
-				{
-					fixedHeight = true;
-					Height += customTitleBarHeight;
-					fixedHeight = false;
-				}
-			}
-			base.OnPropertyChanged(change);
-		}
-
-		public DialogWindow(bool saveAndRestorePosition) : this()
-		{
-			SaveAndRestorePosition = saveAndRestorePosition;
+			if (!CanResize)
+				this.HideMinMaxBtns();
 		}
 
 		protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
 		{
 			base.OnApplyTemplate(e);
 
-			if (!UseCustomTitleBar)
-				return;
-
-			var closeButton = e.NameScope.Find<Button>("DialogCloseButton");
-			var border = e.NameScope.Get<Border>("DialogWindowTitleBorder");
-			var titleBlock = e.NameScope.Get<TextBlock>("DialogWindowTitleTextBlock");
-			var icon = e.NameScope.Get<Avalonia.Controls.Shapes.Path>("DialogWindowTitleIcon");
-
-			closeButton.Click += CloseButton_Click;
-			border.PointerPressed += Border_PointerPressed;
-			icon.IsVisible = Icon != null;
-
 			if (MinHeight == MaxHeight && MinWidth == MaxWidth)
 			{
 				CanResize = false;
-				border.Margin = new Thickness(0);
-				icon.Margin = new Thickness(8, 5, 0, 5);
+				Height = MinHeight;
+				Width = MinWidth;
 			}
 		}
 
-		private void Border_PointerPressed(object sender, Avalonia.Input.PointerPressedEventArgs e)
-		{
-			if (e.GetCurrentPoint(null).Properties.IsLeftButtonPressed)
-				BeginMoveDrag(e);
-		}
-
-		private void CloseButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
-		{
-			CancelAndClose();
-		}
-
 		private void DialogWindow_Initialized(object sender, EventArgs e)
 		{
 			this.WindowStartupLocation = WindowStartupLocation.CenterOwner;
@@ -132,9 +72,9 @@ namespace LibationAvalonia.Dialogs
 
 		private async void DialogWindow_KeyDown(object sender, Avalonia.Input.KeyEventArgs e)
 		{
-			if (e.Key == Avalonia.Input.Key.Escape)
+			if (CancelOnEscape && e.Key == Avalonia.Input.Key.Escape)
 				await CancelAndCloseAsync();
-			else if (e.Key == Avalonia.Input.Key.Return)
+			else if (SaveOnEnter && e.Key == Avalonia.Input.Key.Return)
 				await SaveAndCloseAsync();
 		}
 	}

Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml

@@ -6,8 +6,7 @@
         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"
+        Title="Edit Quick Filters"
 		x:DataType="dialogs:EditQuickFilters">
 	<Grid RowDefinitions="*,Auto">
 

Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml

@@ -6,8 +6,7 @@
 		MinWidth="500" MinHeight="450"
 		Width="500" Height="450"
         x:Class="LibationAvalonia.Dialogs.EditReplacementChars"
-        Title="Illegal Character Replacement"		
-		Icon="/Assets/libation.ico">
+        Title="Illegal Character Replacement">
 
 	<Grid
 		RowDefinitions="*,Auto"

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml

@@ -6,7 +6,6 @@
 		Width="800" Height="450"
         x:Class="LibationAvalonia.Dialogs.EditTemplateDialog"
 		xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
-		Icon="/Assets/libation.ico"
         Title="EditTemplateDialog">
 
 	<Grid RowDefinitions="Auto,*,Auto">

Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml.cs

@@ -5,6 +5,7 @@ using Avalonia.Media;
 using Avalonia.Styling;
 using Dinah.Core;
 using LibationFileManager;
+using LibationFileManager.Templates;
 using ReactiveUI;
 using System;
 using System.IO;

Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml

@@ -7,8 +7,7 @@
 		MinWidth="500" MinHeight="500"
 		Width="500" Height="520"
         Title="Cover"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
 
 	<Image Stretch="Uniform" Source="{Binding CoverImage}">
 		<Image.ContextMenu>

Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml

@@ -9,8 +9,7 @@
         x:Class="LibationAvalonia.Dialogs.LibationFilesDialog"
         xmlns:controls="clr-namespace:LibationAvalonia.Controls"
 		WindowStartupLocation="CenterScreen"
-        Title="Book Details"
-		Icon="/Assets/libation.ico">
+        Title="Book Details">
 	
 	<Grid
 		RowDefinitions="Auto,Auto">

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml

@@ -9,8 +9,7 @@
 		MinHeight="135" MaxHeight="135"
 		MinWidth="550" MaxWidth="550"
 		Width="550" Height="135"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
  
 	<Grid Margin="10" RowDefinitions="Auto,Auto">
 		

Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml

@@ -9,8 +9,7 @@
 		MinWidth="400" MinHeight="100"
 		MaxWidth="400" MaxHeight="100"
 		Width="400" Height="100"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
 
 	<Grid RowDefinitions="Auto,Auto" ColumnDefinitions="*,Auto">
 

Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml

@@ -6,8 +6,7 @@
 		Width="600" Height="450"
 		x:Class="LibationAvalonia.Dialogs.LocateAudiobooksDialog"
         Title="Locate Audiobooks"
-		WindowStartupLocation="CenterOwner"
-		Icon="/Assets/libation.ico">
+		WindowStartupLocation="CenterOwner">
 
 	<Grid Margin="5" ColumnDefinitions="*,Auto" RowDefinitions="Auto,*">
 		<TextBlock Grid.Column="0" Text="Found Audiobooks" />

Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml

@@ -8,8 +8,7 @@
 		Width="240" Height="140"
 		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.ApprovalNeededDialog"
-        Title="Approval Alert Detected"
-		Icon="/Assets/libation.ico">
+        Title="Approval Alert Detected">
 
 	<Grid RowDefinitions="Auto,Auto,*">
 

Source/LibationAvalonia/Dialogs/Login/AvaloniaLoginChoiceEager.cs

@@ -1,10 +1,10 @@
 using AudibleApi;
 using AudibleUtilities;
-using Avalonia.Threading;
 using LibationFileManager;
 using System;
 using System.Threading.Tasks;
 
+#nullable enable
 namespace LibationAvalonia.Dialogs.Login
 {
 	public class AvaloniaLoginChoiceEager : ILoginChoiceEager
@@ -23,14 +23,14 @@ namespace LibationAvalonia.Dialogs.Login
 			LoginCallback = new AvaloniaLoginCallback(_account);
 		}
 
-		public async Task<ChoiceOut> StartAsync(ChoiceIn choiceIn)
+		public async Task<ChoiceOut?> StartAsync(ChoiceIn choiceIn)
 		{
 			if (Configuration.IsWindows && Environment.OSVersion.Version.Major >= 10)
 			{
 				try
 				{
 					var weblogin = new WebLoginDialog(_account.AccountId, choiceIn.LoginUrl);
-					if (await weblogin.ShowDialog<DialogResult>(App.MainWindow) is DialogResult.OK)
+					if (await weblogin.ShowDialogAsync(App.MainWindow) is DialogResult.OK)
 						return ChoiceOut.External(weblogin.ResponseUrl);
 				}
 				catch (Exception ex)

Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml

@@ -8,8 +8,7 @@
 		Width="220" Height="250"
 		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.CaptchaDialog"
-        Title="CAPTCHA"
-		Icon="/Assets/libation.ico">
+        Title="CAPTCHA">
 
 	<Grid
 		RowDefinitions="Auto,Auto,Auto,Auto,*"

Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml

@@ -7,8 +7,7 @@
 		Width="300" Height="120"
 		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.LoginCallbackDialog"
-        Title="Audible Login" 
-		Icon="/Assets/libation.ico">
+        Title="Audible Login">
 
 
 	<Grid RowDefinitions="Auto,Auto,Auto,*" ColumnDefinitions="*" Margin="5">

Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml

@@ -8,8 +8,7 @@
 		WindowStartupLocation="CenterOwner"
 		xmlns:controls="clr-namespace:LibationAvalonia.Controls"
         x:Class="LibationAvalonia.Dialogs.Login.LoginChoiceEagerDialog"
-        Title="Audible Login"
-		Icon="/Assets/libation.ico" >
+        Title="Audible Login">
 
 	<Grid RowDefinitions="Auto,Auto,Auto,*" ColumnDefinitions="*" Margin="5">
 		

Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml

@@ -6,8 +6,7 @@
 		Width="650" Height="500"
 		WindowStartupLocation="CenterOwner"
         x:Class="LibationAvalonia.Dialogs.Login.LoginExternalDialog"
-        Title="Audible Login External"
-		Icon="/Assets/libation.ico">
+        Title="Audible Login External">
 
 	<Grid RowDefinitions="Auto,Auto,*,Auto,*" ColumnDefinitions="*" Margin="5">