incr ver

Crash logging to chardonnay

.github/workflows/build-windows.yml

@@ -75,6 +75,7 @@ jobs:
               LibationCli/LibationCli.csproj `
               --configuration ${{ env.DOTNET_CONFIGURATION }} `
               --output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
+              -p:DefineConstants="${{ matrix.release_name }}" `
               -p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
           dotnet publish `
               Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj `

Source/AppScaffolding/AppScaffolding.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>10.5.0.1</Version>
+    <Version>10.5.2.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Octokit" Version="6.0.0" />

Source/AppScaffolding/LibationScaffolding.cs

@@ -90,28 +90,18 @@ namespace AppScaffolding
 		}
 
 		/// <summary>Initialize logging. Wire-up events. Run after migration</summary>
-		public static void RunPostMigrationScaffolding(Configuration config)
+		public static void RunPostMigrationScaffolding(Variety variety, Configuration config)
 		{
+			Variety = Enum.IsDefined(variety) ? variety : Variety.None;
+
+			var releaseID = (ReleaseIdentifier)((int)variety | (int)Configuration.OS | (int)RuntimeInformation.ProcessArchitecture);
+
+			ReleaseIdentifier = Enum.IsDefined(releaseID) ? releaseID : ReleaseIdentifier.None;
+
 			ensureSerilogConfig(config);
 			configureLogging(config);
 			logStartupState(config);
 
-			#region Determine Libation Variery and Release ID
-
-			Variety = File.Exists("System.Windows.Forms.dll") ? Variety.Classic : Variety.Chardonnay;
-
-			var releaseID = (ReleaseIdentifier)((int)Variety | (int)Configuration.OS | (int)RuntimeInformation.ProcessArchitecture);
-
-			if (Enum.IsDefined(releaseID))
-				ReleaseIdentifier = releaseID;
-			else
-			{
-				ReleaseIdentifier = ReleaseIdentifier.None;
-				Serilog.Log.Logger.Warning("Unknown release identifier @{DebugInfo}", new { Variety, Configuration.OS, RuntimeInformation.ProcessArchitecture });
-			}
-
-			#endregion
-
 			// all else should occur after logging
 
 			wireUpSystemEvents(config);

Source/HangoverAvalonia/HangoverAvalonia.csproj

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

Source/HangoverAvalonia/Views/MainWindow.axaml.cs

@@ -13,7 +13,7 @@ namespace HangoverAvalonia.Views
 
 			var config = LibationScaffolding.RunPreConfigMigrations();
 			LibationScaffolding.RunPostConfigMigrations(config);
-			LibationScaffolding.RunPostMigrationScaffolding(config);
+			LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
 		}
 
 		public void OnLoad()

Source/HangoverWinForms/Form1.Designer.cs

@@ -219,8 +219,8 @@
             // 
             // Form1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.ClientSize = new System.Drawing.Size(800, 450);
             this.Controls.Add(this.tabControl1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

Source/HangoverWinForms/Form1.cs

@@ -10,7 +10,7 @@ namespace HangoverWinForms
 
             var config = LibationScaffolding.RunPreConfigMigrations();
             LibationScaffolding.RunPostConfigMigrations(config);
-            LibationScaffolding.RunPostMigrationScaffolding(config);
+            LibationScaffolding.RunPostMigrationScaffolding(Variety.Classic, config);
 
             databaseTab.VisibleChanged += databaseTab_VisibleChanged;
             cliTab.VisibleChanged += cliTab_VisibleChanged;

Source/LibationAvalonia/App.axaml.cs

@@ -141,7 +141,7 @@ namespace LibationAvalonia
 			await MessageBox.VerboseLoggingWarning_ShowIfTrue();
 
 			// logging is init'd here
-			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
+			AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(AppScaffolding.Variety.Chardonnay, config);
 		}
 
 		private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, LibationFilesDialog, Configuration> OnClose)

Source/LibationAvalonia/LibationAvalonia.csproj

@@ -70,13 +70,13 @@
 	</ItemGroup>
 
 	<ItemGroup>		
-		<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-rc2.2" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
-		<PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
-		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0-rc2.2" />
-		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.0-rc2.2" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc2.2" />
-		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc2.2" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc2.2" />
+		<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0" Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" />
+		<PackageReference Include="Avalonia" Version="11.0.0" />
+		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0" />
+		<PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.0" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
+		<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

Source/LibationAvalonia/Program.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using ApplicationServices;
 using AppScaffolding;
@@ -35,6 +34,7 @@ namespace LibationAvalonia
 					$"\"{Configuration.ProcessDirectory}\"");
 				return;
 			}
+			AppDomain.CurrentDomain.UnhandledException += (o, e) => LogError(e.ExceptionObject);
 
 			//***********************************************//
 			//                                               //
@@ -42,23 +42,32 @@ namespace LibationAvalonia
 			//                                               //
 			//***********************************************//
 			// Migrations which must occur before configuration is loaded for the first time. Usually ones which alter the Configuration
-			var config = LibationScaffolding.RunPreConfigMigrations();
-
-			//Start as much work in parallel as possible.
-			var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime());
-			var appBuilderTask = Task.Run(BuildAvaloniaApp);
-
-			if (config.LibationSettingsAreValid)
+			try
 			{
-				if (!RunDbMigrations(config))
-					return;
+				var config = LibationScaffolding.RunPreConfigMigrations();
 
-				App.LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+				//Start as much work in parallel as possible.
+				var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime());
+				var appBuilderTask = Task.Run(BuildAvaloniaApp);
+
+				if (config.LibationSettingsAreValid)
+				{
+					// most migrations go in here
+					LibationScaffolding.RunPostConfigMigrations(config);
+					LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
+
+					//Start loading the library before loading the main form
+					App.LibraryTask = Task.Run(() => DbContexts.GetLibrary_Flat_NoTracking(includeParents: true));
+				}
+
+				appBuilderTask.GetAwaiter().GetResult().SetupWithLifetime(classicLifetimeTask.GetAwaiter().GetResult());
+
+				classicLifetimeTask.Result.Start(null);
+			}
+			catch(Exception e)
+			{
+				LogError(e);
 			}
-
-			appBuilderTask.GetAwaiter().GetResult().SetupWithLifetime(classicLifetimeTask.GetAwaiter().GetResult());
-
-			classicLifetimeTask.Result.Start(null);
 		}
 
 		public static AppBuilder BuildAvaloniaApp()
@@ -67,20 +76,35 @@ namespace LibationAvalonia
 			.LogToTrace()
 			.UseReactiveUI();
 
-		public static bool RunDbMigrations(Configuration config)
+		private static void LogError(object exceptionObject)
 		{
-			try
-			{
-				// most migrations go in here
-				LibationScaffolding.RunPostConfigMigrations(config);
-				LibationScaffolding.RunPostMigrationScaffolding(config);
+			var logError = $"""
+				{DateTime.Now} - Libation Crash
+				 OS                    {Configuration.OS}
+				 Version               {LibationScaffolding.BuildVersion}
+				 ReleaseIdentifier     {LibationScaffolding.ReleaseIdentifier}
+				 InteropFunctionsType  {InteropFactory.InteropFunctionsType}
+				 LibationFiles         {getConfigValue(c => c.LibationFiles)}
+				 Books Folder          {getConfigValue(c => c.Books)}
+				 === EXCEPTION ===
+				 {exceptionObject}
+				""";
 
-				return LibationScaffolding.ReleaseIdentifier is not ReleaseIdentifier.None;
-			}
-			catch (Exception exDebug)
+			var crashLog = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "LibationCrash.log");
+
+			using var sw = new StreamWriter(crashLog, true);
+			sw.WriteLine(logError);
+
+			static string getConfigValue(Func<Configuration, string> selector)
 			{
-				Serilog.Log.Logger.Debug(exDebug, "Silent failure");
-				return false;
+				try
+				{
+					return selector(Configuration.Instance);
+				}
+				catch (Exception ex)
+				{
+					return ex.ToString();
+				}
 			}
 		}
 	}

Source/LibationCli/Setup.cs

@@ -17,9 +17,13 @@ namespace LibationCli
 			//***********************************************//
 			var config = LibationScaffolding.RunPreConfigMigrations();
 
-
 			LibationScaffolding.RunPostConfigMigrations(config);
-			LibationScaffolding.RunPostMigrationScaffolding(config);
+
+#if classic
+			LibationScaffolding.RunPostMigrationScaffolding(Variety.Classic, config);
+#else
+			LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
+#endif
 		}
 
 		public static Type[] LoadVerbs() => Assembly.GetExecutingAssembly()

Source/LibationSearchEngine/QuerySanitizer.cs

@@ -2,10 +2,11 @@
 using Lucene.Net.Analysis.Tokenattributes;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace LibationSearchEngine
 {
-	internal static class QuerySanitizer
+	internal static partial class QuerySanitizer
 	{
 		private static readonly HashSet<string> idTerms
 			= SearchEngine.FieldIndexRules.IdFieldNames
@@ -23,11 +24,17 @@ namespace LibationSearchEngine
 			.Select(n => n.ToLowerInvariant())
 			.ToHashSet();
 
+		private static readonly Regex tagRegex = TagRegex();
+
 		internal static string Sanitize(string searchString, StandardAnalyzer analyzer)
 		{
 			if (string.IsNullOrWhiteSpace(searchString))
 				return SearchEngine.ALL_QUERY;
 
+			//Replace a block tags with tags with proper tag query syntax
+			//eg: [foo] -> tags:foo
+			searchString = tagRegex.Replace(searchString, $"{SearchEngine.TAGS}:$1 ");
+
 			// range operator " TO " and bool operators " AND " and " OR " must be uppercase
 			searchString
 				= searchString
@@ -76,11 +83,6 @@ namespace LibationSearchEngine
 					addUnalteredToken(offset);
 					previousIsTags = false;
 				}
-				else if (tryParseBlockTag(offset, partList, searchString, out var tagName))
-				{
-					//The term is a block tag. add it to the part list
-					partList.Add($"{SearchEngine.TAGS}:{tagName}");
-				}
 				else if (double.TryParse(term, out var num))
 				{
 					//Term is a number so pad it with zeros
@@ -117,35 +119,7 @@ namespace LibationSearchEngine
 				partList.Add(searchString.Substring(offset.StartOffset, offset.EndOffset - offset.StartOffset));			
 		}
 
-		private static bool tryParseBlockTag(IOffsetAttribute offset, List<string> partList, string searchString, out string tagName)
-		{
-			tagName = null;
-			if (partList.Count == 0) return false;
-
-			var previous = partList[^1].TrimEnd();
-
-			//cannot be preceeded by an escaping \
-			if (previous.Length == 0) return false;
-			if (previous[^1] != '[' || (previous.Length > 1 && previous[^2] == '\\')) return false;
-
-			var next = searchString.Substring(offset.EndOffset);
-			if (next.Length == 0 || !next.TrimStart().StartsWith(']')) return false;
-
-			tagName = searchString.Substring(offset.StartOffset, offset.EndOffset - offset.StartOffset);
-
-			//Only legal tag characters are letters, numbers and underscores
-			//Per DataLayer.UserDefinedItem.IllegalCharacterRegex()
-			foreach (var c in tagName)
-			{
-				if (!char.IsLetterOrDigit(c) && c != '_')
-					return false;
-			}
-
-			//Remove the leading '['
-			partList[^1] = previous[..^1];
-			//Ignore the trailing ']'
-			offset.SetOffset(offset.StartOffset, searchString.IndexOf(']', offset.EndOffset) + 1);
-			return true;
-		}
+		[GeneratedRegex(@"(?<!\\)\[\u0020*(\w+)\u0020*\]", RegexOptions.Compiled)]
+		private static partial Regex TagRegex();
 	}
 }

Source/LibationWinForms/Dialogs/AboutDialog.Designer.cs

@@ -286,8 +286,8 @@
 			// 
 			// AboutDialog
 			// 
-			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			ClientSize = new System.Drawing.Size(434, 491);
 			Controls.Add(groupBox1);
 			Controls.Add(getLibationLbl);

Source/LibationWinForms/Dialogs/AccountsDialog.Designer.cs

@@ -143,8 +143,8 @@
             // AccountsDialog
             // 
             this.AcceptButton = this.saveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.CancelButton = this.cancelBtn;
             this.ClientSize = new System.Drawing.Size(933, 519);
             this.Controls.Add(this.dataGridView1);

Source/LibationWinForms/Dialogs/BookDetailsDialog.Designer.cs

@@ -202,8 +202,8 @@
             // BookDetailsDialog
             // 
             this.AcceptButton = this.saveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.CancelButton = this.cancelBtn;
             this.ClientSize = new System.Drawing.Size(594, 466);
             this.Controls.Add(this.audibleLink);

Source/LibationWinForms/Dialogs/BookRecordsDialog.Designer.cs

@@ -201,8 +201,8 @@
 			// 
 			// BookRecordsDialog
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(491, 361);
 			this.Controls.Add(this.reloadAllBtn);
 			this.Controls.Add(this.exportCheckedBtn);

Source/LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.Designer.cs

@@ -29,77 +29,81 @@ namespace LibationWinForms.Dialogs
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.knownDirectoryRb = new System.Windows.Forms.RadioButton();
-			this.customDirectoryRb = new System.Windows.Forms.RadioButton();
-			this.customTb = new System.Windows.Forms.TextBox();
-			this.customBtn = new System.Windows.Forms.Button();
-			this.directorySelectControl = new LibationWinForms.Dialogs.DirectorySelectControl();
-			this.SuspendLayout();
+			knownDirectoryRb = new System.Windows.Forms.RadioButton();
+			customDirectoryRb = new System.Windows.Forms.RadioButton();
+			customTb = new System.Windows.Forms.TextBox();
+			customBtn = new System.Windows.Forms.Button();
+			directorySelectControl = new DirectorySelectControl();
+			SuspendLayout();
 			// 
 			// knownDirectoryRb
 			// 
-			this.knownDirectoryRb.AutoSize = true;
-			this.knownDirectoryRb.Location = new System.Drawing.Point(3, 3);
-			this.knownDirectoryRb.Name = "knownDirectoryRb";
-			this.knownDirectoryRb.Size = new System.Drawing.Size(14, 13);
-			this.knownDirectoryRb.TabIndex = 0;
-			this.knownDirectoryRb.UseVisualStyleBackColor = true;
-			this.knownDirectoryRb.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
+			knownDirectoryRb.AutoSize = true;
+			knownDirectoryRb.Location = new System.Drawing.Point(6, 6);
+			knownDirectoryRb.Margin = new System.Windows.Forms.Padding(6);
+			knownDirectoryRb.Name = "knownDirectoryRb";
+			knownDirectoryRb.Size = new System.Drawing.Size(27, 26);
+			knownDirectoryRb.TabIndex = 0;
+			knownDirectoryRb.UseVisualStyleBackColor = true;
+			knownDirectoryRb.CheckedChanged += radioButton_CheckedChanged;
 			// 
 			// customDirectoryRb
 			// 
-			this.customDirectoryRb.AutoSize = true;
-			this.customDirectoryRb.Location = new System.Drawing.Point(2, 62);
-			this.customDirectoryRb.Name = "customDirectoryRb";
-			this.customDirectoryRb.Size = new System.Drawing.Size(14, 13);
-			this.customDirectoryRb.TabIndex = 2;
-			this.customDirectoryRb.UseVisualStyleBackColor = true;
-			this.customDirectoryRb.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
+			customDirectoryRb.AutoSize = true;
+			customDirectoryRb.Location = new System.Drawing.Point(4, 124);
+			customDirectoryRb.Margin = new System.Windows.Forms.Padding(6);
+			customDirectoryRb.Name = "customDirectoryRb";
+			customDirectoryRb.Size = new System.Drawing.Size(27, 26);
+			customDirectoryRb.TabIndex = 2;
+			customDirectoryRb.UseVisualStyleBackColor = true;
+			customDirectoryRb.CheckedChanged += radioButton_CheckedChanged;
 			// 
 			// customTb
 			// 
-			this.customTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.customTb.Location = new System.Drawing.Point(22, 58);
-			this.customTb.Name = "customTb";
-			this.customTb.Size = new System.Drawing.Size(588, 23);
-			this.customTb.TabIndex = 3;
+			customTb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+			customTb.Location = new System.Drawing.Point(44, 116);
+			customTb.Margin = new System.Windows.Forms.Padding(6);
+			customTb.Name = "customTb";
+			customTb.Size = new System.Drawing.Size(1172, 39);
+			customTb.TabIndex = 3;
 			// 
 			// customBtn
 			// 
-			this.customBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.customBtn.Location = new System.Drawing.Point(616, 58);
-			this.customBtn.Name = "customBtn";
-			this.customBtn.Size = new System.Drawing.Size(41, 27);
-			this.customBtn.TabIndex = 4;
-			this.customBtn.Text = "...";
-			this.customBtn.UseVisualStyleBackColor = true;
-			this.customBtn.Click += new System.EventHandler(this.customBtn_Click);
+			customBtn.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+			customBtn.Location = new System.Drawing.Point(1232, 116);
+			customBtn.Margin = new System.Windows.Forms.Padding(6);
+			customBtn.Name = "customBtn";
+			customBtn.Size = new System.Drawing.Size(82, 54);
+			customBtn.TabIndex = 4;
+			customBtn.Text = "...";
+			customBtn.UseVisualStyleBackColor = true;
+			customBtn.Click += customBtn_Click;
 			// 
 			// directorySelectControl
 			// 
-			this.directorySelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.directorySelectControl.Location = new System.Drawing.Point(23, 0);
-			this.directorySelectControl.Name = "directorySelectControl";
-			this.directorySelectControl.Size = new System.Drawing.Size(635, 52);
-			this.directorySelectControl.TabIndex = 5;
+			directorySelectControl.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+			directorySelectControl.AutoSize = true;
+			directorySelectControl.Location = new System.Drawing.Point(46, 0);
+			directorySelectControl.Margin = new System.Windows.Forms.Padding(12);
+			directorySelectControl.Name = "directorySelectControl";
+			directorySelectControl.Size = new System.Drawing.Size(1270, 104);
+			directorySelectControl.TabIndex = 5;
 			// 
 			// DirectoryOrCustomSelectControl
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.directorySelectControl);
-			this.Controls.Add(this.customBtn);
-			this.Controls.Add(this.customTb);
-			this.Controls.Add(this.customDirectoryRb);
-			this.Controls.Add(this.knownDirectoryRb);
-			this.Name = "DirectoryOrCustomSelectControl";
-			this.Size = new System.Drawing.Size(660, 87);
-			this.Load += new System.EventHandler(this.DirectoryOrCustomSelectControl_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
+			AutoScaleDimensions = new System.Drawing.SizeF(192F, 192F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			Controls.Add(directorySelectControl);
+			Controls.Add(customBtn);
+			Controls.Add(customTb);
+			Controls.Add(customDirectoryRb);
+			Controls.Add(knownDirectoryRb);
+			Margin = new System.Windows.Forms.Padding(6);
+			Name = "DirectoryOrCustomSelectControl";
+			Size = new System.Drawing.Size(1320, 176);
+			Load += DirectoryOrCustomSelectControl_Load;
+			ResumeLayout(false);
+			PerformLayout();
 		}
 
 		#endregion

Source/LibationWinForms/Dialogs/DirectoryOrCustomSelectControl.resx

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

Source/LibationWinForms/Dialogs/DirectorySelectControl.Designer.cs

@@ -29,44 +29,45 @@ namespace LibationWinForms.Dialogs
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.directoryComboBox = new System.Windows.Forms.ComboBox();
-			this.textBox1 = new System.Windows.Forms.TextBox();
-			this.SuspendLayout();
+			directoryComboBox = new System.Windows.Forms.ComboBox();
+			textBox1 = new System.Windows.Forms.TextBox();
+			SuspendLayout();
 			// 
 			// directoryComboBox
 			// 
-			this.directoryComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.directoryComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.directoryComboBox.FormattingEnabled = true;
-			this.directoryComboBox.Location = new System.Drawing.Point(0, 0);
-			this.directoryComboBox.Name = "directoryComboBox";
-			this.directoryComboBox.Size = new System.Drawing.Size(407, 23);
-			this.directoryComboBox.TabIndex = 0;
-			this.directoryComboBox.SelectedIndexChanged += new System.EventHandler(this.directoryComboBox_SelectedIndexChanged);
+			directoryComboBox.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+			directoryComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			directoryComboBox.FormattingEnabled = true;
+			directoryComboBox.Location = new System.Drawing.Point(0, 0);
+			directoryComboBox.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+			directoryComboBox.Name = "directoryComboBox";
+			directoryComboBox.Size = new System.Drawing.Size(810, 40);
+			directoryComboBox.TabIndex = 0;
+			directoryComboBox.SelectedIndexChanged += directoryComboBox_SelectedIndexChanged;
 			// 
 			// textBox1
 			// 
-			this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.textBox1.Location = new System.Drawing.Point(0, 29);
-			this.textBox1.Name = "textBox1";
-			this.textBox1.ReadOnly = true;
-			this.textBox1.Size = new System.Drawing.Size(407, 23);
-			this.textBox1.TabIndex = 1;
+			textBox1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+			textBox1.Location = new System.Drawing.Point(0, 58);
+			textBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+			textBox1.Name = "textBox1";
+			textBox1.ReadOnly = true;
+			textBox1.Size = new System.Drawing.Size(810, 39);
+			textBox1.TabIndex = 1;
 			// 
 			// DirectorySelectControl
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.textBox1);
-			this.Controls.Add(this.directoryComboBox);
-			this.Name = "DirectorySelectControl";
-			this.Size = new System.Drawing.Size(407, 52);
-			this.Load += new System.EventHandler(this.DirectorySelectControl_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
+			AutoScaleDimensions = new System.Drawing.SizeF(192F, 192F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			AutoSize = true;
+			Controls.Add(textBox1);
+			Controls.Add(directoryComboBox);
+			Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+			Name = "DirectorySelectControl";
+			Size = new System.Drawing.Size(814, 104);
+			Load += DirectorySelectControl_Load;
+			ResumeLayout(false);
+			PerformLayout();
 		}
 
 		#endregion

Source/LibationWinForms/Dialogs/DirectorySelectControl.resx

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

Source/LibationWinForms/Dialogs/EditQuickFilters.Designer.cs

@@ -126,8 +126,8 @@
             // EditQuickFilters
             // 
             this.AcceptButton = this.saveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.CancelButton = this.cancelBtn;
             this.ClientSize = new System.Drawing.Size(800, 450);
             this.Controls.Add(this.dataGridView1);

Source/LibationWinForms/Dialogs/EditReplacementChars.Designer.cs

@@ -144,8 +144,8 @@
 			// 
 			// EditReplacementChars
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(522, 467);
 			this.Controls.Add(this.minDefaultBtn);
 			this.Controls.Add(this.loFiDefaultsBtn);

Source/LibationWinForms/Dialogs/EditTemplateDialog.Designer.cs

@@ -160,8 +160,8 @@
 			// EditTemplateDialog
 			// 
 			this.AcceptButton = this.saveBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.CancelButton = this.cancelBtn;
 			this.ClientSize = new System.Drawing.Size(933, 388);
 			this.Controls.Add(this.exampleLbl);

Source/LibationWinForms/Dialogs/LibationFilesDialog.Designer.cs

@@ -28,74 +28,74 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.libationFilesDescLbl = new System.Windows.Forms.Label();
-			this.cancelBtn = new System.Windows.Forms.Button();
-			this.saveBtn = new System.Windows.Forms.Button();
-			this.libationFilesSelectControl = new LibationWinForms.Dialogs.DirectoryOrCustomSelectControl();
-			this.SuspendLayout();
+			libationFilesDescLbl = new System.Windows.Forms.Label();
+			cancelBtn = new System.Windows.Forms.Button();
+			saveBtn = new System.Windows.Forms.Button();
+			libationFilesSelectControl = new DirectoryOrCustomSelectControl();
+			SuspendLayout();
 			// 
 			// libationFilesDescLbl
 			// 
-			this.libationFilesDescLbl.AutoSize = true;
-			this.libationFilesDescLbl.Location = new System.Drawing.Point(14, 10);
-			this.libationFilesDescLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.libationFilesDescLbl.Name = "libationFilesDescLbl";
-			this.libationFilesDescLbl.Size = new System.Drawing.Size(39, 15);
-			this.libationFilesDescLbl.TabIndex = 0;
-			this.libationFilesDescLbl.Text = "[desc]";
+			libationFilesDescLbl.AutoSize = true;
+			libationFilesDescLbl.Location = new System.Drawing.Point(28, 20);
+			libationFilesDescLbl.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+			libationFilesDescLbl.Name = "libationFilesDescLbl";
+			libationFilesDescLbl.Size = new System.Drawing.Size(76, 32);
+			libationFilesDescLbl.TabIndex = 0;
+			libationFilesDescLbl.Text = "[desc]";
 			// 
 			// cancelBtn
 			// 
-			this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cancelBtn.Location = new System.Drawing.Point(832, 118);
-			this.cancelBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.cancelBtn.Name = "cancelBtn";
-			this.cancelBtn.Size = new System.Drawing.Size(88, 27);
-			this.cancelBtn.TabIndex = 3;
-			this.cancelBtn.Text = "Cancel";
-			this.cancelBtn.UseVisualStyleBackColor = true;
-			this.cancelBtn.Click += new System.EventHandler(this.cancelBtn_Click);
+			cancelBtn.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
+			cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			cancelBtn.Location = new System.Drawing.Point(1664, 236);
+			cancelBtn.Margin = new System.Windows.Forms.Padding(8, 6, 8, 6);
+			cancelBtn.Name = "cancelBtn";
+			cancelBtn.Size = new System.Drawing.Size(176, 54);
+			cancelBtn.TabIndex = 3;
+			cancelBtn.Text = "Cancel";
+			cancelBtn.UseVisualStyleBackColor = true;
+			cancelBtn.Click += cancelBtn_Click;
 			// 
 			// saveBtn
 			// 
-			this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.saveBtn.Location = new System.Drawing.Point(714, 118);
-			this.saveBtn.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.saveBtn.Name = "saveBtn";
-			this.saveBtn.Size = new System.Drawing.Size(88, 27);
-			this.saveBtn.TabIndex = 2;
-			this.saveBtn.Text = "Save";
-			this.saveBtn.UseVisualStyleBackColor = true;
-			this.saveBtn.Click += new System.EventHandler(this.saveBtn_Click);
+			saveBtn.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
+			saveBtn.Location = new System.Drawing.Point(1428, 236);
+			saveBtn.Margin = new System.Windows.Forms.Padding(8, 6, 8, 6);
+			saveBtn.Name = "saveBtn";
+			saveBtn.Size = new System.Drawing.Size(176, 54);
+			saveBtn.TabIndex = 2;
+			saveBtn.Text = "Save";
+			saveBtn.UseVisualStyleBackColor = true;
+			saveBtn.Click += saveBtn_Click;
 			// 
 			// libationFilesSelectControl
 			// 
-			this.libationFilesSelectControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.libationFilesSelectControl.Location = new System.Drawing.Point(14, 28);
-			this.libationFilesSelectControl.Name = "libationFilesSelectControl";
-			this.libationFilesSelectControl.Size = new System.Drawing.Size(909, 87);
-			this.libationFilesSelectControl.TabIndex = 1;
+			libationFilesSelectControl.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+			libationFilesSelectControl.Location = new System.Drawing.Point(28, 56);
+			libationFilesSelectControl.Margin = new System.Windows.Forms.Padding(12);
+			libationFilesSelectControl.Name = "libationFilesSelectControl";
+			libationFilesSelectControl.Size = new System.Drawing.Size(1818, 176);
+			libationFilesSelectControl.TabIndex = 1;
 			// 
 			// LibationFilesDialog
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(933, 164);
-			this.Controls.Add(this.libationFilesSelectControl);
-			this.Controls.Add(this.cancelBtn);
-			this.Controls.Add(this.saveBtn);
-			this.Controls.Add(this.libationFilesDescLbl);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.Name = "LibationFilesDialog";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-			this.Text = "Libation Files location";
-			this.Load += new System.EventHandler(this.LibationFilesDialog_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
+			AutoScaleDimensions = new System.Drawing.SizeF(192F, 192F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+			AutoSize = true;
+			ClientSize = new System.Drawing.Size(1866, 328);
+			Controls.Add(libationFilesSelectControl);
+			Controls.Add(cancelBtn);
+			Controls.Add(saveBtn);
+			Controls.Add(libationFilesDescLbl);
+			FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+			Margin = new System.Windows.Forms.Padding(8, 6, 8, 6);
+			Name = "LibationFilesDialog";
+			StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+			Text = "Libation Files location";
+			Load += LibationFilesDialog_Load;
+			ResumeLayout(false);
+			PerformLayout();
 		}
 
 		#endregion

Source/LibationWinForms/Dialogs/LibationFilesDialog.resx

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

Source/LibationWinForms/Dialogs/LiberatedStatusBatchAutoDialog.Designer.cs

@@ -78,8 +78,8 @@
             // LiberatedStatusBatchAutoDialog
             // 
             this.AcceptButton = this.okBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.CancelButton = this.cancelBtn;
             this.ClientSize = new System.Drawing.Size(564, 118);
             this.Controls.Add(this.cancelBtn);

Source/LibationWinForms/Dialogs/LiberatedStatusBatchManualDialog.Designer.cs

@@ -88,8 +88,8 @@
             // LiberatedStatusBatchManualDialog
             // 
             this.AcceptButton = this.saveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.CancelButton = this.cancelBtn;
             this.ClientSize = new System.Drawing.Size(564, 118);
             this.Controls.Add(this.cancelBtn);

Source/LibationWinForms/Dialogs/LocateAudiobooksDialog.Designer.cs

@@ -82,8 +82,8 @@
 			// 
 			// LocateAudiobooksDialog
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(345, 306);
 			this.Controls.Add(this.booksFoundLbl);
 			this.Controls.Add(this.foundAudiobooksLV);

Source/LibationWinForms/Dialogs/Login/ApprovalNeededDialog.Designer.cs

@@ -58,8 +58,8 @@
 			// ApprovalNeededDialog
 			// 
 			this.AcceptButton = this.approvedBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(345, 115);
 			this.Controls.Add(this.label1);
 			this.Controls.Add(this.approvedBtn);

Source/LibationWinForms/Dialogs/Login/CaptchaDialog.Designer.cs

@@ -97,8 +97,8 @@
 			// CaptchaDialog
 			// 
 			AcceptButton = submitBtn;
-			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			ClientSize = new System.Drawing.Size(261, 210);
 			Controls.Add(passwordTb);
 			Controls.Add(label1);

Source/LibationWinForms/Dialogs/Login/LoginCallbackDialog.Designer.cs

@@ -89,8 +89,8 @@
 			// LoginCallbackDialog
 			// 
 			this.AcceptButton = this.submitBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(330, 114);
 			this.Controls.Add(this.usernameLbl);
 			this.Controls.Add(this.localeLbl);

Source/LibationWinForms/Dialogs/Login/LoginChoiceEagerDialog.Designer.cs

@@ -121,8 +121,8 @@
 			// LoginChoiceEagerDialog
 			// 
 			AcceptButton = submitBtn;
-			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			ClientSize = new System.Drawing.Size(394, 216);
 			Controls.Add(externalLoginLbl2);
 			Controls.Add(externalLoginLbl1);

Source/LibationWinForms/Dialogs/Login/LoginExternalDialog.Designer.cs

@@ -151,8 +151,8 @@
             // LoginExternalDialog
             // 
             this.AcceptButton = this.submitBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.ClientSize = new System.Drawing.Size(766, 498);
             this.Controls.Add(this.tldrLbl);
             this.Controls.Add(this.responseUrlTb);

Source/LibationWinForms/Dialogs/Login/MfaDialog.Designer.cs

@@ -84,8 +84,8 @@ namespace LibationWinForms.Dialogs.Login
 			// MfaDialog
 			// 
 			this.AcceptButton = this.submitBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(398, 129);
 			this.Controls.Add(this.radioButton3);
 			this.Controls.Add(this.radioButton2);

Source/LibationWinForms/Dialogs/Login/WebLoginDialog.Designer.cs

@@ -32,8 +32,8 @@
 			// 
 			// WebLoginDialog
 			// 
-			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			ClientSize = new System.Drawing.Size(484, 761);
 			Name = "WebLoginDialog";
 			StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

Source/LibationWinForms/Dialogs/Login/_2faCodeDialog.Designer.cs

@@ -76,8 +76,8 @@
 			// _2faCodeDialog
 			// 
 			AcceptButton = submitBtn;
-			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			ClientSize = new System.Drawing.Size(222, 147);
 			Controls.Add(promptLbl);
 			Controls.Add(label1);

Source/LibationWinForms/Dialogs/MessageBoxAlertAdminDialog.Designer.cs

@@ -118,8 +118,8 @@ namespace LibationWinForms.Dialogs
 			// MessageBoxAlertAdminDialog
 			// 
 			this.AcceptButton = this.okBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(584, 382);
 			this.Controls.Add(this.exceptionTb);
 			this.Controls.Add(this.logsLink);

Source/LibationWinForms/Dialogs/ScanAccountsDialog.Designer.cs

@@ -93,8 +93,8 @@
 			// ScanAccountsDialog
 			// 
 			this.AcceptButton = this.importBtn;
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.CancelButton = this.cancelBtn;
 			this.ClientSize = new System.Drawing.Size(584, 160);
 			this.Controls.Add(this.editBtn);

Source/LibationWinForms/Dialogs/SearchSyntaxDialog.Designer.cs

@@ -103,8 +103,8 @@
 			// SearchSyntaxDialog
 			// 
 			AcceptButton = closeBtn;
-			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			CancelButton = closeBtn;
 			ClientSize = new System.Drawing.Size(1140, 577);
 			Controls.Add(closeBtn);

Source/LibationWinForms/Dialogs/SettingsDialog.Designer.cs

@@ -148,8 +148,8 @@
 			// booksLocationDescLbl
 			// 
 			booksLocationDescLbl.AutoSize = true;
-			booksLocationDescLbl.Location = new System.Drawing.Point(13, 41);
-			booksLocationDescLbl.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+			booksLocationDescLbl.Location = new System.Drawing.Point(14, 38);
+			booksLocationDescLbl.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
 			booksLocationDescLbl.Name = "booksLocationDescLbl";
 			booksLocationDescLbl.Size = new System.Drawing.Size(137, 32);
 			booksLocationDescLbl.TabIndex = 1;
@@ -158,8 +158,8 @@
 			// inProgressDescLbl
 			// 
 			inProgressDescLbl.AutoSize = true;
-			inProgressDescLbl.Location = new System.Drawing.Point(13, 41);
-			inProgressDescLbl.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+			inProgressDescLbl.Location = new System.Drawing.Point(14, 38);
+			inProgressDescLbl.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
 			inProgressDescLbl.Name = "inProgressDescLbl";
 			inProgressDescLbl.Size = new System.Drawing.Size(201, 96);
 			inProgressDescLbl.TabIndex = 18;
@@ -168,10 +168,10 @@
 			// saveBtn
 			// 
 			saveBtn.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
-			saveBtn.Location = new System.Drawing.Point(1239, 1047);
-			saveBtn.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+			saveBtn.Location = new System.Drawing.Point(1334, 982);
+			saveBtn.Margin = new System.Windows.Forms.Padding(8, 6, 8, 6);
 			saveBtn.Name = "saveBtn";
-			saveBtn.Size = new System.Drawing.Size(163, 58);
+			saveBtn.Size = new System.Drawing.Size(176, 54);
 			saveBtn.TabIndex = 98;
 			saveBtn.Text = "Save";
 			saveBtn.UseVisualStyleBackColor = true;
@@ -181,10 +181,10 @@
 			// 
 			cancelBtn.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
 			cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			cancelBtn.Location = new System.Drawing.Point(1458, 1047);
-			cancelBtn.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+			cancelBtn.Location = new System.Drawing.Point(1570, 982);
+			cancelBtn.Margin = new System.Windows.Forms.Padding(8, 6, 8, 6);
 			cancelBtn.Name = "cancelBtn";
-			cancelBtn.Size = new System.Drawing.Size(163, 58);
+			cancelBtn.Size = new System.Drawing.Size(176, 54);
 			cancelBtn.TabIndex = 99;
 			cancelBtn.Text = "Cancel";
 			cancelBtn.UseVisualStyleBackColor = true;
@@ -193,7 +193,7 @@
 			// importEpisodesCb
 			// 
 			importEpisodesCb.AutoSize = true;
-			importEpisodesCb.Location = new System.Drawing.Point(11, 119);
+			importEpisodesCb.Location = new System.Drawing.Point(12, 112);
 			importEpisodesCb.Margin = new System.Windows.Forms.Padding(6);
 			importEpisodesCb.Name = "importEpisodesCb";
 			importEpisodesCb.Size = new System.Drawing.Size(287, 36);
@@ -204,7 +204,7 @@
 			// downloadEpisodesCb
 			// 
 			downloadEpisodesCb.AutoSize = true;
-			downloadEpisodesCb.Location = new System.Drawing.Point(11, 173);
+			downloadEpisodesCb.Location = new System.Drawing.Point(12, 162);
 			downloadEpisodesCb.Margin = new System.Windows.Forms.Padding(6);
 			downloadEpisodesCb.Name = "downloadEpisodesCb";
 			downloadEpisodesCb.Size = new System.Drawing.Size(321, 36);
@@ -219,11 +219,11 @@
 			badBookGb.Controls.Add(badBookRetryRb);
 			badBookGb.Controls.Add(badBookAbortRb);
 			badBookGb.Controls.Add(badBookAskRb);
-			badBookGb.Location = new System.Drawing.Point(13, 13);
+			badBookGb.Location = new System.Drawing.Point(14, 12);
 			badBookGb.Margin = new System.Windows.Forms.Padding(6);
 			badBookGb.Name = "badBookGb";
 			badBookGb.Padding = new System.Windows.Forms.Padding(6);
-			badBookGb.Size = new System.Drawing.Size(1549, 162);
+			badBookGb.Size = new System.Drawing.Size(1668, 152);
 			badBookGb.TabIndex = 13;
 			badBookGb.TabStop = false;
 			badBookGb.Text = "[bad book desc]";
@@ -231,7 +231,7 @@
 			// badBookIgnoreRb
 			// 
 			badBookIgnoreRb.AutoSize = true;
-			badBookIgnoreRb.Location = new System.Drawing.Point(713, 100);
+			badBookIgnoreRb.Location = new System.Drawing.Point(768, 94);
 			badBookIgnoreRb.Margin = new System.Windows.Forms.Padding(6);
 			badBookIgnoreRb.Name = "badBookIgnoreRb";
 			badBookIgnoreRb.Size = new System.Drawing.Size(183, 36);
@@ -243,7 +243,7 @@
 			// badBookRetryRb
 			// 
 			badBookRetryRb.AutoSize = true;
-			badBookRetryRb.Location = new System.Drawing.Point(9, 100);
+			badBookRetryRb.Location = new System.Drawing.Point(10, 94);
 			badBookRetryRb.Margin = new System.Windows.Forms.Padding(6);
 			badBookRetryRb.Name = "badBookRetryRb";
 			badBookRetryRb.Size = new System.Drawing.Size(163, 36);
@@ -255,7 +255,7 @@
 			// badBookAbortRb
 			// 
 			badBookAbortRb.AutoSize = true;
-			badBookAbortRb.Location = new System.Drawing.Point(713, 47);
+			badBookAbortRb.Location = new System.Drawing.Point(768, 44);
 			badBookAbortRb.Margin = new System.Windows.Forms.Padding(6);
 			badBookAbortRb.Name = "badBookAbortRb";
 			badBookAbortRb.Size = new System.Drawing.Size(170, 36);
@@ -267,7 +267,7 @@
 			// badBookAskRb
 			// 
 			badBookAskRb.AutoSize = true;
-			badBookAskRb.Location = new System.Drawing.Point(11, 47);
+			badBookAskRb.Location = new System.Drawing.Point(12, 44);
 			badBookAskRb.Margin = new System.Windows.Forms.Padding(6);
 			badBookAskRb.Name = "badBookAskRb";
 			badBookAskRb.Size = new System.Drawing.Size(148, 36);
@@ -279,7 +279,7 @@
 			// stripAudibleBrandingCbox
 			// 
 			stripAudibleBrandingCbox.AutoSize = true;
-			stripAudibleBrandingCbox.Location = new System.Drawing.Point(24, 154);
+			stripAudibleBrandingCbox.Location = new System.Drawing.Point(26, 144);
 			stripAudibleBrandingCbox.Margin = new System.Windows.Forms.Padding(6);
 			stripAudibleBrandingCbox.Name = "stripAudibleBrandingCbox";
 			stripAudibleBrandingCbox.Size = new System.Drawing.Size(279, 68);
@@ -290,7 +290,7 @@
 			// splitFilesByChapterCbox
 			// 
 			splitFilesByChapterCbox.AutoSize = true;
-			splitFilesByChapterCbox.Location = new System.Drawing.Point(24, 47);
+			splitFilesByChapterCbox.Location = new System.Drawing.Point(26, 44);
 			splitFilesByChapterCbox.Margin = new System.Windows.Forms.Padding(6);
 			splitFilesByChapterCbox.Name = "splitFilesByChapterCbox";
 			splitFilesByChapterCbox.Size = new System.Drawing.Size(319, 36);
@@ -304,7 +304,7 @@
 			allowLibationFixupCbox.AutoSize = true;
 			allowLibationFixupCbox.Checked = true;
 			allowLibationFixupCbox.CheckState = System.Windows.Forms.CheckState.Checked;
-			allowLibationFixupCbox.Location = new System.Drawing.Point(35, 336);
+			allowLibationFixupCbox.Location = new System.Drawing.Point(38, 316);
 			allowLibationFixupCbox.Margin = new System.Windows.Forms.Padding(6);
 			allowLibationFixupCbox.Name = "allowLibationFixupCbox";
 			allowLibationFixupCbox.Size = new System.Drawing.Size(315, 36);
@@ -316,7 +316,7 @@
 			// convertLossyRb
 			// 
 			convertLossyRb.AutoSize = true;
-			convertLossyRb.Location = new System.Drawing.Point(24, 337);
+			convertLossyRb.Location = new System.Drawing.Point(26, 316);
 			convertLossyRb.Margin = new System.Windows.Forms.Padding(6);
 			convertLossyRb.Name = "convertLossyRb";
 			convertLossyRb.Size = new System.Drawing.Size(659, 36);
@@ -329,7 +329,7 @@
 			// 
 			convertLosslessRb.AutoSize = true;
 			convertLosslessRb.Checked = true;
-			convertLosslessRb.Location = new System.Drawing.Point(24, 237);
+			convertLosslessRb.Location = new System.Drawing.Point(26, 222);
 			convertLosslessRb.Margin = new System.Windows.Forms.Padding(6);
 			convertLosslessRb.Name = "convertLosslessRb";
 			convertLosslessRb.Size = new System.Drawing.Size(670, 36);
@@ -342,18 +342,19 @@
 			// inProgressSelectControl
 			// 
 			inProgressSelectControl.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
-			inProgressSelectControl.Location = new System.Drawing.Point(13, 145);
-			inProgressSelectControl.Margin = new System.Windows.Forms.Padding(6, 9, 6, 9);
+			inProgressSelectControl.AutoSize = true;
+			inProgressSelectControl.Location = new System.Drawing.Point(14, 136);
+			inProgressSelectControl.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
 			inProgressSelectControl.Name = "inProgressSelectControl";
-			inProgressSelectControl.Size = new System.Drawing.Size(1538, 111);
+			inProgressSelectControl.Size = new System.Drawing.Size(1656, 103);
 			inProgressSelectControl.TabIndex = 19;
 			// 
 			// logsBtn
 			// 
-			logsBtn.Location = new System.Drawing.Point(475, 557);
+			logsBtn.Location = new System.Drawing.Point(512, 522);
 			logsBtn.Margin = new System.Windows.Forms.Padding(6);
 			logsBtn.Name = "logsBtn";
-			logsBtn.Size = new System.Drawing.Size(245, 49);
+			logsBtn.Size = new System.Drawing.Size(264, 46);
 			logsBtn.TabIndex = 5;
 			logsBtn.Text = "Open log folder";
 			logsBtn.UseVisualStyleBackColor = true;
@@ -362,16 +363,16 @@
 			// booksSelectControl
 			// 
 			booksSelectControl.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
-			booksSelectControl.Location = new System.Drawing.Point(13, 79);
-			booksSelectControl.Margin = new System.Windows.Forms.Padding(6, 9, 6, 9);
+			booksSelectControl.Location = new System.Drawing.Point(14, 46);
+			booksSelectControl.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
 			booksSelectControl.Name = "booksSelectControl";
-			booksSelectControl.Size = new System.Drawing.Size(1540, 186);
+			booksSelectControl.Size = new System.Drawing.Size(1658, 204);
 			booksSelectControl.TabIndex = 2;
 			// 
 			// loggingLevelLbl
 			// 
 			loggingLevelLbl.AutoSize = true;
-			loggingLevelLbl.Location = new System.Drawing.Point(11, 563);
+			loggingLevelLbl.Location = new System.Drawing.Point(12, 528);
 			loggingLevelLbl.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			loggingLevelLbl.Name = "loggingLevelLbl";
 			loggingLevelLbl.Size = new System.Drawing.Size(158, 32);
@@ -382,10 +383,10 @@
 			// 
 			loggingLevelCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			loggingLevelCb.FormattingEnabled = true;
-			loggingLevelCb.Location = new System.Drawing.Point(167, 557);
+			loggingLevelCb.Location = new System.Drawing.Point(180, 522);
 			loggingLevelCb.Margin = new System.Windows.Forms.Padding(6);
 			loggingLevelCb.Name = "loggingLevelCb";
-			loggingLevelCb.Size = new System.Drawing.Size(236, 40);
+			loggingLevelCb.Size = new System.Drawing.Size(254, 40);
 			loggingLevelCb.TabIndex = 4;
 			// 
 			// tabControl
@@ -395,11 +396,11 @@
 			tabControl.Controls.Add(tab2ImportLibrary);
 			tabControl.Controls.Add(tab3DownloadDecrypt);
 			tabControl.Controls.Add(tab4AudioFileOptions);
-			tabControl.Location = new System.Drawing.Point(22, 26);
+			tabControl.Location = new System.Drawing.Point(24, 24);
 			tabControl.Margin = new System.Windows.Forms.Padding(6);
 			tabControl.Name = "tabControl";
 			tabControl.SelectedIndex = 0;
-			tabControl.Size = new System.Drawing.Size(1601, 1009);
+			tabControl.Size = new System.Drawing.Size(1724, 946);
 			tabControl.TabIndex = 100;
 			// 
 			// tab1ImportantSettings
@@ -413,7 +414,7 @@
 			tab1ImportantSettings.Margin = new System.Windows.Forms.Padding(6);
 			tab1ImportantSettings.Name = "tab1ImportantSettings";
 			tab1ImportantSettings.Padding = new System.Windows.Forms.Padding(6);
-			tab1ImportantSettings.Size = new System.Drawing.Size(1585, 955);
+			tab1ImportantSettings.Size = new System.Drawing.Size(1708, 892);
 			tab1ImportantSettings.TabIndex = 0;
 			tab1ImportantSettings.Text = "Important settings";
 			tab1ImportantSettings.UseVisualStyleBackColor = true;
@@ -423,7 +424,7 @@
 			betaOptInCbox.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
 			betaOptInCbox.AutoSize = true;
 			betaOptInCbox.Enabled = false;
-			betaOptInCbox.Location = new System.Drawing.Point(24, 856);
+			betaOptInCbox.Location = new System.Drawing.Point(26, 828);
 			betaOptInCbox.Margin = new System.Windows.Forms.Padding(6);
 			betaOptInCbox.Name = "betaOptInCbox";
 			betaOptInCbox.Size = new System.Drawing.Size(210, 36);
@@ -442,11 +443,11 @@
 			booksGb.Controls.Add(saveEpisodesToSeriesFolderCbox);
 			booksGb.Controls.Add(booksSelectControl);
 			booksGb.Controls.Add(booksLocationDescLbl);
-			booksGb.Location = new System.Drawing.Point(11, 13);
+			booksGb.Location = new System.Drawing.Point(12, 12);
 			booksGb.Margin = new System.Windows.Forms.Padding(6);
 			booksGb.Name = "booksGb";
 			booksGb.Padding = new System.Windows.Forms.Padding(6);
-			booksGb.Size = new System.Drawing.Size(1564, 531);
+			booksGb.Size = new System.Drawing.Size(1684, 498);
 			booksGb.TabIndex = 0;
 			booksGb.TabStop = false;
 			booksGb.Text = "Books location";
@@ -455,27 +456,27 @@
 			// 
 			lastWriteTimeCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			lastWriteTimeCb.FormattingEnabled = true;
-			lastWriteTimeCb.Location = new System.Drawing.Point(391, 457);
+			lastWriteTimeCb.Location = new System.Drawing.Point(422, 428);
 			lastWriteTimeCb.Margin = new System.Windows.Forms.Padding(6);
 			lastWriteTimeCb.Name = "lastWriteTimeCb";
-			lastWriteTimeCb.Size = new System.Drawing.Size(502, 40);
+			lastWriteTimeCb.Size = new System.Drawing.Size(540, 40);
 			lastWriteTimeCb.TabIndex = 5;
 			// 
 			// creationTimeCb
 			// 
 			creationTimeCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			creationTimeCb.FormattingEnabled = true;
-			creationTimeCb.Location = new System.Drawing.Point(391, 395);
+			creationTimeCb.Location = new System.Drawing.Point(422, 370);
 			creationTimeCb.Margin = new System.Windows.Forms.Padding(6);
 			creationTimeCb.Name = "creationTimeCb";
-			creationTimeCb.Size = new System.Drawing.Size(502, 40);
+			creationTimeCb.Size = new System.Drawing.Size(540, 40);
 			creationTimeCb.TabIndex = 5;
 			// 
 			// lastWriteTimeLbl
 			// 
 			lastWriteTimeLbl.AutoSize = true;
-			lastWriteTimeLbl.Location = new System.Drawing.Point(13, 463);
-			lastWriteTimeLbl.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+			lastWriteTimeLbl.Location = new System.Drawing.Point(14, 434);
+			lastWriteTimeLbl.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
 			lastWriteTimeLbl.Name = "lastWriteTimeLbl";
 			lastWriteTimeLbl.Size = new System.Drawing.Size(233, 32);
 			lastWriteTimeLbl.TabIndex = 4;
@@ -484,8 +485,8 @@
 			// creationTimeLbl
 			// 
 			creationTimeLbl.AutoSize = true;
-			creationTimeLbl.Location = new System.Drawing.Point(13, 401);
-			creationTimeLbl.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
+			creationTimeLbl.Location = new System.Drawing.Point(14, 376);
+			creationTimeLbl.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
 			creationTimeLbl.Name = "creationTimeLbl";
 			creationTimeLbl.Size = new System.Drawing.Size(224, 32);
 			creationTimeLbl.TabIndex = 4;
@@ -494,7 +495,7 @@
 			// overwriteExistingCbox
 			// 
 			overwriteExistingCbox.AutoSize = true;
-			overwriteExistingCbox.Location = new System.Drawing.Point(13, 333);
+			overwriteExistingCbox.Location = new System.Drawing.Point(14, 312);
 			overwriteExistingCbox.Margin = new System.Windows.Forms.Padding(6);
 			overwriteExistingCbox.Name = "overwriteExistingCbox";
 			overwriteExistingCbox.Size = new System.Drawing.Size(251, 36);
@@ -505,7 +506,7 @@
 			// saveEpisodesToSeriesFolderCbox
 			// 
 			saveEpisodesToSeriesFolderCbox.AutoSize = true;
-			saveEpisodesToSeriesFolderCbox.Location = new System.Drawing.Point(13, 279);
+			saveEpisodesToSeriesFolderCbox.Location = new System.Drawing.Point(14, 262);
 			saveEpisodesToSeriesFolderCbox.Margin = new System.Windows.Forms.Padding(6);
 			saveEpisodesToSeriesFolderCbox.Name = "saveEpisodesToSeriesFolderCbox";
 			saveEpisodesToSeriesFolderCbox.Size = new System.Drawing.Size(386, 36);
@@ -524,7 +525,7 @@
 			tab2ImportLibrary.Margin = new System.Windows.Forms.Padding(6);
 			tab2ImportLibrary.Name = "tab2ImportLibrary";
 			tab2ImportLibrary.Padding = new System.Windows.Forms.Padding(6);
-			tab2ImportLibrary.Size = new System.Drawing.Size(1585, 955);
+			tab2ImportLibrary.Size = new System.Drawing.Size(1708, 892);
 			tab2ImportLibrary.TabIndex = 1;
 			tab2ImportLibrary.Text = "Import library";
 			tab2ImportLibrary.UseVisualStyleBackColor = true;
@@ -532,7 +533,7 @@
 			// autoDownloadEpisodesCb
 			// 
 			autoDownloadEpisodesCb.AutoSize = true;
-			autoDownloadEpisodesCb.Location = new System.Drawing.Point(11, 226);
+			autoDownloadEpisodesCb.Location = new System.Drawing.Point(12, 212);
 			autoDownloadEpisodesCb.Margin = new System.Windows.Forms.Padding(6);
 			autoDownloadEpisodesCb.Name = "autoDownloadEpisodesCb";
 			autoDownloadEpisodesCb.Size = new System.Drawing.Size(376, 36);
@@ -543,7 +544,7 @@
 			// autoScanCb
 			// 
 			autoScanCb.AutoSize = true;
-			autoScanCb.Location = new System.Drawing.Point(11, 13);
+			autoScanCb.Location = new System.Drawing.Point(12, 12);
 			autoScanCb.Margin = new System.Windows.Forms.Padding(6);
 			autoScanCb.Name = "autoScanCb";
 			autoScanCb.Size = new System.Drawing.Size(217, 36);
@@ -554,7 +555,7 @@
 			// showImportedStatsCb
 			// 
 			showImportedStatsCb.AutoSize = true;
-			showImportedStatsCb.Location = new System.Drawing.Point(11, 66);
+			showImportedStatsCb.Location = new System.Drawing.Point(12, 62);
 			showImportedStatsCb.Margin = new System.Windows.Forms.Padding(6);
 			showImportedStatsCb.Name = "showImportedStatsCb";
 			showImportedStatsCb.Size = new System.Drawing.Size(330, 36);
@@ -572,7 +573,7 @@
 			tab3DownloadDecrypt.Margin = new System.Windows.Forms.Padding(6);
 			tab3DownloadDecrypt.Name = "tab3DownloadDecrypt";
 			tab3DownloadDecrypt.Padding = new System.Windows.Forms.Padding(6);
-			tab3DownloadDecrypt.Size = new System.Drawing.Size(1585, 955);
+			tab3DownloadDecrypt.Size = new System.Drawing.Size(1708, 892);
 			tab3DownloadDecrypt.TabIndex = 2;
 			tab3DownloadDecrypt.Text = "Download/Decrypt";
 			tab3DownloadDecrypt.UseVisualStyleBackColor = true;
@@ -580,7 +581,7 @@
 			// useCoverAsFolderIconCb
 			// 
 			useCoverAsFolderIconCb.AutoSize = true;
-			useCoverAsFolderIconCb.Location = new System.Drawing.Point(13, 885);
+			useCoverAsFolderIconCb.Location = new System.Drawing.Point(14, 830);
 			useCoverAsFolderIconCb.Margin = new System.Windows.Forms.Padding(6);
 			useCoverAsFolderIconCb.Name = "useCoverAsFolderIconCb";
 			useCoverAsFolderIconCb.Size = new System.Drawing.Size(353, 36);
@@ -593,11 +594,11 @@
 			inProgressFilesGb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
 			inProgressFilesGb.Controls.Add(inProgressDescLbl);
 			inProgressFilesGb.Controls.Add(inProgressSelectControl);
-			inProgressFilesGb.Location = new System.Drawing.Point(11, 599);
+			inProgressFilesGb.Location = new System.Drawing.Point(12, 562);
 			inProgressFilesGb.Margin = new System.Windows.Forms.Padding(6);
 			inProgressFilesGb.Name = "inProgressFilesGb";
 			inProgressFilesGb.Padding = new System.Windows.Forms.Padding(6);
-			inProgressFilesGb.Size = new System.Drawing.Size(1562, 273);
+			inProgressFilesGb.Size = new System.Drawing.Size(1682, 256);
 			inProgressFilesGb.TabIndex = 21;
 			inProgressFilesGb.TabStop = false;
 			inProgressFilesGb.Text = "In progress files";
@@ -615,11 +616,11 @@
 			customFileNamingGb.Controls.Add(folderTemplateBtn);
 			customFileNamingGb.Controls.Add(folderTemplateTb);
 			customFileNamingGb.Controls.Add(folderTemplateLbl);
-			customFileNamingGb.Location = new System.Drawing.Point(13, 188);
+			customFileNamingGb.Location = new System.Drawing.Point(14, 176);
 			customFileNamingGb.Margin = new System.Windows.Forms.Padding(6);
 			customFileNamingGb.Name = "customFileNamingGb";
 			customFileNamingGb.Padding = new System.Windows.Forms.Padding(6);
-			customFileNamingGb.Size = new System.Drawing.Size(1562, 399);
+			customFileNamingGb.Size = new System.Drawing.Size(1682, 374);
 			customFileNamingGb.TabIndex = 20;
 			customFileNamingGb.TabStop = false;
 			customFileNamingGb.Text = "Custom file naming";
@@ -627,10 +628,10 @@
 			// editCharreplacementBtn
 			// 
 			editCharreplacementBtn.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
-			editCharreplacementBtn.Location = new System.Drawing.Point(9, 337);
+			editCharreplacementBtn.Location = new System.Drawing.Point(10, 316);
 			editCharreplacementBtn.Margin = new System.Windows.Forms.Padding(6);
 			editCharreplacementBtn.Name = "editCharreplacementBtn";
-			editCharreplacementBtn.Size = new System.Drawing.Size(522, 49);
+			editCharreplacementBtn.Size = new System.Drawing.Size(562, 46);
 			editCharreplacementBtn.TabIndex = 8;
 			editCharreplacementBtn.Text = "[edit char replacement desc]";
 			editCharreplacementBtn.UseVisualStyleBackColor = true;
@@ -639,10 +640,10 @@
 			// chapterFileTemplateBtn
 			// 
 			chapterFileTemplateBtn.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-			chapterFileTemplateBtn.Location = new System.Drawing.Point(1413, 265);
+			chapterFileTemplateBtn.Location = new System.Drawing.Point(1522, 248);
 			chapterFileTemplateBtn.Margin = new System.Windows.Forms.Padding(6);
 			chapterFileTemplateBtn.Name = "chapterFileTemplateBtn";
-			chapterFileTemplateBtn.Size = new System.Drawing.Size(139, 49);
+			chapterFileTemplateBtn.Size = new System.Drawing.Size(150, 46);
 			chapterFileTemplateBtn.TabIndex = 8;
 			chapterFileTemplateBtn.Text = "Edit...";
 			chapterFileTemplateBtn.UseVisualStyleBackColor = true;
@@ -651,17 +652,17 @@
 			// chapterFileTemplateTb
 			// 
 			chapterFileTemplateTb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
-			chapterFileTemplateTb.Location = new System.Drawing.Point(11, 267);
+			chapterFileTemplateTb.Location = new System.Drawing.Point(12, 250);
 			chapterFileTemplateTb.Margin = new System.Windows.Forms.Padding(6);
 			chapterFileTemplateTb.Name = "chapterFileTemplateTb";
 			chapterFileTemplateTb.ReadOnly = true;
-			chapterFileTemplateTb.Size = new System.Drawing.Size(1388, 39);
+			chapterFileTemplateTb.Size = new System.Drawing.Size(1494, 39);
 			chapterFileTemplateTb.TabIndex = 7;
 			// 
 			// chapterFileTemplateLbl
 			// 
 			chapterFileTemplateLbl.AutoSize = true;
-			chapterFileTemplateLbl.Location = new System.Drawing.Point(11, 228);
+			chapterFileTemplateLbl.Location = new System.Drawing.Point(12, 214);
 			chapterFileTemplateLbl.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			chapterFileTemplateLbl.Name = "chapterFileTemplateLbl";
 			chapterFileTemplateLbl.Size = new System.Drawing.Size(265, 32);
@@ -671,10 +672,10 @@
 			// fileTemplateBtn
 			// 
 			fileTemplateBtn.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-			fileTemplateBtn.Location = new System.Drawing.Point(1413, 171);
+			fileTemplateBtn.Location = new System.Drawing.Point(1522, 160);
 			fileTemplateBtn.Margin = new System.Windows.Forms.Padding(6);
 			fileTemplateBtn.Name = "fileTemplateBtn";
-			fileTemplateBtn.Size = new System.Drawing.Size(139, 49);
+			fileTemplateBtn.Size = new System.Drawing.Size(150, 46);
 			fileTemplateBtn.TabIndex = 5;
 			fileTemplateBtn.Text = "Edit...";
 			fileTemplateBtn.UseVisualStyleBackColor = true;
@@ -683,17 +684,17 @@
 			// fileTemplateTb
 			// 
 			fileTemplateTb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
-			fileTemplateTb.Location = new System.Drawing.Point(11, 173);
+			fileTemplateTb.Location = new System.Drawing.Point(12, 162);
 			fileTemplateTb.Margin = new System.Windows.Forms.Padding(6);
 			fileTemplateTb.Name = "fileTemplateTb";
 			fileTemplateTb.ReadOnly = true;
-			fileTemplateTb.Size = new System.Drawing.Size(1388, 39);
+			fileTemplateTb.Size = new System.Drawing.Size(1494, 39);
 			fileTemplateTb.TabIndex = 4;
 			// 
 			// fileTemplateLbl
 			// 
 			fileTemplateLbl.AutoSize = true;
-			fileTemplateLbl.Location = new System.Drawing.Point(11, 134);
+			fileTemplateLbl.Location = new System.Drawing.Point(12, 126);
 			fileTemplateLbl.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			fileTemplateLbl.Name = "fileTemplateLbl";
 			fileTemplateLbl.Size = new System.Drawing.Size(218, 32);
@@ -703,10 +704,10 @@
 			// folderTemplateBtn
 			// 
 			folderTemplateBtn.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-			folderTemplateBtn.Location = new System.Drawing.Point(1411, 77);
+			folderTemplateBtn.Location = new System.Drawing.Point(1520, 72);
 			folderTemplateBtn.Margin = new System.Windows.Forms.Padding(6);
 			folderTemplateBtn.Name = "folderTemplateBtn";
-			folderTemplateBtn.Size = new System.Drawing.Size(139, 49);
+			folderTemplateBtn.Size = new System.Drawing.Size(150, 46);
 			folderTemplateBtn.TabIndex = 2;
 			folderTemplateBtn.Text = "Edit...";
 			folderTemplateBtn.UseVisualStyleBackColor = true;
@@ -715,17 +716,17 @@
 			// folderTemplateTb
 			// 
 			folderTemplateTb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
-			folderTemplateTb.Location = new System.Drawing.Point(9, 79);
+			folderTemplateTb.Location = new System.Drawing.Point(10, 74);
 			folderTemplateTb.Margin = new System.Windows.Forms.Padding(6);
 			folderTemplateTb.Name = "folderTemplateTb";
 			folderTemplateTb.ReadOnly = true;
-			folderTemplateTb.Size = new System.Drawing.Size(1388, 39);
+			folderTemplateTb.Size = new System.Drawing.Size(1494, 39);
 			folderTemplateTb.TabIndex = 1;
 			// 
 			// folderTemplateLbl
 			// 
 			folderTemplateLbl.AutoSize = true;
-			folderTemplateLbl.Location = new System.Drawing.Point(9, 41);
+			folderTemplateLbl.Location = new System.Drawing.Point(10, 38);
 			folderTemplateLbl.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			folderTemplateLbl.Name = "folderTemplateLbl";
 			folderTemplateLbl.Size = new System.Drawing.Size(248, 32);
@@ -750,7 +751,7 @@
 			tab4AudioFileOptions.Margin = new System.Windows.Forms.Padding(6);
 			tab4AudioFileOptions.Name = "tab4AudioFileOptions";
 			tab4AudioFileOptions.Padding = new System.Windows.Forms.Padding(6);
-			tab4AudioFileOptions.Size = new System.Drawing.Size(1585, 955);
+			tab4AudioFileOptions.Size = new System.Drawing.Size(1708, 892);
 			tab4AudioFileOptions.TabIndex = 3;
 			tab4AudioFileOptions.Text = "Audio File Options";
 			tab4AudioFileOptions.UseVisualStyleBackColor = true;
@@ -759,17 +760,17 @@
 			// 
 			fileDownloadQualityCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			fileDownloadQualityCb.FormattingEnabled = true;
-			fileDownloadQualityCb.Location = new System.Drawing.Point(490, 16);
+			fileDownloadQualityCb.Location = new System.Drawing.Point(528, 16);
 			fileDownloadQualityCb.Margin = new System.Windows.Forms.Padding(6, 6, 10, 6);
 			fileDownloadQualityCb.Name = "fileDownloadQualityCb";
-			fileDownloadQualityCb.Size = new System.Drawing.Size(160, 40);
+			fileDownloadQualityCb.Size = new System.Drawing.Size(172, 40);
 			fileDownloadQualityCb.TabIndex = 23;
 			// 
 			// fileDownloadQualityLbl
 			// 
 			fileDownloadQualityLbl.AutoSize = true;
-			fileDownloadQualityLbl.Location = new System.Drawing.Point(35, 19);
-			fileDownloadQualityLbl.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+			fileDownloadQualityLbl.Location = new System.Drawing.Point(38, 18);
+			fileDownloadQualityLbl.Margin = new System.Windows.Forms.Padding(0, 0, 4, 0);
 			fileDownloadQualityLbl.Name = "fileDownloadQualityLbl";
 			fileDownloadQualityLbl.Size = new System.Drawing.Size(304, 32);
 			fileDownloadQualityLbl.TabIndex = 22;
@@ -779,16 +780,16 @@
 			// 
 			clipsBookmarksFormatCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			clipsBookmarksFormatCb.FormattingEnabled = true;
-			clipsBookmarksFormatCb.Location = new System.Drawing.Point(529, 172);
+			clipsBookmarksFormatCb.Location = new System.Drawing.Point(570, 162);
 			clipsBookmarksFormatCb.Margin = new System.Windows.Forms.Padding(6);
 			clipsBookmarksFormatCb.Name = "clipsBookmarksFormatCb";
-			clipsBookmarksFormatCb.Size = new System.Drawing.Size(121, 40);
+			clipsBookmarksFormatCb.Size = new System.Drawing.Size(130, 40);
 			clipsBookmarksFormatCb.TabIndex = 21;
 			// 
 			// downloadClipsBookmarksCbox
 			// 
 			downloadClipsBookmarksCbox.AutoSize = true;
-			downloadClipsBookmarksCbox.Location = new System.Drawing.Point(35, 176);
+			downloadClipsBookmarksCbox.Location = new System.Drawing.Point(38, 164);
 			downloadClipsBookmarksCbox.Margin = new System.Windows.Forms.Padding(6);
 			downloadClipsBookmarksCbox.Name = "downloadClipsBookmarksCbox";
 			downloadClipsBookmarksCbox.Size = new System.Drawing.Size(492, 36);
@@ -805,11 +806,11 @@
 			audiobookFixupsGb.Controls.Add(convertLosslessRb);
 			audiobookFixupsGb.Controls.Add(convertLossyRb);
 			audiobookFixupsGb.Controls.Add(stripAudibleBrandingCbox);
-			audiobookFixupsGb.Location = new System.Drawing.Point(11, 408);
+			audiobookFixupsGb.Location = new System.Drawing.Point(12, 382);
 			audiobookFixupsGb.Margin = new System.Windows.Forms.Padding(6);
 			audiobookFixupsGb.Name = "audiobookFixupsGb";
 			audiobookFixupsGb.Padding = new System.Windows.Forms.Padding(6);
-			audiobookFixupsGb.Size = new System.Drawing.Size(748, 395);
+			audiobookFixupsGb.Size = new System.Drawing.Size(806, 370);
 			audiobookFixupsGb.TabIndex = 19;
 			audiobookFixupsGb.TabStop = false;
 			audiobookFixupsGb.Text = "Audiobook Fix-ups";
@@ -817,7 +818,7 @@
 			// moveMoovAtomCbox
 			// 
 			moveMoovAtomCbox.AutoSize = true;
-			moveMoovAtomCbox.Location = new System.Drawing.Point(43, 284);
+			moveMoovAtomCbox.Location = new System.Drawing.Point(46, 266);
 			moveMoovAtomCbox.Margin = new System.Windows.Forms.Padding(6);
 			moveMoovAtomCbox.Name = "moveMoovAtomCbox";
 			moveMoovAtomCbox.Size = new System.Drawing.Size(372, 36);
@@ -828,7 +829,7 @@
 			// stripUnabridgedCbox
 			// 
 			stripUnabridgedCbox.AutoSize = true;
-			stripUnabridgedCbox.Location = new System.Drawing.Point(24, 100);
+			stripUnabridgedCbox.Location = new System.Drawing.Point(26, 94);
 			stripUnabridgedCbox.Margin = new System.Windows.Forms.Padding(6);
 			stripUnabridgedCbox.Name = "stripUnabridgedCbox";
 			stripUnabridgedCbox.Size = new System.Drawing.Size(288, 36);
@@ -840,11 +841,11 @@
 			// 
 			chapterTitleTemplateGb.Controls.Add(chapterTitleTemplateBtn);
 			chapterTitleTemplateGb.Controls.Add(chapterTitleTemplateTb);
-			chapterTitleTemplateGb.Location = new System.Drawing.Point(6, 828);
+			chapterTitleTemplateGb.Location = new System.Drawing.Point(6, 776);
 			chapterTitleTemplateGb.Margin = new System.Windows.Forms.Padding(6);
 			chapterTitleTemplateGb.Name = "chapterTitleTemplateGb";
 			chapterTitleTemplateGb.Padding = new System.Windows.Forms.Padding(6);
-			chapterTitleTemplateGb.Size = new System.Drawing.Size(1573, 115);
+			chapterTitleTemplateGb.Size = new System.Drawing.Size(1694, 108);
 			chapterTitleTemplateGb.TabIndex = 18;
 			chapterTitleTemplateGb.TabStop = false;
 			chapterTitleTemplateGb.Text = "[chapter title template desc]";
@@ -852,10 +853,10 @@
 			// chapterTitleTemplateBtn
 			// 
 			chapterTitleTemplateBtn.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-			chapterTitleTemplateBtn.Location = new System.Drawing.Point(1428, 47);
+			chapterTitleTemplateBtn.Location = new System.Drawing.Point(1538, 44);
 			chapterTitleTemplateBtn.Margin = new System.Windows.Forms.Padding(6);
 			chapterTitleTemplateBtn.Name = "chapterTitleTemplateBtn";
-			chapterTitleTemplateBtn.Size = new System.Drawing.Size(139, 49);
+			chapterTitleTemplateBtn.Size = new System.Drawing.Size(150, 46);
 			chapterTitleTemplateBtn.TabIndex = 17;
 			chapterTitleTemplateBtn.Text = "Edit...";
 			chapterTitleTemplateBtn.UseVisualStyleBackColor = true;
@@ -864,11 +865,11 @@
 			// chapterTitleTemplateTb
 			// 
 			chapterTitleTemplateTb.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
-			chapterTitleTemplateTb.Location = new System.Drawing.Point(11, 47);
+			chapterTitleTemplateTb.Location = new System.Drawing.Point(12, 44);
 			chapterTitleTemplateTb.Margin = new System.Windows.Forms.Padding(6);
 			chapterTitleTemplateTb.Name = "chapterTitleTemplateTb";
 			chapterTitleTemplateTb.ReadOnly = true;
-			chapterTitleTemplateTb.Size = new System.Drawing.Size(1402, 39);
+			chapterTitleTemplateTb.Size = new System.Drawing.Size(1510, 39);
 			chapterTitleTemplateTb.TabIndex = 16;
 			// 
 			// lameOptionsGb
@@ -882,11 +883,11 @@
 			lameOptionsGb.Controls.Add(label1);
 			lameOptionsGb.Controls.Add(lameQualityGb);
 			lameOptionsGb.Controls.Add(groupBox2);
-			lameOptionsGb.Location = new System.Drawing.Point(771, 13);
+			lameOptionsGb.Location = new System.Drawing.Point(830, 12);
 			lameOptionsGb.Margin = new System.Windows.Forms.Padding(6);
 			lameOptionsGb.Name = "lameOptionsGb";
 			lameOptionsGb.Padding = new System.Windows.Forms.Padding(6);
-			lameOptionsGb.Size = new System.Drawing.Size(804, 742);
+			lameOptionsGb.Size = new System.Drawing.Size(866, 696);
 			lameOptionsGb.TabIndex = 14;
 			lameOptionsGb.TabStop = false;
 			lameOptionsGb.Text = "Mp3 Encoding Options";
@@ -894,7 +895,7 @@
 			// label20
 			// 
 			label20.AutoSize = true;
-			label20.Location = new System.Drawing.Point(22, 166);
+			label20.Location = new System.Drawing.Point(24, 156);
 			label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label20.Name = "label20";
 			label20.Size = new System.Drawing.Size(204, 32);
@@ -904,7 +905,7 @@
 			// label21
 			// 
 			label21.AutoSize = true;
-			label21.Location = new System.Drawing.Point(444, 166);
+			label21.Location = new System.Drawing.Point(478, 156);
 			label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label21.Name = "label21";
 			label21.Size = new System.Drawing.Size(188, 32);
@@ -915,28 +916,28 @@
 			// 
 			encoderQualityCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			encoderQualityCb.FormattingEnabled = true;
-			encoderQualityCb.Location = new System.Drawing.Point(626, 160);
+			encoderQualityCb.Location = new System.Drawing.Point(674, 150);
 			encoderQualityCb.Margin = new System.Windows.Forms.Padding(6);
 			encoderQualityCb.Name = "encoderQualityCb";
-			encoderQualityCb.Size = new System.Drawing.Size(164, 40);
+			encoderQualityCb.Size = new System.Drawing.Size(176, 40);
 			encoderQualityCb.TabIndex = 2;
 			// 
 			// maxSampleRateCb
 			// 
 			maxSampleRateCb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
 			maxSampleRateCb.FormattingEnabled = true;
-			maxSampleRateCb.Location = new System.Drawing.Point(221, 160);
+			maxSampleRateCb.Location = new System.Drawing.Point(238, 150);
 			maxSampleRateCb.Margin = new System.Windows.Forms.Padding(6);
 			maxSampleRateCb.Name = "maxSampleRateCb";
-			maxSampleRateCb.Size = new System.Drawing.Size(184, 40);
+			maxSampleRateCb.Size = new System.Drawing.Size(198, 40);
 			maxSampleRateCb.TabIndex = 2;
 			// 
 			// lameDownsampleMonoCbox
 			// 
-			lameDownsampleMonoCbox.Location = new System.Drawing.Point(440, 64);
+			lameDownsampleMonoCbox.Location = new System.Drawing.Point(474, 60);
 			lameDownsampleMonoCbox.Margin = new System.Windows.Forms.Padding(6);
 			lameDownsampleMonoCbox.Name = "lameDownsampleMonoCbox";
-			lameDownsampleMonoCbox.Size = new System.Drawing.Size(342, 73);
+			lameDownsampleMonoCbox.Size = new System.Drawing.Size(368, 68);
 			lameDownsampleMonoCbox.TabIndex = 1;
 			lameDownsampleMonoCbox.Text = "Downsample stereo to mono?\r\n(Recommended)\r\n";
 			lameDownsampleMonoCbox.UseVisualStyleBackColor = true;
@@ -952,11 +953,11 @@
 			lameBitrateGb.Controls.Add(label11);
 			lameBitrateGb.Controls.Add(label3);
 			lameBitrateGb.Controls.Add(lameBitrateTb);
-			lameBitrateGb.Location = new System.Drawing.Point(11, 222);
+			lameBitrateGb.Location = new System.Drawing.Point(12, 208);
 			lameBitrateGb.Margin = new System.Windows.Forms.Padding(6);
 			lameBitrateGb.Name = "lameBitrateGb";
 			lameBitrateGb.Padding = new System.Windows.Forms.Padding(6);
-			lameBitrateGb.Size = new System.Drawing.Size(782, 218);
+			lameBitrateGb.Size = new System.Drawing.Size(842, 204);
 			lameBitrateGb.TabIndex = 0;
 			lameBitrateGb.TabStop = false;
 			lameBitrateGb.Text = "Bitrate";
@@ -964,7 +965,7 @@
 			// LameMatchSourceBRCbox
 			// 
 			LameMatchSourceBRCbox.AutoSize = true;
-			LameMatchSourceBRCbox.Location = new System.Drawing.Point(511, 162);
+			LameMatchSourceBRCbox.Location = new System.Drawing.Point(550, 152);
 			LameMatchSourceBRCbox.Margin = new System.Windows.Forms.Padding(6);
 			LameMatchSourceBRCbox.Name = "LameMatchSourceBRCbox";
 			LameMatchSourceBRCbox.Size = new System.Drawing.Size(277, 36);
@@ -976,7 +977,7 @@
 			// lameConstantBitrateCbox
 			// 
 			lameConstantBitrateCbox.AutoSize = true;
-			lameConstantBitrateCbox.Location = new System.Drawing.Point(11, 164);
+			lameConstantBitrateCbox.Location = new System.Drawing.Point(12, 154);
 			lameConstantBitrateCbox.Margin = new System.Windows.Forms.Padding(6);
 			lameConstantBitrateCbox.Name = "lameConstantBitrateCbox";
 			lameConstantBitrateCbox.Size = new System.Drawing.Size(431, 36);
@@ -988,7 +989,7 @@
 			// 
 			label7.AutoSize = true;
 			label7.BackColor = System.Drawing.SystemColors.ControlLightLight;
-			label7.Location = new System.Drawing.Point(724, 111);
+			label7.Location = new System.Drawing.Point(780, 104);
 			label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label7.Name = "label7";
 			label7.Size = new System.Drawing.Size(53, 32);
@@ -999,7 +1000,7 @@
 			// 
 			label6.AutoSize = true;
 			label6.BackColor = System.Drawing.SystemColors.ControlLightLight;
-			label6.Location = new System.Drawing.Point(574, 111);
+			label6.Location = new System.Drawing.Point(618, 104);
 			label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label6.Name = "label6";
 			label6.Size = new System.Drawing.Size(53, 32);
@@ -1010,7 +1011,7 @@
 			// 
 			label5.AutoSize = true;
 			label5.BackColor = System.Drawing.SystemColors.ControlLightLight;
-			label5.Location = new System.Drawing.Point(423, 111);
+			label5.Location = new System.Drawing.Point(456, 104);
 			label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label5.Name = "label5";
 			label5.Size = new System.Drawing.Size(53, 32);
@@ -1021,7 +1022,7 @@
 			// 
 			label4.AutoSize = true;
 			label4.BackColor = System.Drawing.SystemColors.ControlLightLight;
-			label4.Location = new System.Drawing.Point(273, 111);
+			label4.Location = new System.Drawing.Point(294, 104);
 			label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label4.Name = "label4";
 			label4.Size = new System.Drawing.Size(53, 32);
@@ -1032,7 +1033,7 @@
 			// 
 			label11.AutoSize = true;
 			label11.BackColor = System.Drawing.SystemColors.ControlLightLight;
-			label11.Location = new System.Drawing.Point(19, 111);
+			label11.Location = new System.Drawing.Point(20, 104);
 			label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label11.Name = "label11";
 			label11.Size = new System.Drawing.Size(40, 32);
@@ -1043,7 +1044,7 @@
 			// 
 			label3.AutoSize = true;
 			label3.BackColor = System.Drawing.SystemColors.ControlLightLight;
-			label3.Location = new System.Drawing.Point(132, 111);
+			label3.Location = new System.Drawing.Point(142, 104);
 			label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label3.Name = "label3";
 			label3.Size = new System.Drawing.Size(40, 32);
@@ -1054,12 +1055,12 @@
 			// 
 			lameBitrateTb.BackColor = System.Drawing.SystemColors.ControlLightLight;
 			lameBitrateTb.LargeChange = 32;
-			lameBitrateTb.Location = new System.Drawing.Point(11, 47);
+			lameBitrateTb.Location = new System.Drawing.Point(12, 44);
 			lameBitrateTb.Margin = new System.Windows.Forms.Padding(6);
 			lameBitrateTb.Maximum = 320;
 			lameBitrateTb.Minimum = 16;
 			lameBitrateTb.Name = "lameBitrateTb";
-			lameBitrateTb.Size = new System.Drawing.Size(760, 90);
+			lameBitrateTb.Size = new System.Drawing.Size(818, 90);
 			lameBitrateTb.SmallChange = 8;
 			lameBitrateTb.TabIndex = 0;
 			lameBitrateTb.TickFrequency = 16;
@@ -1070,7 +1071,7 @@
 			label1.AutoSize = true;
 			label1.Enabled = false;
 			label1.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point);
-			label1.Location = new System.Drawing.Point(11, 693);
+			label1.Location = new System.Drawing.Point(12, 650);
 			label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label1.Name = "label1";
 			label1.Size = new System.Drawing.Size(333, 32);
@@ -1092,11 +1093,11 @@
 			lameQualityGb.Controls.Add(label14);
 			lameQualityGb.Controls.Add(label2);
 			lameQualityGb.Controls.Add(lameVBRQualityTb);
-			lameQualityGb.Location = new System.Drawing.Point(11, 452);
+			lameQualityGb.Location = new System.Drawing.Point(12, 424);
 			lameQualityGb.Margin = new System.Windows.Forms.Padding(6);
 			lameQualityGb.Name = "lameQualityGb";
 			lameQualityGb.Padding = new System.Windows.Forms.Padding(6);
-			lameQualityGb.Size = new System.Drawing.Size(782, 220);
+			lameQualityGb.Size = new System.Drawing.Size(842, 206);
 			lameQualityGb.TabIndex = 0;
 			lameQualityGb.TabStop = false;
 			lameQualityGb.Text = "Quality";
@@ -1104,7 +1105,7 @@
 			// label19
 			// 
 			label19.AutoSize = true;
-			label19.Location = new System.Drawing.Point(648, 111);
+			label19.Location = new System.Drawing.Point(698, 104);
 			label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label19.Name = "label19";
 			label19.Size = new System.Drawing.Size(42, 32);
@@ -1114,7 +1115,7 @@
 			// label18
 			// 
 			label18.AutoSize = true;
-			label18.Location = new System.Drawing.Point(570, 111);
+			label18.Location = new System.Drawing.Point(614, 104);
 			label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label18.Name = "label18";
 			label18.Size = new System.Drawing.Size(42, 32);
@@ -1124,7 +1125,7 @@
 			// label17
 			// 
 			label17.AutoSize = true;
-			label17.Location = new System.Drawing.Point(492, 111);
+			label17.Location = new System.Drawing.Point(530, 104);
 			label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label17.Name = "label17";
 			label17.Size = new System.Drawing.Size(42, 32);
@@ -1134,7 +1135,7 @@
 			// label16
 			// 
 			label16.AutoSize = true;
-			label16.Location = new System.Drawing.Point(414, 111);
+			label16.Location = new System.Drawing.Point(446, 104);
 			label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label16.Name = "label16";
 			label16.Size = new System.Drawing.Size(42, 32);
@@ -1144,7 +1145,7 @@
 			// label12
 			// 
 			label12.AutoSize = true;
-			label12.Location = new System.Drawing.Point(338, 111);
+			label12.Location = new System.Drawing.Point(364, 104);
 			label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label12.Name = "label12";
 			label12.Size = new System.Drawing.Size(42, 32);
@@ -1154,7 +1155,7 @@
 			// label15
 			// 
 			label15.AutoSize = true;
-			label15.Location = new System.Drawing.Point(260, 111);
+			label15.Location = new System.Drawing.Point(280, 104);
 			label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label15.Name = "label15";
 			label15.Size = new System.Drawing.Size(42, 32);
@@ -1164,7 +1165,7 @@
 			// label9
 			// 
 			label9.AutoSize = true;
-			label9.Location = new System.Drawing.Point(180, 111);
+			label9.Location = new System.Drawing.Point(194, 104);
 			label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label9.Name = "label9";
 			label9.Size = new System.Drawing.Size(42, 32);
@@ -1174,7 +1175,7 @@
 			// label8
 			// 
 			label8.AutoSize = true;
-			label8.Location = new System.Drawing.Point(726, 111);
+			label8.Location = new System.Drawing.Point(782, 104);
 			label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label8.Name = "label8";
 			label8.Size = new System.Drawing.Size(42, 32);
@@ -1184,7 +1185,7 @@
 			// label13
 			// 
 			label13.AutoSize = true;
-			label13.Location = new System.Drawing.Point(698, 171);
+			label13.Location = new System.Drawing.Point(752, 160);
 			label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label13.Name = "label13";
 			label13.Size = new System.Drawing.Size(77, 32);
@@ -1194,7 +1195,7 @@
 			// label10
 			// 
 			label10.AutoSize = true;
-			label10.Location = new System.Drawing.Point(11, 171);
+			label10.Location = new System.Drawing.Point(12, 160);
 			label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label10.Name = "label10";
 			label10.Size = new System.Drawing.Size(86, 32);
@@ -1204,7 +1205,7 @@
 			// label14
 			// 
 			label14.AutoSize = true;
-			label14.Location = new System.Drawing.Point(104, 111);
+			label14.Location = new System.Drawing.Point(112, 104);
 			label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label14.Name = "label14";
 			label14.Size = new System.Drawing.Size(42, 32);
@@ -1214,7 +1215,7 @@
 			// label2
 			// 
 			label2.AutoSize = true;
-			label2.Location = new System.Drawing.Point(26, 111);
+			label2.Location = new System.Drawing.Point(28, 104);
 			label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
 			label2.Name = "label2";
 			label2.Size = new System.Drawing.Size(42, 32);
@@ -1225,11 +1226,11 @@
 			// 
 			lameVBRQualityTb.BackColor = System.Drawing.SystemColors.ControlLightLight;
 			lameVBRQualityTb.LargeChange = 1;
-			lameVBRQualityTb.Location = new System.Drawing.Point(19, 47);
+			lameVBRQualityTb.Location = new System.Drawing.Point(20, 44);
 			lameVBRQualityTb.Margin = new System.Windows.Forms.Padding(6);
 			lameVBRQualityTb.Maximum = 9;
 			lameVBRQualityTb.Name = "lameVBRQualityTb";
-			lameVBRQualityTb.Size = new System.Drawing.Size(752, 90);
+			lameVBRQualityTb.Size = new System.Drawing.Size(810, 90);
 			lameVBRQualityTb.TabIndex = 0;
 			lameVBRQualityTb.Value = 9;
 			// 
@@ -1237,11 +1238,11 @@
 			// 
 			groupBox2.Controls.Add(lameTargetQualityRb);
 			groupBox2.Controls.Add(lameTargetBitrateRb);
-			groupBox2.Location = new System.Drawing.Point(11, 47);
+			groupBox2.Location = new System.Drawing.Point(12, 44);
 			groupBox2.Margin = new System.Windows.Forms.Padding(6);
 			groupBox2.Name = "groupBox2";
 			groupBox2.Padding = new System.Windows.Forms.Padding(6);
-			groupBox2.Size = new System.Drawing.Size(397, 100);
+			groupBox2.Size = new System.Drawing.Size(428, 94);
 			groupBox2.TabIndex = 0;
 			groupBox2.TabStop = false;
 			groupBox2.Text = "Target";
@@ -1249,7 +1250,7 @@
 			// lameTargetQualityRb
 			// 
 			lameTargetQualityRb.AutoSize = true;
-			lameTargetQualityRb.Location = new System.Drawing.Point(258, 47);
+			lameTargetQualityRb.Location = new System.Drawing.Point(278, 44);
 			lameTargetQualityRb.Margin = new System.Windows.Forms.Padding(6);
 			lameTargetQualityRb.Name = "lameTargetQualityRb";
 			lameTargetQualityRb.Size = new System.Drawing.Size(121, 36);
@@ -1262,7 +1263,7 @@
 			// lameTargetBitrateRb
 			// 
 			lameTargetBitrateRb.AutoSize = true;
-			lameTargetBitrateRb.Location = new System.Drawing.Point(11, 47);
+			lameTargetBitrateRb.Location = new System.Drawing.Point(12, 44);
 			lameTargetBitrateRb.Margin = new System.Windows.Forms.Padding(6);
 			lameTargetBitrateRb.Name = "lameTargetBitrateRb";
 			lameTargetBitrateRb.Size = new System.Drawing.Size(114, 36);
@@ -1275,7 +1276,7 @@
 			// mergeOpeningEndCreditsCbox
 			// 
 			mergeOpeningEndCreditsCbox.AutoSize = true;
-			mergeOpeningEndCreditsCbox.Location = new System.Drawing.Point(35, 283);
+			mergeOpeningEndCreditsCbox.Location = new System.Drawing.Point(38, 266);
 			mergeOpeningEndCreditsCbox.Margin = new System.Windows.Forms.Padding(6);
 			mergeOpeningEndCreditsCbox.Name = "mergeOpeningEndCreditsCbox";
 			mergeOpeningEndCreditsCbox.Size = new System.Drawing.Size(392, 36);
@@ -1286,7 +1287,7 @@
 			// retainAaxFileCbox
 			// 
 			retainAaxFileCbox.AutoSize = true;
-			retainAaxFileCbox.Location = new System.Drawing.Point(35, 229);
+			retainAaxFileCbox.Location = new System.Drawing.Point(38, 214);
 			retainAaxFileCbox.Margin = new System.Windows.Forms.Padding(6);
 			retainAaxFileCbox.Name = "retainAaxFileCbox";
 			retainAaxFileCbox.Size = new System.Drawing.Size(256, 36);
@@ -1300,7 +1301,7 @@
 			downloadCoverArtCbox.AutoSize = true;
 			downloadCoverArtCbox.Checked = true;
 			downloadCoverArtCbox.CheckState = System.Windows.Forms.CheckState.Checked;
-			downloadCoverArtCbox.Location = new System.Drawing.Point(35, 123);
+			downloadCoverArtCbox.Location = new System.Drawing.Point(38, 116);
 			downloadCoverArtCbox.Margin = new System.Windows.Forms.Padding(6);
 			downloadCoverArtCbox.Name = "downloadCoverArtCbox";
 			downloadCoverArtCbox.Size = new System.Drawing.Size(316, 36);
@@ -1314,7 +1315,7 @@
 			createCueSheetCbox.AutoSize = true;
 			createCueSheetCbox.Checked = true;
 			createCueSheetCbox.CheckState = System.Windows.Forms.CheckState.Checked;
-			createCueSheetCbox.Location = new System.Drawing.Point(35, 69);
+			createCueSheetCbox.Location = new System.Drawing.Point(38, 64);
 			createCueSheetCbox.Margin = new System.Windows.Forms.Padding(6);
 			createCueSheetCbox.Name = "createCueSheetCbox";
 			createCueSheetCbox.Size = new System.Drawing.Size(287, 36);
@@ -1326,15 +1327,15 @@
 			// SettingsDialog
 			// 
 			AcceptButton = saveBtn;
-			AutoScaleDimensions = new System.Drawing.SizeF(13F, 32F);
-			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			AutoScaleDimensions = new System.Drawing.SizeF(192F, 192F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			CancelButton = cancelBtn;
-			ClientSize = new System.Drawing.Size(1645, 1139);
+			ClientSize = new System.Drawing.Size(1772, 1060);
 			Controls.Add(tabControl);
 			Controls.Add(cancelBtn);
 			Controls.Add(saveBtn);
 			FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+			Margin = new System.Windows.Forms.Padding(8, 6, 8, 6);
 			MaximizeBox = false;
 			MinimizeBox = false;
 			Name = "SettingsDialog";

Source/LibationWinForms/Dialogs/SetupDialog.Designer.cs

@@ -71,8 +71,8 @@
 			// 
 			// SetupDialog
 			// 
-			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			ClientSize = new System.Drawing.Size(493, 308);
 			Controls.Add(returningUserBtn);
 			Controls.Add(newUserBtn);

Source/LibationWinForms/Dialogs/TagsBatchDialog.Designer.cs

@@ -82,8 +82,8 @@
             // TagsBatchDialog
             // 
             this.AcceptButton = this.saveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.CancelButton = this.cancelBtn;
             this.ClientSize = new System.Drawing.Size(617, 110);
             this.Controls.Add(this.cancelBtn);

Source/LibationWinForms/Dialogs/TrashBinDialog.Designer.cs

@@ -102,8 +102,8 @@
 			// 
 			// TrashBinDialog
 			// 
-			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			ClientSize = new System.Drawing.Size(800, 450);
 			Controls.Add(deletedCheckedLbl);
 			Controls.Add(everythingCb);

Source/LibationWinForms/Dialogs/UpgradeNotificationDialog.Designer.cs

@@ -184,8 +184,8 @@
 			// 
 			// UpgradeNotificationDialog
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(555, 426);
 			this.Controls.Add(this.noBtn);
 			this.Controls.Add(this.yesBtn);

Source/LibationWinForms/Form1.Designer.cs

@@ -315,7 +315,7 @@
             this.scanningToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.scanningToolStripMenuItem.Enabled = false;
             this.scanningToolStripMenuItem.Image = global::LibationWinForms.Properties.Resources.import_16x16;
-            this.scanningToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.scanningToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.SizeToFit;
             this.scanningToolStripMenuItem.Name = "scanningToolStripMenuItem";
             this.scanningToolStripMenuItem.Size = new System.Drawing.Size(93, 20);
             this.scanningToolStripMenuItem.Text = "Scanning...";
@@ -616,8 +616,8 @@
 			// 
 			// Form1
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.ClientSize = new System.Drawing.Size(1463, 640);
             this.Controls.Add(this.splitContainer1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

Source/LibationWinForms/Form1.ProcessQueue.cs

@@ -17,7 +17,7 @@ namespace LibationWinForms
 		private void Configure_ProcessQueue()
 		{
 			processBookQueue1.popoutBtn.Click += ProcessBookQueue1_PopOut;
-			splitContainer1.Panel2MinSize = 350;
+			splitContainer1.Panel2MinSize = this.DpiScale(350);
 			var coppalseState = Configuration.Instance.GetNonString(defaultValue: false, nameof(splitContainer1.Panel2Collapsed));
 			WidthChange = splitContainer1.Panel2.Width + splitContainer1.SplitterWidth;
 			int width = this.Width;
@@ -130,7 +130,7 @@ namespace LibationWinForms
 			this.Width -= dockForm.WidthChange;
 			toggleQueueHideBtn.Visible = false;
 			int deltax = filterBtn.Margin.Right + toggleQueueHideBtn.Width + toggleQueueHideBtn.Margin.Left;
-			filterBtn.Location= new System.Drawing.Point(filterBtn.Location.X + deltax, filterBtn.Location.Y);
+			filterBtn.Location = new System.Drawing.Point(filterBtn.Location.X + deltax, filterBtn.Location.Y);
 			filterSearchTb.Location = new System.Drawing.Point(filterSearchTb.Location.X + deltax, filterSearchTb.Location.Y);
 		}
 

Source/LibationWinForms/GridView/CoverGridViewColumn.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LibationWinForms.GridView
+{
+	internal class CoverGridViewColumn : DataGridViewImageColumn
+	{
+		public CoverGridViewColumn()
+		{
+			CellTemplate = new CoverGridViewCell();
+		}
+	}
+
+	public class CoverGridViewCell : DataGridViewImageCell
+	{
+		protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState, object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
+		{
+			base.Paint(graphics, clipBounds, cellBounds, rowIndex, elementState, null, null, null, cellStyle, advancedBorderStyle, paintParts);
+
+			if (value is Image image)
+			{
+				var w = graphics.ScaleX(image.Width);
+				var h = graphics.ScaleY(image.Height);
+				var x = cellBounds.Left + (cellBounds.Width - w) / 2;
+				var y = cellBounds.Top + (cellBounds.Height - h) / 2;
+
+				graphics.DrawImage(image, new Rectangle(x, y, w, h));
+			}
+		}
+	}
+}

Source/LibationWinForms/GridView/DataGridViewImageButtonCell.cs

@@ -7,8 +7,8 @@ namespace LibationWinForms.GridView
 	{
 		protected void DrawButtonImage(Graphics graphics, Image image, Rectangle cellBounds)
 		{
-			var w = image.Width;
-			var h = image.Height;
+			var w = graphics.ScaleX(image.Width);
+			var h = graphics.ScaleY(image.Height);
 			var x = cellBounds.Left + (cellBounds.Width - w) / 2;
 			var y = cellBounds.Top + (cellBounds.Height - h) / 2;
 

Source/LibationWinForms/GridView/DescriptionDisplay.Designer.cs

@@ -46,8 +46,8 @@
 			// 
 			// DescriptionDisplay
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.BackColor = System.Drawing.SystemColors.Highlight;
 			this.ClientSize = new System.Drawing.Size(550, 150);
 			this.Controls.Add(this.textBox1);

Source/LibationWinForms/GridView/ImageDisplay.Designer.cs

@@ -63,8 +63,8 @@
 			// 
 			// ImageDisplay
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(522, 450);
 			this.Controls.Add(this.pictureBox1);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;

Source/LibationWinForms/GridView/MyRatingCellEditor.Designer.cs

@@ -324,8 +324,8 @@
 			// 
 			// MyRatingCellEditor
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.Controls.Add(this.panelStory);
 			this.Controls.Add(this.panelPerform);
 			this.Controls.Add(this.lblStory);

Source/LibationWinForms/GridView/ProductsDisplay.Designer.cs

@@ -49,8 +49,8 @@
 			// 
 			// ProductsDisplay
 			// 
-			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			Controls.Add(productsGrid);
 			Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
 			Name = "ProductsDisplay";

Source/LibationWinForms/GridView/ProductsGrid.Designer.cs

@@ -35,7 +35,7 @@ namespace LibationWinForms.GridView
 			this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
 			this.removeGVColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
 			this.liberateGVColumn = new LibationWinForms.GridView.LiberateDataGridViewImageButtonColumn();
-			this.coverGVColumn = new System.Windows.Forms.DataGridViewImageColumn();
+			this.coverGVColumn = new CoverGridViewColumn();
 			this.titleGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.authorsGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.narratorsGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -152,6 +152,7 @@ namespace LibationWinForms.GridView
 			this.authorsGVColumn.HeaderText = "Authors";
 			this.authorsGVColumn.Name = "authorsGVColumn";
 			this.authorsGVColumn.ReadOnly = true;
+			this.authorsGVColumn.Width = 100;
 			// 
 			// narratorsGVColumn
 			// 
@@ -159,6 +160,7 @@ namespace LibationWinForms.GridView
 			this.narratorsGVColumn.HeaderText = "Narrators";
 			this.narratorsGVColumn.Name = "narratorsGVColumn";
 			this.narratorsGVColumn.ReadOnly = true;
+			this.narratorsGVColumn.Width = 100;
 			// 
 			// lengthGVColumn
 			// 
@@ -166,6 +168,7 @@ namespace LibationWinForms.GridView
 			this.lengthGVColumn.HeaderText = "Length";
 			this.lengthGVColumn.Name = "lengthGVColumn";
 			this.lengthGVColumn.ReadOnly = true;
+			this.lengthGVColumn.Width = 100;
 			this.lengthGVColumn.ToolTipText = "Recording Length";
 			// 
 			// seriesGVColumn
@@ -174,6 +177,7 @@ namespace LibationWinForms.GridView
 			this.seriesGVColumn.HeaderText = "Series";
 			this.seriesGVColumn.Name = "seriesGVColumn";
 			this.seriesGVColumn.ReadOnly = true;
+			this.seriesGVColumn.Width = 100;
 			// 
 			// seriesOrderGVColumn
 			// 
@@ -190,6 +194,7 @@ namespace LibationWinForms.GridView
 			this.descriptionGVColumn.HeaderText = "Description";
 			this.descriptionGVColumn.Name = "descriptionGVColumn";
 			this.descriptionGVColumn.ReadOnly = true;
+			this.descriptionGVColumn.Width = 100;
 			this.descriptionGVColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
 			// 
 			// categoryGVColumn
@@ -198,6 +203,7 @@ namespace LibationWinForms.GridView
 			this.categoryGVColumn.HeaderText = "Category";
 			this.categoryGVColumn.Name = "categoryGVColumn";
 			this.categoryGVColumn.ReadOnly = true;
+			this.categoryGVColumn.Width = 100;
 			// 
 			// productRatingGVColumn
 			// 
@@ -206,7 +212,7 @@ namespace LibationWinForms.GridView
 			this.productRatingGVColumn.Name = "productRatingGVColumn";
 			this.productRatingGVColumn.ReadOnly = true;
 			this.productRatingGVColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.productRatingGVColumn.Width = 108;
+			this.productRatingGVColumn.Width = 112;
 			// 
 			// purchaseDateGVColumn
 			// 
@@ -214,6 +220,7 @@ namespace LibationWinForms.GridView
 			this.purchaseDateGVColumn.HeaderText = "Purchase Date";
 			this.purchaseDateGVColumn.Name = "purchaseDateGVColumn";
 			this.purchaseDateGVColumn.ReadOnly = true;
+			this.purchaseDateGVColumn.Width = 100;
 			// 
 			// myRatingGVColumn
 			// 
@@ -221,7 +228,7 @@ namespace LibationWinForms.GridView
 			this.myRatingGVColumn.HeaderText = "My Rating";
 			this.myRatingGVColumn.Name = "myRatingGVColumn";
 			this.myRatingGVColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-			this.myRatingGVColumn.Width = 108;
+			this.myRatingGVColumn.Width = 112;
 			// 
 			// miscGVColumn
 			// 
@@ -229,7 +236,7 @@ namespace LibationWinForms.GridView
 			this.miscGVColumn.HeaderText = "Misc";
 			this.miscGVColumn.Name = "miscGVColumn";
 			this.miscGVColumn.ReadOnly = true;
-			this.miscGVColumn.Width = 135;
+			this.miscGVColumn.Width = 140;
 			// 
 			// lastDownloadedGVColumn
 			// 
@@ -248,6 +255,7 @@ namespace LibationWinForms.GridView
 			this.tagAndDetailsGVColumn.ReadOnly = true;
 			this.tagAndDetailsGVColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False;
 			this.tagAndDetailsGVColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+			this.tagAndDetailsGVColumn.Width = 100;
 			// 
 			// showHideColumnsContextMenuStrip
 			// 
@@ -260,8 +268,8 @@ namespace LibationWinForms.GridView
 			// 
 			// ProductsGrid
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.AutoScroll = true;
 			this.Controls.Add(this.gridEntryDataGridView);
 			this.Name = "ProductsGrid";
@@ -280,7 +288,7 @@ namespace LibationWinForms.GridView
 		private SyncBindingSource syncBindingSource;
 		private System.Windows.Forms.DataGridViewCheckBoxColumn removeGVColumn;
 		private LiberateDataGridViewImageButtonColumn liberateGVColumn;
-		private System.Windows.Forms.DataGridViewImageColumn coverGVColumn;
+		private CoverGridViewColumn coverGVColumn;
 		private System.Windows.Forms.DataGridViewTextBoxColumn titleGVColumn;
 		private System.Windows.Forms.DataGridViewTextBoxColumn authorsGVColumn;
 		private System.Windows.Forms.DataGridViewTextBoxColumn narratorsGVColumn;

Source/LibationWinForms/GridView/ProductsGrid.cs

@@ -43,6 +43,8 @@ namespace LibationWinForms.GridView
 			gridEntryDataGridView.Scroll += (_, s) => Scroll?.Invoke(this, s);
 			gridEntryDataGridView.CellContextMenuStripNeeded += GridEntryDataGridView_CellContextMenuStripNeeded;
 			removeGVColumn.Frozen = false;
+
+			gridEntryDataGridView.RowTemplate.Height = this.DpiScale(gridEntryDataGridView.RowTemplate.Height);
 		}
 
 		private void GridEntryDataGridView_CellContextMenuStripNeeded(object sender, DataGridViewCellContextMenuStripNeededEventArgs e)
@@ -378,7 +380,7 @@ namespace LibationWinForms.GridView
 				menuItem.Click += HideMenuItem_Click;
 				showHideColumnsContextMenuStrip.Items.Add(menuItem);
 
-				column.Width = gridColumnsWidths.GetValueOrDefault(itemName, column.Width);
+				column.Width = gridColumnsWidths.GetValueOrDefault(itemName, this.DpiScale(column.Width));
 				column.MinimumWidth = 10;
 				column.HeaderCell.ContextMenuStrip = showHideColumnsContextMenuStrip;
 				column.Visible = visible;

Source/LibationWinForms/ProcessQueue/ProcessBookControl.Designer.cs

@@ -186,8 +186,8 @@
 			// 
 			// ProcessBookControl
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.BackColor = System.Drawing.SystemColors.ControlLight;
 			this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
 			this.Controls.Add(this.moveLastBtn);

Source/LibationWinForms/ProcessQueue/ProcessBookForm.Designer.cs

@@ -32,8 +32,8 @@
 			// 
 			// ProcessBookForm
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(522, 638);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
 			this.Name = "ProcessBookForm";

Source/LibationWinForms/ProcessQueue/ProcessQueueControl.Designer.cs

@@ -336,8 +336,8 @@
 			// 
 			// ProcessQueueControl
 			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
 			this.Controls.Add(this.tabControl1);
 			this.Controls.Add(this.statusStrip1);

Source/LibationWinForms/ProcessQueue/VirtualFlowControl.cs

@@ -108,7 +108,7 @@ namespace LibationWinForms.ProcessQueue
 
 
 			var control = InitControl(0);
-			VirtualControlHeight = control.Height + control.Margin.Top + control.Margin.Bottom;
+			VirtualControlHeight = this.DpiUnscale(control.Height + control.Margin.Top + control.Margin.Bottom);
 			TopMargin = control.Margin.Top;
 
 			BookControls.Add(control);
@@ -123,7 +123,7 @@ namespace LibationWinForms.ProcessQueue
 
 			vScrollBar1.Scroll += (_, s) => SetScrollPosition(s.NewValue);
 			vScrollBar1.SmallChange = SmallScrollChange;
-			panel1.Height += NUM_BLANK_SPACES_AT_BOTTOM * VirtualControlHeight;
+			panel1.Height += this.DpiScale(NUM_BLANK_SPACES_AT_BOTTOM * VirtualControlHeight);
 		}
 
 		private ProcessBookControl InitControl(int locationY)

Source/LibationWinForms/Program.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using AppScaffolding;
 using Dinah.Core;
 using LibationFileManager;
 using LibationWinForms.Dialogs;
@@ -42,7 +43,7 @@ namespace LibationWinForms
 				RunInstaller(config);
 
 				// most migrations go in here
-				AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
+				LibationScaffolding.RunPostConfigMigrations(config);
 
 				// migrations which require Forms or are long-running
 				RunWindowsOnlyMigrations(config);
@@ -50,7 +51,7 @@ namespace LibationWinForms
 				MessageBoxLib.VerboseLoggingWarning_ShowIfTrue();
 
 				// logging is init'd here
-				AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
+				LibationScaffolding.RunPostMigrationScaffolding(Variety.Classic, config);
 			}
 			catch (Exception ex)
 			{

Source/LibationWinForms/SeriesView/SeriesViewDialog.Designer.cs

@@ -44,7 +44,7 @@ namespace LibationWinForms.SeriesView
 			// 
 			// SeriesViewDialog
 			// 
-			AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+			AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
 			AutoScaleMode = AutoScaleMode.Font;
 			ClientSize = new System.Drawing.Size(800, 450);
 			Controls.Add(tabControl1);

Source/LibationWinForms/WinFormsUtil.cs

@@ -1,11 +1,14 @@
 using Dinah.Core.WindowsDesktop.Drawing;
 using LibationFileManager;
 using System.Drawing;
+using System.Windows.Forms;
 
 namespace LibationWinForms
 {
 	internal static class WinFormsUtil
 	{
+		private const float BaseDpi = 96;
+
 		private static Bitmap defaultImage;
 		public static Image TryLoadImageOrDefault(byte[] picture, PictureSize defaultSize = PictureSize.Native)
 		{
@@ -19,5 +22,16 @@ namespace LibationWinForms
 				return defaultImage ??= new Bitmap(ms);
 			}
 		}
+
+		public static int DpiScale(this Control control, int value)
+			=> (int)(control.DeviceDpi / BaseDpi * value);
+
+		public static int DpiUnscale(this Control control, int value)
+			=> (int)(BaseDpi / control.DeviceDpi * value);
+
+		public static int ScaleX(this Graphics control, int value)
+			=> (int)(control.DpiX / BaseDpi * value);
+		public static int ScaleY(this Graphics control, int value)
+			=> (int)(control.DpiY / BaseDpi * value);
 	}
 }

Source/_Demos/LoadByOS/WindowsConfigApp/Form1.Designer.cs

@@ -29,7 +29,8 @@
 		private void InitializeComponent()
 		{
 			this.components = new System.ComponentModel.Container();
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
 			this.ClientSize = new System.Drawing.Size(800, 450);
 			this.Text = "Form1";
 		}

Source/_Tests/LibationSearchEngine.Tests/SearchEngineTests.cs

@@ -30,18 +30,21 @@ namespace SearchEngineTests
 		[DataRow("   ", "*:*")]
 
 		// tag surrounded by spaces
-		[DataRow("[foo]", "tags:foo")]
-		[DataRow("  [foo]", "  tags:foo")]
-		[DataRow("  [   foo   ]", "  tags:foo")]
-		[DataRow("[foo]  ", "tags:foo  ")]
-		[DataRow("  [foo]  ", "  tags:foo  ")]
-		[DataRow("-[foo]", "-tags:foo")]
-		[DataRow("  -[foo]", "  -tags:foo")]
-		[DataRow("-[foo]  ", "-tags:foo  ")]
-		[DataRow("  -[foo]  ", "  -tags:foo  ")]
+		[DataRow("[foo]", "tags:foo ")]
+		[DataRow("  [foo]", "  tags:foo ")]
+		[DataRow("  [   foo   ]", "  tags:foo ")]
+		[DataRow("[foo]  ", "tags:foo   ")]
+		[DataRow("  [foo]  ", "  tags:foo   ")]
+		[DataRow("-[foo]", "-tags:foo ")]
+		[DataRow("  -[foo]", "  -tags:foo ")]
+		[DataRow("-[foo]  ", "-tags:foo   ")]
+		[DataRow("  -[foo]  ", "  -tags:foo   ")]
+		[DataRow("[foo_bar]", "tags:foo_bar ")]
+		[DataRow("-[foo_bar]", "-tags:foo_bar ")]
+		[DataRow("[foo_bar] [foo_bar2]", "tags:foo_bar  tags:foo_bar2 ")]
 
 		// tag case irrelevant
-		[DataRow("[FoO]", "tags:FoO")]
+		[DataRow("[FoO]", "tags:FoO ")]
 
 		// bool keyword surrounded by spaces
 		[DataRow("israted", "israted:True")]
@@ -69,9 +72,9 @@ namespace SearchEngineTests
 		[DataRow("liberated AND isRated:false", "liberated:True AND israted:false")]
 
 		// tag which happens to be a bool keyword >> parse as tag
-		[DataRow("[israted]", "tags:israted")]
-		[DataRow("[tags]    [israted] [tags] [tags]  [isliberated] [israted]   ", "tags:tags    tags:israted tags:tags tags:tags  tags:isliberated tags:israted   ")]
-		[DataRow("[tags][israted]", "tags:tagstags:israted")]
+		[DataRow("[israted]", "tags:israted ")]
+		[DataRow("[tags]    [israted] [tags] [tags]  [isliberated] [israted]   ", "tags:tags     tags:israted  tags:tags  tags:tags   tags:isliberated  tags:israted    ")]
+		[DataRow("[tags][israted]", "tags:tags tags:israted ")]
 
 		// numbers with "to". TO all caps, numbers [8.2] format
 		[DataRow("1 to 10", "00000001.00 TO 00000010.00")]