Fixed a few bugs and switched to .NET framework 4.7

2025-12-16 10:04:24 +00:00 · 2018-10-21 14:12:05 -04:00
parent dd1358f8dc
commit 9754a9a328
82 changed files with 842 additions and 557 deletions
--- a/Bwg.Hardware/Bwg.Hardware.csproj
+++ b/Bwg.Hardware/Bwg.Hardware.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20</TargetFrameworks>
+    <TargetFrameworks>net47;net20</TargetFrameworks>
    <Version>0.0.7.1</Version>
    <AssemblyName>Bwg.Hardware</AssemblyName>
    <RootNamespace>Bwg.Hardware</RootNamespace>
--- a/Bwg.Logging/Bwg.Logging.csproj
+++ b/Bwg.Logging/Bwg.Logging.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20</TargetFrameworks>
+    <TargetFrameworks>net47;net20</TargetFrameworks>
    <Version>0.0.7.1</Version>
    <AssemblyName>Bwg.Logging</AssemblyName>
    <RootNamespace>Bwg.Logging</RootNamespace>
--- a/Bwg.Scsi/Bwg.Scsi.csproj
+++ b/Bwg.Scsi/Bwg.Scsi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20</TargetFrameworks>
+    <TargetFrameworks>net47;net20</TargetFrameworks>
    <Version>0.0.7.1</Version>
    <AssemblyName>Bwg.Scsi</AssemblyName>
    <RootNamespace>Bwg.Scsi</RootNamespace>
--- a/CUEControls/CUEControls.csproj
+++ b/CUEControls/CUEControls.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20</TargetFrameworks>
+    <TargetFrameworks>net47;net20</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUEControls</AssemblyName>
    <RootNamespace>CUEControls</RootNamespace>
--- a/CUEPlayer/CUEPlayer.csproj
+++ b/CUEPlayer/CUEPlayer.csproj
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>CUEPlayer</RootNamespace>
    <AssemblyName>CUEPlayer</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <IsWebBootstrapper>false</IsWebBootstrapper>
    <FileUpgradeFlags>
@@ -37,7 +37,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -46,12 +46,13 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
--- a/CUERipper.WPF/CUERipper.WPF.csproj
+++ b/CUERipper.WPF/CUERipper.WPF.csproj
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>CUERipper.WPF</RootNamespace>
    <AssemblyName>CUERipper.WPF</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <WarningLevel>4</WarningLevel>
@@ -41,7 +41,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -49,10 +49,11 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="PresentationCore">
--- a/CUERipper/CUERipper.csproj
+++ b/CUERipper/CUERipper.csproj
@@ -26,7 +26,7 @@
    </AssemblyOriginatorKeyFile>
    <TargetZone>LocalIntranet</TargetZone>
    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Web</InstallFrom>
@@ -54,7 +54,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -64,11 +64,12 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
--- a/CUERipper/Options.cs
+++ b/CUERipper/Options.cs
@@ -76,7 +76,10 @@ namespace CUERipper
        [DefaultValue(CUETools.CTDB.CTDBMetadataSearch.Default), Category("CTDB"), DisplayName("Metadata search")]
        public CUETools.CTDB.CTDBMetadataSearch metadataSearch { get { return config.advanced.metadataSearch; } set { config.advanced.metadataSearch = value; } }

-        [DefaultValue(CUETools.Processor.CUEConfigAdvanced.CTDBCoversSearch.Small), Category("CTDB"), DisplayName("Album art search")]
+        [DefaultValue(CUETools.Processor.CUEConfigAdvanced.CTDBCoversSize.Large), Category("CTDB"), DisplayName("Album art size")]
+        public CUETools.Processor.CUEConfigAdvanced.CTDBCoversSize coversSize { get { return config.advanced.coversSize; } set { config.advanced.coversSize = value; } }
+
+        [DefaultValue(CUETools.Processor.CUEConfigAdvanced.CTDBCoversSearch.Primary), Category("CTDB"), DisplayName("Album art search")]
        public CUETools.Processor.CUEConfigAdvanced.CTDBCoversSearch coversSearch { get { return config.advanced.coversSearch; } set { config.advanced.coversSearch = value; } }

        [DefaultValue(false), Category("CTDB"), DisplayName("Detailed log")]
--- a/CUERipper/frmCUERipper.cs
+++ b/CUERipper/frmCUERipper.cs
@@ -33,6 +33,7 @@ namespace CUERipper
        private bool testAndCopy = false;
 		internal CUERipperData data = new CUERipperData();
        private bool initDone = false;
+        private bool freezeReleasesUpdates_m = false;
        public readonly static XmlSerializerNamespaces xmlEmptyNamespaces = new XmlSerializerNamespaces(new XmlQualifiedName[] { XmlQualifiedName.Empty });
        public readonly static XmlWriterSettings xmlEmptySettings = new XmlWriterSettings { Indent = true, OmitXmlDeclaration = true };

@@ -382,7 +383,7 @@ namespace CUERipper
 				toolStripStatusLabel1.Text = status;
 				toolStripProgressBar1.Value = Math.Max(0, Math.Min(100, (int)(percentTrck * 100)));

-                progressBarErrors.Value = Math.Min(progressBarErrors.Maximum, (int)(100 * Math.Log(e.ErrorsCount / 10.0 + 1) / Math.Log((e.PassEnd - e.PassStart) / 10.0 + 1)));
+                progressBarErrors.Value = Math.Max(0,Math.Min(progressBarErrors.Maximum, (int)(100 * Math.Log(e.ErrorsCount / 10.0 + 1) / Math.Log((e.PassEnd - e.PassStart) / 10.0 + 1))));
 				progressBarErrors.Enabled = e.Pass >= audioSource.CorrectionQuality;

 				progressBarCD.Maximum = (int) audioSource.TOC.AudioLength;
@@ -483,6 +484,23 @@ namespace CUERipper
            {
                data.selectedRelease.metadata.AlbumArt.Clear();
                data.selectedRelease.metadata.AlbumArt.Add(albumArt[currentAlbumArt].meta);
+
+                if (albumArt[currentAlbumArt].meta.uri != null &&
+                    albumArt[currentAlbumArt].meta.uri150 != null &&
+                    albumArt[currentAlbumArt].meta.uri != albumArt[currentAlbumArt].meta.uri150 &&
+                    _config.advanced.coversSize == CUEConfigAdvanced.CTDBCoversSize.Large
+                    )
+                {
+                    var ms = new MemoryStream();
+                    try
+                    {
+                        if (cueSheet.CTDB.FetchFile(albumArt[currentAlbumArt].meta.uri, ms))
+                            albumArt[currentAlbumArt].contents = ms.ToArray();
+                    } catch (Exception)
+                    {
+                    }
+                }
+
                var blob = new TagLib.ByteVector(albumArt[currentAlbumArt].contents);
                cueSheet.AlbumArt.Add(new TagLib.Picture(blob) { Type = TagLib.PictureType.FrontCover });
            }            
@@ -1088,7 +1106,8 @@ namespace CUERipper

 		private void bnComboBoxRelease_SelectedValueChanged(object sender, EventArgs e)
 		{
-			UpdateRelease();
+            if (freezeReleasesUpdates_m) return;
+            UpdateRelease();
 		}

 		private void bnComboBoxDrives_SelectedIndexChanged(object sender, EventArgs e)
@@ -1261,8 +1280,10 @@ namespace CUERipper
 					data.selectedRelease.metadata.UpdateArtist(e.Label);
 				else
 					prop.SetValue(data.selectedRelease.metadata, e.Label);
-				data.Releases.ResetItem(bnComboBoxRelease.SelectedIndex);
-			}
+                freezeReleasesUpdates_m = true;
+                data.Releases.ResetItem(bnComboBoxRelease.SelectedIndex);
+                freezeReleasesUpdates_m = false;
+            }
 			else
 			{
 				CUETrackMetadata track = data.selectedRelease.metadata.Tracks[data.metadataTrack];
@@ -1502,9 +1523,9 @@ namespace CUERipper
                        continue;
                    foreach (var coverart in metadata.coverart)
                    {
-                        var uri = _config.advanced.coversSearch == CUEConfigAdvanced.CTDBCoversSearch.Large ?
-                            coverart.uri : coverart.uri150 ?? coverart.uri;
-                        if (knownUrls.Contains(uri) || !coverart.primary)
+                        var uri = coverart.uri150;
+                        if (knownUrls.Contains(uri) || 
+                            (_config.advanced.coversSearch == CUEConfigAdvanced.CTDBCoversSearch.Primary && !coverart.primary))
                            continue;
                        if (i == 0 && !firstUrls.Contains(coverart.uri))
                            continue;
@@ -1596,7 +1617,7 @@ namespace CUERipper

            toolStripStatusLabel1.Text = albumArt[currentAlbumArt].meta.uri;

-            if (e == null || e.Button != System.Windows.Forms.MouseButtons.Right || _config.advanced.coversSearch != CUEConfigAdvanced.CTDBCoversSearch.Large)
+            if (e == null || e.Button != System.Windows.Forms.MouseButtons.Right || _config.advanced.coversSize != CUEConfigAdvanced.CTDBCoversSize.Large)
            {
                pictureBox1.Image = albumArt[currentAlbumArt].image;
                return;
--- a/CUERipper/frmCUERipper.resx
+++ b/CUERipper/frmCUERipper.resx
@@ -867,7 +867,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy
-        CQAAAk1TRnQBSQFMAgEBBAEAAUwBAwFMAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBBAEAAVQBAwFUAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -944,7 +944,7 @@
    <value>progressBarErrors</value>
  </data>
  <data name="&gt;&gt;progressBarErrors.Type" xml:space="preserve">
-    <value>ProgressODoom.ProgressBarEx, ProgressODoom, Version=1.0.6651.26127, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.ProgressBarEx, ProgressODoom, Version=1.0.6789.37646, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;progressBarErrors.Parent" xml:space="preserve">
    <value>panel1</value>
@@ -974,7 +974,7 @@
    <value>progressBarCD</value>
  </data>
  <data name="&gt;&gt;progressBarCD.Type" xml:space="preserve">
-    <value>ProgressODoom.ProgressBarEx, ProgressODoom, Version=1.0.6651.26127, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.ProgressBarEx, ProgressODoom, Version=1.0.6789.37646, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;progressBarCD.Parent" xml:space="preserve">
    <value>panel1</value>
@@ -1025,196 +1025,193 @@
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAi
-        LAAAAk1TRnQBSQFMAgEBCgEAATABAAEwAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
-        AwABMAMAAQEBAAEgBgABMCoAAWgBcAF4Af8BaAFwAXgB/wFoAXABeAH/AWgBcAF4Af8cAAFeAckC/wE7
-        AYMBrAH/ATsBgwGsAf8BXgHJAv8BXgHJAv8BXgHJAv8BXgHJAv8BXgHJAv8BXgHJAv8BXgHJAv8BXgHJ
-        Av8BXgHJAv8BXgHJAv8BXgHJAv+UAAFoAXABeAH/Az8B/wM/Af8BJgI2Af8DDQH/Aw0B/wMAAf8DDQH/
-        EAABOwGDAawB/wEAAgMB/wEpAScBJQH/AUYBSQFEAf8BAAIDAf8BIQETARcB/wFeAckC/wFeAckC/wFe
-        AckC/wFeAckC/wFeAckC/wFeAckC/wFeAckC/wFeAckC/wFeAckC/wFeAckC/4wAAz8B/wG9AsYB/wFo
-        AXABeAH/Az8B/wEeAiYB/wMNAf8DDQH/AwAB/wMAAf8DDQH/DQACAwH/AcsB0QHKAf8B/AP/AfwD/wH8
-        A/8BRgFJAUQB/wEhARMBFwH/AV4ByQL/AV4ByQL/AV4ByQL/AV4ByQL/AV4ByQL/AV4ByQL/AV4ByQL/
-        AV4ByQL/AV4ByQL/iAABHgImAf8DPwH/AWgBcAF4Af8BvQLGAf8BaAFwAXgB/wEeAiYB/wMNAf8DDQH/
-        AwAB/wMAAf8DAAH/Aw0B/wkAAgMB/wHLAdEBygH/AfwD/wH8A/8B/AP/AfwD/wEAAgMB/wFeAckC/wFe
-        AckC/wFeAckC/wFeAckC/wFeAckC/wFeAckC/wFeAckC/wFeAckC/wFeAckC/4QAAR4CJgH/ASYCNgH/
-        Az8B/wM/Af8BaAFwAXgB/wFoAXABeAH/ASYCNgH/AR4CJgH/Aw0B/wMAAf8DAAH/AwAB/wMAAf8BHgIm
-        Af8EAAE7AYMBrAH/ASEBEwEXAf8BdAJrAf8BvAK9Af8BvAK9Af8BywHRAcoB/wEAAgMB/wEpAScBJQH/
-        AQACAwH/AQACAwH/AQACAwH/AQACAwH/ASkBJwElAf8BXgHJAv8BXgHJAv8BXgHJAv+EAAMNAf8BHgIm
-        Af8BHgImAf8BJgI2Af8BJgI2Af8DDQH/ARUBYAFoAf8BFQFgAWgB/wMFAf8DBQH/AwAB/wMAAf8DAAH/
-        AwAB/wQAAV4ByQL/ATsBgwGsAf8BIQETARcB/wEAAgMB/wEAAgMB/wH8A/8BAAIDAf8BIQETARcB/wGk
-        AakBoQH/AfwD/wH8A/8BkwGeAZwB/wEpAScBJQH/ASkBJwElAf8BXgHJAv8BXgHJAv+AAAFoAXABeAH/
-        AwAB/wMNAf8DDQH/Aw0B/wMNAf8BAAHGAdYB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wMFAf8DAAH/
-        AwAB/wMAAf8DAAH/AWgBcAF4Af8BXgHJAv8BXgHJAv8BXgHJAv8BXgHJAv8BAAIDAf8B/AP/AQACAwH/
-        ASkBJwElAf8B/AP/AfwD/wH8A/8B/AP/AcsB0QHKAf8BAAIDAf8BXgHJAv8BXgHJAv+AAAFoAXABeAH/
-        AwAB/wMAAf8DAAH/AQACBQH/ARUBYAFoAf8BAAHGAdYB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wEV
-        AWABaAH/AwAB/wMAAf8DAAH/AwAB/wFoAXABeAH/Aa4BaQFwAf8BrgFpAXAB/wGuAWkBcAH/Aa4BaQFw
-        Af8BAAIDAf8B/AP/AQACAwH/AQACAwH/AUYBSQFEAf8BywHRAcoB/wH8A/8B/AP/AfwD/wEAAgMB/wGu
-        AWkBcAH/Aa4BaQFwAf+AAAFoAXABeAH/AwAB/wMAAf8DAAH/AwAB/wEVAWABaAH/AQABxgHWAf8BAAHG
-        AdYB/wEAAcYB1gH/AQABxgHWAf8BFQFgAWgB/wMNAf8DDQH/Aw0B/wMNAf8BaAFwAXgB/wGuAWkBcAH/
-        Aa4BaQFwAf8BrgFpAXAB/wGuAWkBcAH/AQACAwH/AfwD/wEAAgMB/wFhAUcBSgH/ASEBEwEXAf8BAAID
-        Af8BAAIDAf8BAAIDAf8B/AP/AQACAwH/Aa4BaQFwAf8BrgFpAXAB/4AAAWgBcAF4Af8DAAH/AwAB/wMA
-        Af8DAAH/Aw0B/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wEAAcYB1gH/Aw0B/wEeAiYB/wEeAiYB/wMN
-        Af8DDQH/AWgBcAF4Af8BrgFpAXAB/wGuAWkBcAH/Aa4BaQFwAf8BrgFpAXAB/wEAAgMB/wH8A/8BIQET
-        ARcB/wEAAgMB/wEpAScBJQH/AWEBRwFKAf8BYQFHAUoB/wEAAgMB/wH8A/8BAAIDAf8BrgFpAXAB/wGu
-        AWkBcAH/hAADDQH/AwAB/wMAAf8DAAH/AwAB/wMNAf8BFQFgAWgB/wEVAWABaAH/Aw0B/wM/Af8DPwH/
-        AR4CJgH/AR4CJgH/AR4CJgH/BAABrgFpAXAB/wGuAWkBcAH/Aa4BaQFwAf8BrgFpAXAB/wEAAgMB/wH8
-        A/8B/AP/AZMBngGcAf8BKQEnASUB/wEAAgMB/wEhARMBFwH/AQACAwH/AfwD/wEAAgMB/wGuAWkBcAH/
-        Aa4BaQFwAf+EAAM/Af8DAAH/AwAB/wMAAf8DDQH/Aw0B/wEeAiYB/wM/Af8BaAFwAXgB/wFoAq0B/wM/
-        Af8DPwH/AR4CJgH/Az8B/wQAAa4BaQFwAf8BrgFpAXAB/wGuAWkBcAH/Aa4BaQFwAf8BAAIDAf8BvAK9
-        Af8B/AP/AfwD/wH8A/8BywHRAcoB/wFWAV8BXgH/AQACAwH/AfwD/wEAAgMB/wGuAWkBcAH/Aa4BaQFw
-        Af+IAAEeAiYB/wMAAf8DAAH/Aw0B/wMNAf8BHgImAf8BJgI2Af8BaAFwAXgB/wG9AsYB/wFoAXABeAH/
-        ASYCNgH/Az8B/wgAAa4BaQFwAf8BrgFpAXAB/wGuAWkBcAH/Aa4BaQFwAf8BKQEnASUB/wFGAUkBRAH/
-        AbwCvQH/AfwD/wH8A/8B/AP/AfwD/wH8A/8B/AP/AQACAwH/Aa4BaQFwAf8BrgFpAXAB/4wAAz8B/wMA
-        Af8DDQH/Aw0B/wEeAiYB/wEmAjYB/wM/Af8BaAFwAXgB/wFoAXABeAH/AWgBcAF4Af8MAAGuAWkBcAH/
-        Aa4BaQFwAf8BrgFpAXAB/wGuAWkBcAH/Aa4BaQFwAf8BKQEnASUB/wEAAgMB/wEpAScBJQH/AZMBngGc
-        Af8B/AP/AfwD/wH8A/8B/AP/AQACAwH/Aa4BaQFwAf8BrgFpAXAB/5AAASYCNgH/ASYCNgH/Aw0B/wMN
-        Af8DDQH/AR4CJgH/Az8B/wM/Af8QAAGuAWkBcAH/Aa4BaQFwAf8BrgFpAXAB/wGuAWkBcAH/Aa4BaQFw
-        Af8BrgFpAXAB/wGuAWkBcAH/ASkBJwElAf8BAAIDAf8BIQETARcB/wF0AmsB/wHLAdEBygH/AfwD/wEA
-        AgMB/wGuAWkBcAH/Aa4BaQFwAf+YAAFoAXABeAH/AWgBcAF4Af8BaAFwAXgB/wFoAXABeAH/HAABrgFp
-        AXAB/wGuAWkBcAH/Aa4BaQFwAf8BrgFpAXAB/wGuAWkBcAH/Aa4BaQFwAf8BrgFpAXAB/wGuAWkBcAH/
-        Aa4BaQFwAf8BIQETARcB/wEAAgMB/wFGAUkBRAH/ASkBJwElAf8BrgFpAXAB/4gAA8AB/wNxAf8DcQH/
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACG
+        KwAAAk1TRnQBSQFMAgEBCgEAATgBAAE4AQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABMAMAAQEBAAEgBgABMCoAAWcBbwF3Af8BZwFvAXcB/wFnAW8BdwH/AWcBbwF3Af8cAAFdAckC/wE6
+        AYMBrAH/AToBgwGsAf8BXQHJAv8BXQHJAv8BXQHJAv8BXQHJAv8BXQHJAv8BXQHJAv8BXQHJAv8BXQHJ
+        Av8BXQHJAv8BXQHJAv8BXQHJAv+UAAFnAW8BdwH/Az4B/wM+Af8BJQI1Af8DDAH/AwwB/wMAAf8DDAH/
+        EAABOgGDAawB/wEAAgIB/wEoASYBJAH/AUUBSAFDAf8BAAICAf8BIAESARYB/wFdAckC/wFdAckC/wFd
+        AckC/wFdAckC/wFdAckC/wFdAckC/wFdAckC/wFdAckC/wFdAckC/wFdAckC/4wAAz4B/wG9AsYB/wFn
+        AW8BdwH/Az4B/wEdAiUB/wMMAf8DDAH/AwAB/wMAAf8DDAH/DQACAgH/AcsB0QHKAf8B/AP/AfwD/wH8
+        A/8BRQFIAUMB/wEgARIBFgH/AV0ByQL/AV0ByQL/AV0ByQL/AV0ByQL/AV0ByQL/AV0ByQL/AV0ByQL/
+        AV0ByQL/AV0ByQL/iAABHQIlAf8DPgH/AWcBbwF3Af8BvQLGAf8BZwFvAXcB/wEdAiUB/wMMAf8DDAH/
+        AwAB/wMAAf8DAAH/AwwB/wkAAgIB/wHLAdEBygH/AfwD/wH8A/8B/AP/AfwD/wEAAgIB/wFdAckC/wFd
+        AckC/wFdAckC/wFdAckC/wFdAckC/wFdAckC/wFdAckC/wFdAckC/wFdAckC/4QAAR0CJQH/ASUCNQH/
+        Az4B/wM+Af8BZwFvAXcB/wFnAW8BdwH/ASUCNQH/AR0CJQH/AwwB/wMAAf8DAAH/AwAB/wMAAf8BHQIl
+        Af8EAAE6AYMBrAH/ASABEgEWAf8BcwJqAf8BvAK9Af8BvAK9Af8BywHRAcoB/wEAAgIB/wEoASYBJAH/
+        AQACAgH/AQACAgH/AQACAgH/AQACAgH/ASgBJgEkAf8BXQHJAv8BXQHJAv8BXQHJAv+EAAMMAf8BHQIl
+        Af8BHQIlAf8BJQI1Af8BJQI1Af8DDAH/ARQBXwFnAf8BFAFfAWcB/wMEAf8DBAH/AwAB/wMAAf8DAAH/
+        AwAB/wQAAV0ByQL/AToBgwGsAf8BIAESARYB/wEAAgIB/wEAAgIB/wH8A/8BAAICAf8BIAESARYB/wGk
+        AakBoQH/AfwD/wH8A/8BkwGeAZwB/wEoASYBJAH/ASgBJgEkAf8BXQHJAv8BXQHJAv+AAAFnAW8BdwH/
+        AwAB/wMMAf8DDAH/AwwB/wMMAf8BAAHGAdYB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wMEAf8DAAH/
+        AwAB/wMAAf8DAAH/AWcBbwF3Af8BXQHJAv8BXQHJAv8BXQHJAv8BXQHJAv8BAAICAf8B/AP/AQACAgH/
+        ASgBJgEkAf8B/AP/AfwD/wH8A/8B/AP/AcsB0QHKAf8BAAICAf8BXQHJAv8BXQHJAv+AAAFnAW8BdwH/
+        AwAB/wMAAf8DAAH/AQACBAH/ARQBXwFnAf8BAAHGAdYB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wEU
+        AV8BZwH/AwAB/wMAAf8DAAH/AwAB/wFnAW8BdwH/Aa4BaAFvAf8BrgFoAW8B/wGuAWgBbwH/Aa4BaAFv
+        Af8BAAICAf8B/AP/AQACAgH/AQACAgH/AUUBSAFDAf8BywHRAcoB/wH8A/8B/AP/AfwD/wEAAgIB/wGu
+        AWgBbwH/Aa4BaAFvAf+AAAFnAW8BdwH/AwAB/wMAAf8DAAH/AwAB/wEUAV8BZwH/AQABxgHWAf8BAAHG
+        AdYB/wEAAcYB1gH/AQABxgHWAf8BFAFfAWcB/wMMAf8DDAH/AwwB/wMMAf8BZwFvAXcB/wGuAWgBbwH/
+        Aa4BaAFvAf8BrgFoAW8B/wGuAWgBbwH/AQACAgH/AfwD/wEAAgIB/wFgAUYBSQH/ASABEgEWAf8BAAIC
+        Af8BAAICAf8BAAICAf8B/AP/AQACAgH/Aa4BaAFvAf8BrgFoAW8B/4AAAWcBbwF3Af8DAAH/AwAB/wMA
+        Af8DAAH/AwwB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wEAAcYB1gH/AwwB/wEdAiUB/wEdAiUB/wMM
+        Af8DDAH/AWcBbwF3Af8BrgFoAW8B/wGuAWgBbwH/Aa4BaAFvAf8BrgFoAW8B/wEAAgIB/wH8A/8BIAES
+        ARYB/wEAAgIB/wEoASYBJAH/AWABRgFJAf8BYAFGAUkB/wEAAgIB/wH8A/8BAAICAf8BrgFoAW8B/wGu
+        AWgBbwH/hAADDAH/AwAB/wMAAf8DAAH/AwAB/wMMAf8BFAFfAWcB/wEUAV8BZwH/AwwB/wM+Af8DPgH/
+        AR0CJQH/AR0CJQH/AR0CJQH/BAABrgFoAW8B/wGuAWgBbwH/Aa4BaAFvAf8BrgFoAW8B/wEAAgIB/wH8
+        A/8B/AP/AZMBngGcAf8BKAEmASQB/wEAAgIB/wEgARIBFgH/AQACAgH/AfwD/wEAAgIB/wGuAWgBbwH/
+        Aa4BaAFvAf+EAAM+Af8DAAH/AwAB/wMAAf8DDAH/AwwB/wEdAiUB/wM+Af8BZwFvAXcB/wFnAq0B/wM+
+        Af8DPgH/AR0CJQH/Az4B/wQAAa4BaAFvAf8BrgFoAW8B/wGuAWgBbwH/Aa4BaAFvAf8BAAICAf8BvAK9
+        Af8B/AP/AfwD/wH8A/8BywHRAcoB/wFVAV4BXQH/AQACAgH/AfwD/wEAAgIB/wGuAWgBbwH/Aa4BaAFv
+        Af+IAAEdAiUB/wMAAf8DAAH/AwwB/wMMAf8BHQIlAf8BJQI1Af8BZwFvAXcB/wG9AsYB/wFnAW8BdwH/
+        ASUCNQH/Az4B/wgAAa4BaAFvAf8BrgFoAW8B/wGuAWgBbwH/Aa4BaAFvAf8BKAEmASQB/wFFAUgBQwH/
+        AbwCvQH/AfwD/wH8A/8B/AP/AfwD/wH8A/8B/AP/AQACAgH/Aa4BaAFvAf8BrgFoAW8B/4wAAz4B/wMA
+        Af8DDAH/AwwB/wEdAiUB/wElAjUB/wM+Af8BZwFvAXcB/wFnAW8BdwH/AWcBbwF3Af8MAAGuAWgBbwH/
+        Aa4BaAFvAf8BrgFoAW8B/wGuAWgBbwH/Aa4BaAFvAf8BKAEmASQB/wEAAgIB/wEoASYBJAH/AZMBngGc
+        Af8B/AP/AfwD/wH8A/8B/AP/AQACAgH/Aa4BaAFvAf8BrgFoAW8B/5AAASUCNQH/ASUCNQH/AwwB/wMM
+        Af8DDAH/AR0CJQH/Az4B/wM+Af8QAAGuAWgBbwH/Aa4BaAFvAf8BrgFoAW8B/wGuAWgBbwH/Aa4BaAFv
+        Af8BrgFoAW8B/wGuAWgBbwH/ASgBJgEkAf8BAAICAf8BIAESARYB/wFzAmoB/wHLAdEBygH/AfwD/wEA
+        AgIB/wGuAWgBbwH/Aa4BaAFvAf+YAAFnAW8BdwH/AWcBbwF3Af8BZwFvAXcB/wFnAW8BdwH/HAABrgFo
+        AW8B/wGuAWgBbwH/Aa4BaAFvAf8BrgFoAW8B/wGuAWgBbwH/Aa4BaAFvAf8BrgFoAW8B/wGuAWgBbwH/
+        Aa4BaAFvAf8BIAESARYB/wEAAgIB/wFFAUgBQwH/ASgBJgEkAf8BrgFoAW8B/4gAA8AB/wNwAf8DcAH/
        A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8EAAMLAQ8DFAEbAx0BKQMi
-        ATIBTwFSAU8BpgFKAV8BSQHRAUoBXwFJAdEDPAFmBAADPAFmAUoBXwFJAdEBSgFfAUkB0QFKAV8BSQHR
-        AUoBXwFJAdEBTwFSAU8BqQMjATMQAAMnATsBUgFQAU4BlAF3AWoBXAHOAZgBegFZAesBmAF6AVkB6wF3
-        AWoBXAHOAVIBUAFOAZQCAAHiAf8CAAHiAf8MAAGmAowB/wFIAg0B/wFBAgMB/wE9AgAB/wE9AgAB/wE9
-        AgAB/wE9AgAB/wE9AgAB/wE9AgAB/wE9AgAB/wE9AgAB/wE9AgAB/wE9AgAB/wE7AgAB/wE3AgAB/wEX
-        AgAB/wNxAf8DAAH/AxYB/wMtAf8DAAH/AxAB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/
-        A8AB/wPAAf8DBgEIAwoBDgMQARUDEgEZAUwBXgFLAcwBHgHVAQ0B/wEzAZEBLQHvAU0BTgFNAZkEAAFN
-        AU4BTQGZATMBkQEtAe8BHgHVAQ0B/wEeAdUBDQH/AR4B1QENAf8BSgFjAUkB0QMTARoIAAMKAQ0BUgFQ
-        AU4BlgGsAX8BUwH6AeEBzQG5Af8B8QHgAc4B/wH5AecB1gH/AfgB5gHUAf8B8AHdAcwB/wHhAc0BuQH/
-        AgAB4gH/AgAB4gH/AwoBDQgAAb8BhQGGAf8BgwERARMB/wF6AQUBBwH/AXYCAAH/AXYCAAH/A+oB/wPq
-        Af8D6gH/AXYCAAH/A+oB/wPqAf8D6gH/AXYCAAH/AXECAAH/AWwCAAH/ATgCAAH/AwAB/wPADf8DLQH/
-        AxAB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/xAAAU4BXwFLAcwBIQHNARAB/wFK
-        AV4BSQHRAyMBMwQAAyMBMwFKAV4BSQHRAR4BzAENAf8BHgHMAQ0B/wEeAcwBDQH/AU0BZgFJAdEIAAMK
-        AQ0BZgFfAVcBuAHZAb8BpQH/Af4B8gHkAv8B5wHPAf8B/AHbAbsB/wH5AdMBsgH/AfYB0AGsAf8B9AHR
-        Aa4B/wH2AdgBuwH/AgAB4gH/AgAB4gH/AWYBXwFXAbgDCgENBAABwAGCAYMB/wGJARIBFAH/AYMBBgEI
-        Af8BfAIAAf8D9gH/AXwCAAH/AXwCAAH/A/YB/wF8AgAB/wP2Af8BfAIAAf8BfAIAAf8D9gH/AXcCAAH/
-        AXICAAH/ATsCAAH/AwAB/wPAEf8DAAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/
-        ASsBLAErAUMBUQFbAVABuAFRAVsBUAG4ASsBLAErAUMBTgFiAUsBzAElAcQBFAH/AUoBXQFJAdEDPAFm
-        BAADPAFmAUoBXQFJAdEBHgHBAQ0B/wEeAcEBDQH/AR4BwQENAf8BTQFmAUkB0QgAAVIBUAFOAZYB2QG/
-        AaUC/wH4AesC/wHrAdEC/wHhAcMB/wH+AdsBugH/AfsB1gGyAf8CAAHiAf8CAAHiAf8CAAHiAf8CAAHi
-        Af8CAAHiAf8CAAHiAf8CAAHiAf8CAAHiAf8BwgGCAYMB/wGOARMBFQH/AYgBBwEJAf8BhAEAAQEF/wGE
-        AQABAQH/AYQBAAEBBf8BhAEAAQEF/wGEAQABAQH/AYQBAAEBBf8BfAIAAf8BdgIAAf8BPQIAAf8DcQH/
-        AxAB/wNZAf8DsgH/A7IB/wPAAf8DAAH/AxYB/wMAAf8DAAH/AwAB/wMAAf8DFgH/A8AB/wPAAf8DwAH/
-        AVIBWQFQAbIBSwHGAToB/wFJAZoBOwHzAU4BYgFLAcwBRwFrAUQB2QEfAbcBDgH/ATgBhQEvAe8BRwFd
-        AUcB0wFLAVkBSwHMAUcBXQFHAdMBNAGDAS4B7wEgAbcBDwH/AR8BtgEOAf8BHgG2AQ0B/wFNAWYBSQHR
-        BAADJgE4AbUBhwFUAf0C/gH6Av8B+QHpAv8B7wHYAv8B5wHNAv8B4QHCAf8B/AHcAbsB/wIAAeIB/wIA
-        AeIB/wIAAeIB/wIAAeIB/wIAAeIB/wIAAeIB/wIAAeIB/wIAAeIB/wHCAYIBgwH/AY4BEwEVAf8BiAEH
-        AQkB/wGEAQABAQH/AYQBAAEBDf8BhAEAAQEN/wGEAQABAQH/AXwCAAH/AXYCAAH/AT0CAAH/A8AB/wNx
-        Af8DEAH/AwAB/wMABf8DAAH/AxAB/wOWCf8DhgH/AxYB/wMWAf8DwAH/A8AB/wFOAWQBSwHMAUoBxQE5
-        Af8BQAG7AS8B/wFJAcQBOAH/AT8BvQEuAf8BHgGrAQ0B/wEgAawBDwH/ASQBrwETAf8BJAGvARMB/wEj
-        Aa8BEgH/ATgBhwEvAe8BSgFmAUkB0QFKAWYBSQHRATQBhgEuAe8BTQFmAUkB0QQAAVIBUAFOAZYB4gHO
-        AboB/wH3Ad4BxgL/AekB0QL/AfYB4gL/AfIB3QL/AfAB3QH/AfgB6gHZAf8B+AHmAdQB/wH7Ad8BxwH/
-        AfUBzwGrAf8CAAHiAf8CAAHiAf8B+AHdAcMB/wHiAc4BugH/AVIBUAFOAZYBwgGCAYMB/wGOARMBFQH/
-        AYgBBwEJAf8BhAEAAQEB/wGEAQABAQH/AYQBAAEBAf8BhAEAAQEF/wGEAQABAQX/AYQBAAEBAf8BhAEA
-        AQEB/wGEAQABAQH/AXwCAAH/AXYCAAH/AT0CAAH/A8AB/wPAAf8DwAH/A8AB/wMABf8DAAH/AxYR/wPA
-        Af8DAAH/A8AB/wPAAf8BUgFaAVABsgFSAc0BQQH/AUwBnwE9AfMBTgFkAUsBzAFNAW8BRwHZATABsAEf
-        Af8BHwGiAQ4B/wEeAaEBDQH/AR4BoQENAf8BJQGoARQB/wFKAWcBRwHTAzwBZgMjATMBTQFOAU0BmQM8
-        AWYEAAF4AWoBWwHQAe8B4AHQAf8B5wG+AZYB/wHnAbwBlAH/AfABzAGpAf8B/gHsAdoB/wHdAcQBrAH/
-        AZEBdwFcAecBkQF3AVwB5wHdAcMBqgH/AfgB3QHEAf8CAAHiAf8CAAHiAf8B9QHWAbgB/wHxAd8BzwH/
-        AXgBagFbAdABwgGCAYMB/wGOARMBFQH/AYgBBwEJAf8BhAEAAQEB/wGEAQABAQH/AYQBAAEBAf8BhAEA
-        AQEF/wGEAQABAQX/AYQBAAEBAf8BhAEAAQEB/wGEAQABAQH/AXwCAAH/AXYCAAH/AT0CAAH/A1kB/wNZ
-        Af8DWQH/A1kB/wMABf8DAAH/AwAB/wMtAf8DwA3/AwAB/wNZAf8DWQH/ASsBLAErAUMBUQFcAVABuAFR
-        AVwBUAG4ASsBLAErAUMBTgFmAUsBzAFMAccBOwH/ATsBtwEqAf8BMQGtASAB/wEnAaQBFgH/AS4BqgEd
-        Af8BSwFiAUsBzBQAAZgBegFZAewB9QHkAdUB/wHpAb4BlwH/AegBvAGWAf8B5wG8AZQB/wHzAd4BygH/
-        AZIBdwFZAeYDFAEbAxQBGwGSAXcBWQHmAfYB4wHTAf8CAAHiAf8CAAHiAf8B7QHJAaQB/wH2AeQB0gH/
-        AZgBegFZAewBwgGCAYMB/wGOARMBFQH/AYgBBwEJAf8BhAEAAQEB/wGEAQABAQH/AYQBAAEBAf8BhAEA
-        AQEB/wGEAQABAQH/AYQBAAEBAf8BhAEAAQEB/wGEAQABAQH/AYQBAAEBAf8BhAEAAQEB/wF8AgAB/wF2
-        AgAB/wE9AgAB/wNZAf8DWQH/A1kB/wNZAf8DAAX/AwAB/wMzAf8DEAH/AwAB/wMAAf8DAAX/AwAB/wNZ
-        Af8DWQH/EAABTgFmAUsBzAFPAcoBPgH/AUEBvAEwAf8BQQG8ATAB/wFBAbwBMAH/AUkBxAE4Af8BSwFn
-        AUsB0wM8AWYDIwEzAU0BTgFNAZkDPAFmBAABmAF6AVkB7AH1AeQB1QH/AekBvwGZAf8B6QHAAZkB/wHp
-        AcEBmgH/AfMB3QHJAf8BkgF3AVkB5gMUARsDFAEbAZIBdwFZAeYB+AHoAdkB/wHyAdIBsgH/AfABzAGr
-        Af8B8AHMAasB/wH2AeQB0wH/AZgBegFZAew0/wP2Af8D6gH/A3oB/wNZAf8DWQH/A1kB/wNZAf8DAAX/
-        AxAB/wMAAf8DFgH/AzMB/wMzAf8DAAX/AwAB/wNZAf8DWQH/EAABTgFmAUsBzAFUAc8BQwH/AUYBwQE1
-        Af8BRgHBATUB/wFGAcEBNQH/AUgBwwE3Af8BSwGVAUIB7wFKAWYBSgHRAUoBZgFKAdEBSwGUAUIB7wFO
-        AWYBSwHMBAABeAFqAVsB0AHwAeEB0QH/AeoBxAGhAf8B6QHBAZsB/wHpAcABlwH/AfEBzgGyAf8B3AHD
-        AaoB/wGRAXcBXAHnAZEBdwFcAecB3QHEAawC/wH8AfMC/wH0AeUC/wHuAdoB/wH8AeUB0QH/AfEB4QHR
-        Af8BeAFqAVsB0AT/AY4BEwEVCf8BhAEAAQEN/wGEAQABAQH/AYQBAAEBDf8BfAIAAf8BdgIAAf8DegH/
-        A1kB/wNZAf8DWQH/A1kB/wMACf8DhgH/AxYB/wMAAf8DEAH/AwAF/wMAAf8DWQH/A1kB/xAAAU4BZgFL
-        AcwBYQHcAVAB/wFZAdQBSAH/AVgB0wFHAf8BVwHSAUYB/wFRAcwBQAH/AUsBxgE6Af8BUwHOAUIB/wFc
-        AdcBSwH/AVoB1QFJAf8BTgFmAUsBzAQAAVIBUAFOAZYB4gHOAboB/wHxAdIBtgH/AesBwQGbAf8B6wG/
-        AZkC/wHkAdMC/wHoAdsB/wHzAdoBxwH/AfgB8QHkAv8B+AHtAv8B9wHpAv8B/gHxAv8B/AHvAv8B/AHy
-        Af8B4gHOAboB/wFSAVABTgGWBP8BjgETARUJ/wGEAQABAQn/AYQBAAEBEf8BhAEAAQEB/wP2Af8D6gH/
-        A3oB/wNZAf8DWQH/A1kB/wNZAf8DAAH/A7IN/wPAAf8DRwH/AwAF/wMAAf8DWQH/A1kB/xAAAU0BUAFN
-        AZkBTwFpAUsBzAFPAWkBSwHMAU8BaQFLAcwBTwFpAUsBzAFNAXQBSQHZAVcB0gFGAf8BTQF0AUcB2QFP
-        AWkBSwHMAU8BaQFLAcwBTQFQAU0BmQQAAyYBOAG1AYcBVAH9AfoB7QHhAf8B7AHHAaMC/wHsAdoF/wH3
-        Ac0BtgH/AewBvQGXAv8B9AHcA/8B9wL/AfcB6AP/AfMD/wH5Af8C/gH5Af8BtQGHAVQB/QMmATgE/wGO
-        ARMBFQn/AYQBAAEBCf8BhAEAAQEB/wGEAQABAQH/AYQBAAEBAf8BhAEAAQEF/wGEAQABAQH/AXwCAAH/
-        AXYCAAH/AT0CAAH/A1kB/wNZAf8DWQH/A1kB/wMWAf8DLQH/A7IZ/wMAAf8DWQH/A1kB/yAAASsBLAEr
-        AUMBTwFpAUsBzAFiAd0BUQH/AU8BaQFLAcwBKwEsASsBQxAAAVIBUAFOAZYB2QG/AaUC/wH6AfAG/wH9
-        AfMB/wHwAcEBowH/Ae4BxgGgAf8B/QHwAdED/wH+Av8B/QHwAv8B/QHxBf8B2QG/AaUB/wFSAVABTgGW
-        BAAE/wGOARMBFQH/AYgBBwEJBf8BhAEAAQEJ/wGEAQABAQn/AYQBAAEBBf8BhAEAAQEB/wP2Af8D6gH/
-        AT0CAAH/A1kB/wNZAf8DWQH/A1kB/wNZAf8DFgH/AwAB/wMWAf8DhhH/AwAB/wNZAf8DWQH/IAABUgFe
-        AVABuAFcAa8BTAHzAV0B2AFMAf8BWwGvAUwB8wFSAV4BUAG4EAADCgENAWYBXwFXAbgB2QG/AaUB/wH+
-        Af0B/AL/AfEB5AH/AfIBygGuAf8B8gHSAa0B/wH5Ae0ByAP/AfcD/wH9Af8B/gH9AfwB/wHZAb8BpQH/
-        AWYBXwFXAbgDCgENBAAE/wGRARoBHAn/AYgBBwEJAf8BiAEHAQkJ/wGIAQcBCQH/AYgBBwEJDf8BgwEG
-        AQgB/wF6AQUBBwH/A4AB/wNZAf8DWQH/A1kB/wNZAf8DWQH/A1kB/wNZAf8DFgH/AwAB/wMQAf8DWQH/
-        A8AF/wMAAf8DWQH/A1kB/yAAAVIBXgFQAbgBbgHpAV0B/wFpAeQBWAH/AW0B6AFcAf8BUgFeAVABuBQA
-        AwoBDQFSAVABTgGWAawBfwFTAfoB4QHNAbkB/wHxAeIB1AH/AfkB7AHfAf8B+wHzAeUB/wH0Ae0B5AH/
-        AeIBzgG7Af8BrAF/AVMB+gFSAVABTgGWAwoBDQgABP8BlQEkASYt/wP3Af8D7AH/A4IB/wQAA1kB/wNZ
-        Af8DWQH/A1kB/wNZAf8DWQH/A1kB/wNZAf8DWQH/AxAB/wMAAf8DLQH/AxYB/wNZAf8kAAErASwBKwFD
-        AVIBXAFQAbIBTwFpAUsBzAFSAVwBUAGyASsBLAErAUMcAAMnATsBUgFQAU4BlAF3AWoBXAHOAZgBegFZ
-        AesBmwF7AVgB7wGAAW8BWwHZAVMBUAFPAZcDJwE7EAAI/wHDAYUBhin/A/wB/wP3Af8DvwH//wAFAAGZ
-        AswB/wFgAswB/wFgAswB/wFgAswB/wFgAswB/wFgAswB/wFgAswB/wPqAf8gAAGkAqAB/wNgAf8DzAH/
-        tAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/AZkD/wFgAswB/wFgAswB/wPxAf8gAAPXAf8DYAH/CAADmQH/
-        A1kB/wNPAf8DTwH/AzwB/wMzAf8DLQH/AyMB/wOGAf8MAAGZAswB/wFgAswB/wFgAswB/wFgAswB/wFg
-        AswB/wFgAswB/wFgAswB/wFgAswB/wFgAswB/wPqAf8YAAGZAswB/wFgAswB/wFgAswB/wFgAswB/wFg
-        AswB/wFgAswB/wFgAswB/wFgAswB/wFgAswB/wPqAf8UAAGZAswB/wGZA/8BmQP/AZkD/wGZA/8BmQP/
-        AWACzAH/AZkBzAL/AS0CmQH/AWACzAH/AWACzAH/AZkCzAH/EAAD6gH/A2AB/wPqAf8IAANZAf8DYAH/
-        A08B/wM8Af8DPAH/A08B/wNgAf8DcQH/AyMB/wwAAZkCzAH/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
-        AZkD/wFgAswB/wFgAswB/wPxAf8UAAGZAswB/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BYALM
-        Af8BYALMAf8D8QH/EAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/AZkD/wFgAswB/wFgAswB/wFgAswB/wEt
-        AswB/wGZA/8BmQLMAf8QAAOyAf8DhgH/A4YB/wgAAaQCoAH/A2AB/wNZAf8DWQH/A1kB/wNPAf8DTwH/
-        AzwB/wOGAf8MAAGZAswB/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BYALMAf8BmQHMAv8BYALM
-        Af8D8QH/EAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AWACzAH/AZkBzAL/AWACzAH/
-        A/EB/wwAAZkCzAH/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BLQLMAf8BmQP/AS0CmQH/
-        AWACzAH/AZkCzAH/TAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AWACzAH/AWACzAH/
-        AWACzAH/AZkCzAH/EAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AWACzAH/AWACzAH/
-        AWACzAH/AZkCzAH/DAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wEtAswB/wGZ
-        A/8BLQLMAf8BmQP/AZkCzAH/CAADcQH/A3EB/wNgAf84AAGZAswB/wGZA/8BmQP/AZkD/wGZA/8BmQP/
-        AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQLMAf8QAAGZAswB/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZ
-        A/8BmQP/AZkD/wGZA/8BmQLMAf8MAAGZAswB/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
-        AS0CzAH/AZkD/wEtAswB/wGZA/8BmQLMAf8IAAPxAf8DlgX/CAABpAKgAf8DYAH/A2AB/wNgAf8DYAH/
-        A2AB/wNZAf8DWQH/A5kB/wwAAZkCzAH/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
-        AZkD/wGZAswB/xAAAZkCzAH/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZ
-        AswB/wwAAZkCzAH/AcwD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BLQLMAf8BmQP/AS0CzAH/
-        AZkD/wGZAswB/wwAA/EB/wOWAf8IAANgAf8DYAH/A08B/wNHAf8DPAH/A08B/wNgAf8DcQH/A1kB/wwA
-        AZkCzAH/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZAswB/xAAAZkCzAH/
-        AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZAswB/wwAAcYB1gHvAf8BzAP/
-        AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wEtAswB/wGZA/8BLQLMAf8BmQP/AZkCzAH/CAADsgH/
-        A4YB/wOyAf8IAAOyAf8DcQH/A2AB/wNgAf8DYAH/A2AB/wNgAf8DYAH/AaQCoAH/DAABmQLMAf8BmQP/
-        AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkCzAH/EAABmQLMAf8BmQP/AZkD/wGZ
-        A/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8CmQFgAf8BmQHMAZkB/wwAAcYB1gHvAf8BzAP/AcwD/wHM
-        A/8BmQP/AZkD/wGZA/8BmQP/AZkD/wEtAswB/wGZA/8BLQLMAf8BmQP/AZkCzAH/TAABmQLMAf8BzAP/
+        ATIBUQFSAVEBpgFQAV4BUAHRAVABXgFQAdEDPAFmBAADPAFmAVABXgFQAdEBUAFeAVAB0QFQAV4BUAHR
+        AVABXgFQAdEBUQFSAVEBqQMjATMQAAMnATsBTwJOAZQBbgFmAVwBzgGQAXcBWQHrAZABdwFZAesBbgFm
+        AVwBzgFPAk4BlAIAAeIB/wIAAeIB/wwAAaYCjAH/AUcCDAH/AUACAgH/ATwCAAH/ATwCAAH/ATwCAAH/
+        ATwCAAH/ATwCAAH/ATwCAAH/ATwCAAH/ATwCAAH/ATwCAAH/ATwCAAH/AToCAAH/ATYCAAH/ARYCAAH/
+        A3AB/wMAAf8DFQH/AywB/wMAAf8DDwH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/
+        A8AB/wMGAQgDCgEOAxABFQMSARkBUgFcAVEBzAEdAdUBDAH/ATgBjAEyAe8DTgGZBAADTgGZATgBjAEy
+        Ae8BHQHVAQwB/wEdAdUBDAH/AR0B1QEMAf8BUAFgAVAB0QMTARoIAAMKAQ0BTwJOAZYBqQF+AVIB+gHh
+        Ac0BuQH/AfEB4AHOAf8B+QHnAdYB/wH4AeYB1AH/AfAB3QHMAf8B4QHNAbkB/wIAAeIB/wIAAeIB/wMK
+        AQ0IAAG/AYUBhgH/AYMBEAESAf8BeQEEAQYB/wF1AgAB/wF1AgAB/wPqAf8D6gH/A+oB/wF1AgAB/wPq
+        Af8D6gH/A+oB/wF1AgAB/wFwAgAB/wFrAgAB/wE3AgAB/wMAAf8DwA3/AywB/wMPAf8DwAH/A8AB/wPA
+        Af8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8QAAFSAV4BUQHMASABzQEPAf8BUAFdAVAB0QMjATMEAAMj
+        ATMBUAFdAVAB0QEdAcwBDAH/AR0BzAEMAf8BHQHMAQwB/wFRAWMBUAHRCAADCgENAWABXAFXAbgB2QG/
+        AaUB/wH+AfIB5AL/AecBzwH/AfwB2wG7Af8B+QHTAbIB/wH2AdABrAH/AfQB0QGuAf8B9gHYAbsB/wIA
+        AeIB/wIAAeIB/wFgAVwBVwG4AwoBDQQAAcABggGDAf8BiQERARMB/wGDAQUBBwH/AXsCAAH/A/YB/wF7
+        AgAB/wF7AgAB/wP2Af8BewIAAf8D9gH/AXsCAAH/AXsCAAH/A/YB/wF2AgAB/wFxAgAB/wE6AgAB/wMA
+        Af8DwBH/AwAB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wErASwBKwFDAVQBWQFU
+        AbgBVAFZAVQBuAErASwBKwFDAVIBXwFRAcwBJAHEARMB/wFQAVwBUAHRAzwBZgQAAzwBZgFQAVwBUAHR
+        AR0BwQEMAf8BHQHBAQwB/wEdAcEBDAH/AVEBYwFQAdEIAAFPAk4BlgHZAb8BpQL/AfgB6wL/AesB0QL/
+        AeEBwwH/Af4B2wG6Af8B+wHWAbIB/wIAAeIB/wIAAeIB/wIAAeIB/wIAAeIB/wIAAeIB/wIAAeIB/wIA
+        AeIB/wIAAeIB/wHCAYIBgwH/AY4BEgEUAf8BiAEGAQgB/wGEAgAF/wGEAgAB/wGEAgAF/wGEAgAF/wGE
+        AgAB/wGEAgAF/wF7AgAB/wF1AgAB/wE8AgAB/wNwAf8DDwH/A1gB/wOyAf8DsgH/A8AB/wMAAf8DFQH/
+        AwAB/wMAAf8DAAH/AwAB/wMVAf8DwAH/A8AB/wPAAf8BVAFWAVMBsgFKAcYBOQH/AUsBlQE9AfMBUgFf
+        AVEBzAFNAWYBSwHZAR4BtwENAf8BPAGBATQB7wFOAV0BTgHTAVEBWQFRAcwBTgFdAU4B0wE5AX8BMwHv
+        AR8BtwEOAf8BHgG2AQ0B/wEdAbYBDAH/AVEBYwFQAdEEAAMmATgBtAGHAVMB/QL+AfoC/wH5AekC/wHv
+        AdgC/wHnAc0C/wHhAcIB/wH8AdwBuwH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/
+        AgAB4gH/AgAB4gH/AcIBggGDAf8BjgESARQB/wGIAQYBCAH/AYQCAAH/AYQCAA3/AYQCAA3/AYQCAAH/
+        AXsCAAH/AXUCAAH/ATwCAAH/A8AB/wNwAf8DDwH/AwAB/wMABf8DAAH/Aw8B/wOWCf8DhgH/AxUB/wMV
+        Af8DwAH/A8AB/wFSAWEBUQHMAUkBxQE4Af8BPwG7AS4B/wFIAcQBNwH/AT4BvQEtAf8BHQGrAQwB/wEf
+        AawBDgH/ASMBrwESAf8BIwGvARIB/wEiAa8BEQH/ATwBgwE0Ae8BUAFjAVAB0QFQAWMBUAHRATkBggEz
+        Ae8BUQFjAVAB0QQAAU8CTgGWAeIBzgG6Af8B9wHeAcYC/wHpAdEC/wH2AeIC/wHyAd0C/wHwAd0B/wH4
+        AeoB2QH/AfgB5gHUAf8B+wHfAccB/wH1Ac8BqwH/AgAB4gH/AgAB4gH/AfgB3QHDAf8B4gHOAboB/wFP
+        Ak4BlgHCAYIBgwH/AY4BEgEUAf8BiAEGAQgB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAF/wGEAgAF/wGE
+        AgAB/wGEAgAB/wGEAgAB/wF7AgAB/wF1AgAB/wE8AgAB/wPAAf8DwAH/A8AB/wPAAf8DAAX/AwAB/wMV
+        Ef8DwAH/AwAB/wPAAf8DwAH/AVQBWAFTAbIBUQHNAUAB/wFMAZoBPwHzAVIBYQFRAcwBUgFpAU0B2QEv
+        AbABHgH/AR4BogENAf8BHQGhAQwB/wEdAaEBDAH/ASQBqAETAf8BTwFiAU4B0wM8AWYDIwEzA04BmQM8
+        AWYEAAFwAWUBWwHQAe8B4AHQAf8B5wG+AZYB/wHnAbwBlAH/AfABzAGpAf8B/gHsAdoB/wHdAcQBrAH/
+        AYgBdAFcAecBiAF0AVwB5wHdAcMBqgH/AfgB3QHEAf8CAAHiAf8CAAHiAf8B9QHWAbgB/wHxAd8BzwH/
+        AXABZQFbAdABwgGCAYMB/wGOARIBFAH/AYgBBgEIAf8BhAIAAf8BhAIAAf8BhAIAAf8BhAIABf8BhAIA
+        Bf8BhAIAAf8BhAIAAf8BhAIAAf8BewIAAf8BdQIAAf8BPAIAAf8DWAH/A1gB/wNYAf8DWAH/AwAF/wMA
+        Af8DAAH/AywB/wPADf8DAAH/A1gB/wNYAf8BKwEsASsBQwFUAVkBVAG4AVQBWQFUAbgBKwEsASsBQwFS
+        AWIBUQHMAUsBxwE6Af8BOgG3ASkB/wEwAa0BHwH/ASYBpAEVAf8BLQGqARwB/wFRAV8BUQHMFAABkQF3
+        AVkB7AH1AeQB1QH/AekBvgGXAf8B6AG8AZYB/wHnAbwBlAH/AfMB3gHKAf8BigFyAVkB5gMUARsDFAEb
+        AYoBcgFZAeYB9gHjAdMB/wIAAeIB/wIAAeIB/wHtAckBpAH/AfYB5AHSAf8BkQF3AVkB7AHCAYIBgwH/
+        AY4BEgEUAf8BiAEGAQgB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGEAgAB/wGE
+        AgAB/wGEAgAB/wGEAgAB/wF7AgAB/wF1AgAB/wE8AgAB/wNYAf8DWAH/A1gB/wNYAf8DAAX/AwAB/wMy
+        Af8DDwH/AwAB/wMAAf8DAAX/AwAB/wNYAf8DWAH/EAABUgFiAVEBzAFOAcoBPQH/AUABvAEvAf8BQAG8
+        AS8B/wFAAbwBLwH/AUgBxAE3Af8BTwFiAU8B0wM8AWYDIwEzA04BmQM8AWYEAAGRAXcBWQHsAfUB5AHV
+        Af8B6QG/AZkB/wHpAcABmQH/AekBwQGaAf8B8wHdAckB/wGKAXIBWQHmAxQBGwMUARsBigFyAVkB5gH4
+        AegB2QH/AfIB0gGyAf8B8AHMAasB/wHwAcwBqwH/AfYB5AHTAf8BkQF3AVkB7DT/A/YB/wPqAf8DeQH/
+        A1gB/wNYAf8DWAH/A1gB/wMABf8DDwH/AwAB/wMVAf8DMgH/AzIB/wMABf8DAAH/A1gB/wNYAf8QAAFS
+        AWIBUQHMAVMBzwFCAf8BRQHBATQB/wFFAcEBNAH/AUUBwQE0Af8BRwHDATYB/wFMAY8BRgHvAVABYwFQ
+        AdEBUAFjAVAB0QFMAY4BRgHvAVIBYgFRAcwEAAFwAWUBWwHQAfAB4QHRAf8B6gHEAaEB/wHpAcEBmwH/
+        AekBwAGXAf8B8QHOAbIB/wHcAcMBqgH/AYgBdAFcAecBiAF0AVwB5wHdAcQBrAL/AfwB8wL/AfQB5QL/
+        Ae4B2gH/AfwB5QHRAf8B8QHhAdEB/wFwAWUBWwHQBP8BjgESARQJ/wGEAgAN/wGEAgAB/wGEAgAN/wF7
+        AgAB/wF1AgAB/wN5Af8DWAH/A1gB/wNYAf8DWAH/AwAJ/wOGAf8DFQH/AwAB/wMPAf8DAAX/AwAB/wNY
+        Af8DWAH/EAABUgFiAVEBzAFgAdwBTwH/AVgB1AFHAf8BVwHTAUYB/wFWAdIBRQH/AVABzAE/Af8BSgHG
+        ATkB/wFSAc4BQQH/AVsB1wFKAf8BWQHVAUgB/wFSAWIBUQHMBAABTwJOAZYB4gHOAboB/wHxAdIBtgH/
+        AesBwQGbAf8B6wG/AZkC/wHkAdMC/wHoAdsB/wHzAdoBxwH/AfgB8QHkAv8B+AHtAv8B9wHpAv8B/gHx
+        Av8B/AHvAv8B/AHyAf8B4gHOAboB/wFPAk4BlgT/AY4BEgEUCf8BhAIACf8BhAIAEf8BhAIAAf8D9gH/
+        A+oB/wN5Af8DWAH/A1gB/wNYAf8DWAH/AwAB/wOyDf8DwAH/A0YB/wMABf8DAAH/A1gB/wNYAf8QAANO
+        AZkBUgFkAVEBzAFSAWQBUQHMAVIBZAFRAcwBUgFkAVEBzAFSAW8BTQHZAVYB0gFFAf8BUgFvAU0B2QFS
+        AWQBUQHMAVIBZAFRAcwDTgGZBAADJgE4AbQBhwFTAf0B+gHtAeEB/wHsAccBowL/AewB2gX/AfcBzQG2
+        Af8B7AG9AZcC/wH0AdwD/wH3Av8B9wHoA/8B8wP/AfkB/wL+AfkB/wG0AYcBUwH9AyYBOAT/AY4BEgEU
+        Cf8BhAIACf8BhAIAAf8BhAIAAf8BhAIAAf8BhAIABf8BhAIAAf8BewIAAf8BdQIAAf8BPAIAAf8DWAH/
+        A1gB/wNYAf8DWAH/AxUB/wMsAf8Dshn/AwAB/wNYAf8DWAH/IAABKwEsASsBQwFSAWQBUQHMAWEB3QFQ
+        Af8BUgFkAVEBzAErASwBKwFDEAABTwJOAZYB2QG/AaUC/wH6AfAG/wH9AfMB/wHwAcEBowH/Ae4BxgGg
+        Af8B/QHwAdED/wH+Av8B/QHwAv8B/QHxBf8B2QG/AaUB/wFPAk4BlgQABP8BjgESARQB/wGIAQYBCAX/
+        AYQCAAn/AYQCAAn/AYQCAAX/AYQCAAH/A/YB/wPqAf8BPAIAAf8DWAH/A1gB/wNYAf8DWAH/A1gB/wMV
+        Af8DAAH/AxUB/wOGEf8DAAH/A1gB/wNYAf8gAAFUAVsBVAG4AV0BqAFMAfMBXAHYAUsB/wFcAagBTAHz
+        AVQBWwFUAbgQAAMKAQ0BYAFcAVcBuAHZAb8BpQH/Af4B/QH8Av8B8QHkAf8B8gHKAa4B/wHyAdIBrQH/
+        AfkB7QHIA/8B9wP/Af0B/wH+Af0B/AH/AdkBvwGlAf8BYAFcAVcBuAMKAQ0EAAT/AZEBGQEbCf8BiAEG
+        AQgB/wGIAQYBCAn/AYgBBgEIAf8BiAEGAQgN/wGDAQUBBwH/AXkBBAEGAf8DgAH/A1gB/wNYAf8DWAH/
+        A1gB/wNYAf8DWAH/A1gB/wMVAf8DAAH/Aw8B/wNYAf8DwAX/AwAB/wNYAf8DWAH/IAABVAFbAVQBuAFt
+        AekBXAH/AWgB5AFXAf8BbAHoAVsB/wFUAVsBVAG4FAADCgENAU8CTgGWAakBfgFSAfoB4QHNAbkB/wHx
+        AeIB1AH/AfkB7AHfAf8B+wHzAeUB/wH0Ae0B5AH/AeIBzgG7Af8BqQF+AVIB+gFPAk4BlgMKAQ0IAAT/
+        AZUBIwElLf8D9wH/A+wB/wOCAf8EAANYAf8DWAH/A1gB/wNYAf8DWAH/A1gB/wNYAf8DWAH/A1gB/wMP
+        Af8DAAH/AywB/wMVAf8DWAH/JAABKwEsASsBQwFUAVkBUwGyAVIBZAFRAcwBVAFZAVMBsgErASwBKwFD
+        HAADJwE7AU8CTgGUAW4BZgFcAc4BkAF3AVkB6wGTAXYBWAHvAXcBaQFbAdkBUAJPAZcDJwE7EAAI/wHD
+        AYUBhin/A/wB/wP3Af8DvwH//wAFAAGZAswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wFf
+        AswB/wPqAf8gAAGkAqAB/wNfAf8DzAH/tAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/AZkD/wFfAswB/wFf
+        AswB/wPxAf8gAAPXAf8DXwH/CAADmQH/A1gB/wNOAf8DTgH/AzsB/wMyAf8DLAH/AyIB/wOGAf8MAAGZ
+        AswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wPqAf8YAAGZ
+        AswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wFfAswB/wPqAf8UAAGZ
+        AswB/wGZA/8BmQP/AZkD/wGZA/8BmQP/AV8CzAH/AZkBzAL/ASwCmQH/AV8CzAH/AV8CzAH/AZkCzAH/
+        EAAD6gH/A18B/wPqAf8IAANYAf8DXwH/A04B/wM7Af8DOwH/A04B/wNfAf8DcAH/AyIB/wwAAZkCzAH/
+        AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wFfAswB/wFfAswB/wPxAf8UAAGZAswB/wGZA/8BmQP/
+        AZkD/wGZA/8BmQP/AZkD/wGZA/8BXwLMAf8BXwLMAf8D8QH/EAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/
+        AZkD/wFfAswB/wFfAswB/wFfAswB/wEsAswB/wGZA/8BmQLMAf8QAAOyAf8DhgH/A4YB/wgAAaQCoAH/
+        A18B/wNYAf8DWAH/A1gB/wNOAf8DTgH/AzsB/wOGAf8MAAGZAswB/wGZA/8BmQP/AZkD/wGZA/8BmQP/
+        AZkD/wGZA/8BXwLMAf8BmQHMAv8BXwLMAf8D8QH/EAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZ
+        A/8BmQP/AV8CzAH/AZkBzAL/AV8CzAH/A/EB/wwAAZkCzAH/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
+        AZkD/wGZA/8BLALMAf8BmQP/ASwCmQH/AV8CzAH/AZkCzAH/TAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/
+        AZkD/wGZA/8BmQP/AV8CzAH/AV8CzAH/AV8CzAH/AZkCzAH/EAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/
+        AZkD/wGZA/8BmQP/AV8CzAH/AV8CzAH/AV8CzAH/AZkCzAH/DAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/
+        AZkD/wGZA/8BmQP/AZkD/wEsAswB/wGZA/8BLALMAf8BmQP/AZkCzAH/CAADcAH/A3AB/wNfAf84AAGZ
+        AswB/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQLMAf8QAAGZAswB/wGZ
+        A/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQLMAf8MAAGZAswB/wGZA/8BmQP/
+        AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/ASwCzAH/AZkD/wEsAswB/wGZA/8BmQLMAf8IAAPxAf8DlgX/
+        CAABpAKgAf8DXwH/A18B/wNfAf8DXwH/A18B/wNYAf8DWAH/A5kB/wwAAZkCzAH/AZkD/wGZA/8BmQP/
+        AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZAswB/xAAAZkCzAH/AZkD/wGZA/8BmQP/AZkD/wGZ
+        A/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZAswB/wwAAZkCzAH/AcwD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
+        AZkD/wGZA/8BLALMAf8BmQP/ASwCzAH/AZkD/wGZAswB/wwAA/EB/wOWAf8IAANfAf8DXwH/A04B/wNG
+        Af8DOwH/A04B/wNfAf8DcAH/A1gB/wwAAZkCzAH/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZ
+        A/8BmQP/AZkD/wGZAswB/xAAAZkCzAH/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
+        AZkD/wGZAswB/wwAAcYB1gHvAf8BzAP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wEsAswB/wGZ
+        A/8BLALMAf8BmQP/AZkCzAH/CAADsgH/A4YB/wOyAf8IAAOyAf8DcAH/A18B/wNfAf8DXwH/A18B/wNf
+        Af8DXwH/AaQCoAH/DAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
+        AZkCzAH/EAABmQLMAf8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8CmQFfAf8BmQHM
+        AZkB/wwAAcYB1gHvAf8BzAP/AcwD/wHMA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wEsAswB/wGZA/8BLALM
+        Af8BmQP/AZkCzAH/TAABmQLMAf8BzAP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
+        AZkCzAH/EAABmQLMAf8BzAP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQFfASwB/wGZ
+        AV8BLAH/A+MB/wgAAdYC5wH/AcYB1gHvAf8BXwLMAf8BXwLMAf8BXwLMAf8BXwLMAf8BXwLMAf8BXwLM
+        Af8BXwLMAf8BXwLMAf8BmQP/ASwCzAH/AZkD/wGZAswB/wgAA4YB/wOGAf8DhgH/OAABmQLMAf8BzAP/
        AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkCzAH/EAABmQLMAf8BzAP/AZkD/wGZ
-        A/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQFgAS0B/wGZAWABLQH/A+MB/wgAAdYC5wH/AcYB1gHv
-        Af8BYALMAf8BYALMAf8BYALMAf8BYALMAf8BYALMAf8BYALMAf8BYALMAf8BYALMAf8BmQP/AS0CzAH/
-        AZkD/wGZAswB/wgAA4YB/wOGAf8DhgH/OAABmQLMAf8BzAP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
-        AZkD/wGZA/8BmQP/AZkCzAH/EAABmQLMAf8BzAP/AZkD/wGZA/8BmQP/AZkD/wKZAWAB/wHMAZkBLQH/
-        AcwBmQEtAf8BzAGZAS0B/wHMAZkBLQL/AcwBLQH/AcwBmQFgAf8D4wH/DAABxgHWAe8B/wHMA/8BzAP/
-        AcwD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AS0CzAH/AZkD/wGZAswB/wwAA4YB/wwAA7IB/wOGAf8DcQH/
-        A3EB/wNxAf8DcQH/A2AB/wNgAf8BpAKgAf8MAAHGAdYB7wH/AcwD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
-        AZkD/wGZA/8BmQP/AZkD/wHGAdYB7wH/EAABxgHWAe8B/wHMA/8BmQP/AZkD/wGZA/8BmQP/AcwBmQEt
-        Av8BzAGZAv8BzAFgAv8BzAFgAv8BzAFgAv8BzAFgAv8BzAFgAf8BzAGZAWAB/wwAAdYC5wH/AcYB1gHv
-        Af8BYALMAf8BYALMAf8BYALMAf8BYALMAf8BYALMAf8BYALMAf8BYALMAf8BYALMAf8BmQP/AcYB1gHv
-        Af8MAAOGAf8MAAOGAf8DYAH/A08B/wNPAf8DRwH/A0cB/wNPAf8DYAH/A2AB/wwAAcYB1gHvAf8BzAP/
-        AcwD/wHMA/8BzAP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AcYB1gHvAf8QAAHGAdYB7wH/AcwD/wHM
-        A/8BzAP/AcwD/wGZA/8CzAGZAf8BzAGZAWAB/wHMAZkBYAH/AcwBmQFgAf8BzAGZAWAC/wHMAZkB/wHM
-        AZkBYAH/A+MB/xQAAcYB1gHvAf8BzAP/AcwD/wHMA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wHGAdYB7wH/
-        CAADsgH/A4YB/wwAA7IB/wOGAf8DhgH/A4YB/wOGAf8DcQH/A3EB/wNxAf8DsgH/DAAB1gLnAf8BxgHW
-        Ae8B/wHGAdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHGAdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHGAdYB7wH/
-        AcYB1gHvAf8BxgHWAe8B/wHWAucB/xAAAdYC5wH/AcYB1gHvAf8BxgHWAe8B/wHGAdYB7wH/AcYB1gHv
-        Af8BxgHWAe8B/wHGAdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHGAdYB7wH/AcwBmQFgAf8BzAGZAWAB/wPq
-        Af8YAAHWAucB/wHGAdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHGAdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHG
-        AdYB7wH/AcYB1gHvAf8B1gLnAf+0AAHwAcoBpgH/A+oB/wgAAUIBTQE+BwABPgMAASgDAAFAAwABMAMA
-        AQEBAAEBBQABgAEBFgAD/wEAAfwBPwGAAQEEAAHwAQ8GAAHgAQcGAAHAAQMGAAGAAQEGAAGAAQEmAAGA
-        AQEGAAGAAQEGAAHAAQMGAAHgAQcGAAHwAQ8GAAH8AT8BgAEBBAABgAEBAQABgAHwAQcFAAGAAcABAwQA
-        AfABgQGAAQEFAAGBAYAGAAEBBwABAQcAAQEHAAEfBgAB8AEBBgAB8AEBBgAB8AEBBgAB8AEBBgAB/wEH
-        AYABAQQAAf8BBwGAAQEEAAH/AQcBwAEDAgABgAEBAf8BBwHwAQ8CAAj/AYABfwGPBf8BgAE/AcwBAQHA
-        AQ8BwAEPAYABBwGMAQEBwAEHAcABBwGAAQcBjAEBAcABAwHAAQMBgAEBAv8BwAEDAcABAwGAAQEBjwH/
-        AcABAwHAAQMBgAEBAYwBAQHAAQMBwAEDAYABAQHMAQEBwAEDAcABAwGAAQEBjAEBAcABAwHAAQMBgAEB
-        Av8BwAEDAcABAQGAAQEBjwH/AcABAwHAAQAB4AEBAdwBAQHAAQMBwAEAAeABAQHcAQEBwAEDAcABAAH4
-        AQEBnAEBAcABAwHAAQEB+AEBBf8B8ws=
+        A/8BmQP/AZkD/wKZAV8B/wHMAZkBLAH/AcwBmQEsAf8BzAGZASwB/wHMAZkBLAL/AcwBLAH/AcwBmQFf
+        Af8D4wH/DAABxgHWAe8B/wHMA/8BzAP/AcwD/wGZA/8BmQP/AZkD/wGZA/8BmQP/ASwCzAH/AZkD/wGZ
+        AswB/wwAA4YB/wwAA7IB/wOGAf8DcAH/A3AB/wNwAf8DcAH/A18B/wNfAf8BpAKgAf8MAAHGAdYB7wH/
+        AcwD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/AZkD/wHGAdYB7wH/EAABxgHWAe8B/wHM
+        A/8BmQP/AZkD/wGZA/8BmQP/AcwBmQEsAv8BzAGZAv8BzAFfAv8BzAFfAv8BzAFfAv8BzAFfAv8BzAFf
+        Af8BzAGZAV8B/wwAAdYC5wH/AcYB1gHvAf8BXwLMAf8BXwLMAf8BXwLMAf8BXwLMAf8BXwLMAf8BXwLM
+        Af8BXwLMAf8BXwLMAf8BmQP/AcYB1gHvAf8MAAOGAf8MAAOGAf8DXwH/A04B/wNOAf8DRgH/A0YB/wNO
+        Af8DXwH/A18B/wwAAcYB1gHvAf8BzAP/AcwD/wHMA/8BzAP/AZkD/wGZA/8BmQP/AZkD/wGZA/8BmQP/
+        AcYB1gHvAf8QAAHGAdYB7wH/AcwD/wHMA/8BzAP/AcwD/wGZA/8CzAGZAf8BzAGZAV8B/wHMAZkBXwH/
+        AcwBmQFfAf8BzAGZAV8C/wHMAZkB/wHMAZkBXwH/A+MB/xQAAcYB1gHvAf8BzAP/AcwD/wHMA/8BmQP/
+        AZkD/wGZA/8BmQP/AZkD/wHGAdYB7wH/CAADsgH/A4YB/wwAA7IB/wOGAf8DhgH/A4YB/wOGAf8DcAH/
+        A3AB/wNwAf8DsgH/DAAB1gLnAf8BxgHWAe8B/wHGAdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHGAdYB7wH/
+        AcYB1gHvAf8BxgHWAe8B/wHGAdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHWAucB/xAAAdYC5wH/AcYB1gHv
+        Af8BxgHWAe8B/wHGAdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHGAdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHG
+        AdYB7wH/AcwBmQFfAf8BzAGZAV8B/wPqAf8YAAHWAucB/wHGAdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHG
+        AdYB7wH/AcYB1gHvAf8BxgHWAe8B/wHGAdYB7wH/AcYB1gHvAf8B1gLnAf+0AAHwAcoBpgH/A+oB/wgA
+        AUIBTQE+BwABPgMAASgDAAFAAwABMAMAAQEBAAEBBQABgAEBFgAD/wEAAfwBPwGAAQEEAAHwAQ8GAAHg
+        AQcGAAHAAQMGAAGAAQEGAAGAAQEmAAGAAQEGAAGAAQEGAAHAAQMGAAHgAQcGAAHwAQ8GAAH8AT8BgAEB
+        BAABgAEBAQABgAHwAQcFAAGAAcABAwQAAfABgQGAAQEFAAGBAYAGAAEBBwABAQcAAQEHAAEfBgAB8AEB
+        BgAB8AEBBgAB8AEBBgAB8AEBBgAB/wEHAYABAQQAAf8BBwGAAQEEAAH/AQcBwAEDAgABgAEBAf8BBwHw
+        AQ8CAAj/AYABfwGPBf8BgAE/AcwBAQHAAQ8BwAEPAYABBwGMAQEBwAEHAcABBwGAAQcBjAEBAcABAwHA
+        AQMBgAEBAv8BwAEDAcABAwGAAQEBjwH/AcABAwHAAQMBgAEBAYwBAQHAAQMBwAEDAYABAQHMAQEBwAED
+        AcABAwGAAQEBjAEBAcABAwHAAQMBgAEBAv8BwAEDAcABAQGAAQEBjwH/AcABAwHAAQAB4AEBAdwBAQHA
+        AQMBwAEAAeABAQHcAQEBwAEDAcABAAH4AQEBnAEBAcABAwHAAQEB+AEBBf8B8ws=
 </value>
  </data>
  <data name="bnComboBoxRelease.Location" type="System.Drawing.Point, System.Drawing">
@@ -2398,31 +2395,31 @@
    <value>plainBackgroundPainter1</value>
  </data>
  <data name="&gt;&gt;plainBackgroundPainter1.Type" xml:space="preserve">
-    <value>ProgressODoom.PlainBackgroundPainter, ProgressODoom, Version=1.0.6651.26127, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.PlainBackgroundPainter, ProgressODoom, Version=1.0.6789.37646, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;styledBorderPainter1.Name" xml:space="preserve">
    <value>styledBorderPainter1</value>
  </data>
  <data name="&gt;&gt;styledBorderPainter1.Type" xml:space="preserve">
-    <value>ProgressODoom.StyledBorderPainter, ProgressODoom, Version=1.0.6651.26127, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.StyledBorderPainter, ProgressODoom, Version=1.0.6789.37646, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;plainProgressPainter1.Name" xml:space="preserve">
    <value>plainProgressPainter1</value>
  </data>
  <data name="&gt;&gt;plainProgressPainter1.Type" xml:space="preserve">
-    <value>ProgressODoom.PlainProgressPainter, ProgressODoom, Version=1.0.6651.26127, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.PlainProgressPainter, ProgressODoom, Version=1.0.6789.37646, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;gradientGlossPainter1.Name" xml:space="preserve">
    <value>gradientGlossPainter1</value>
  </data>
  <data name="&gt;&gt;gradientGlossPainter1.Type" xml:space="preserve">
-    <value>ProgressODoom.GradientGlossPainter, ProgressODoom, Version=1.0.6651.26127, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.GradientGlossPainter, ProgressODoom, Version=1.0.6789.37646, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;plainProgressPainter2.Name" xml:space="preserve">
    <value>plainProgressPainter2</value>
  </data>
  <data name="&gt;&gt;plainProgressPainter2.Type" xml:space="preserve">
-    <value>ProgressODoom.PlainProgressPainter, ProgressODoom, Version=1.0.6651.26127, Culture=neutral, PublicKeyToken=null</value>
+    <value>ProgressODoom.PlainProgressPainter, ProgressODoom, Version=1.0.6789.37646, Culture=neutral, PublicKeyToken=null</value>
  </data>
  <data name="&gt;&gt;toolTip1.Name" xml:space="preserve">
    <value>toolTip1</value>
--- a/CUETools.ALACEnc/CUETools.ALACEnc.csproj
+++ b/CUETools.ALACEnc/CUETools.ALACEnc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netcoreapp2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.ALACEnc</AssemblyName>
    <RootNamespace>CUETools.ALACEnc</RootNamespace>
--- a/CUETools.ARCUE/CUETools.ARCUE.csproj
+++ b/CUETools.ARCUE/CUETools.ARCUE.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.ARCUE</AssemblyName>
    <RootNamespace>CUETools.ARCUE</RootNamespace>
--- a/CUETools.AccurateRip/CUETools.AccurateRip.csproj
+++ b/CUETools.AccurateRip/CUETools.AccurateRip.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.AccurateRip</AssemblyName>
    <RootNamespace>CUETools.AccurateRip</RootNamespace>
--- a/CUETools.CDImage/CUETools.CDImage.csproj
+++ b/CUETools.CDImage/CUETools.CDImage.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.CDImage</AssemblyName>
    <RootNamespace>CUETools.CDImage</RootNamespace>
--- a/CUETools.CDRepair/CUETools.CDRepair.csproj
+++ b/CUETools.CDRepair/CUETools.CDRepair.csproj
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>CUETools.CDRepair</RootNamespace>
    <AssemblyName>CUETools.CDRepair</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
--- a/CUETools.CLParity/CUETools.CLParity.csproj
+++ b/CUETools.CLParity/CUETools.CLParity.csproj
@@ -15,7 +15,7 @@
    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -36,7 +36,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\plugins\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\plugins\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\plugins\net40\</OutputPath>
+    <OutputPath>..\bin\Release\plugins\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
--- a/CUETools.CTDB.Converter/CUETools.CTDB.Converter.csproj
+++ b/CUETools.CTDB.Converter/CUETools.CTDB.Converter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netcoreapp2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.CTDB.Converter</AssemblyName>
    <RootNamespace>CUETools.CTDB.Converter</RootNamespace>
--- a/CUETools.CTDB.EACPlugin/FormMetadata.cs
+++ b/CUETools.CTDB.EACPlugin/FormMetadata.cs
@@ -86,9 +86,10 @@ namespace CUETools.CTDB.EACPlugin
                }
                foreach (var coverart in metadata.coverart)
                {
-                    var uri = Options.CoversSearch == CTDBCoversSearch.Large ?
+                    var uri = Options.CoversSize == CTDBCoversSize.Large ?
                        coverart.uri : coverart.uri150 ?? coverart.uri;
-                    if (knownUrls.Contains(uri) || !coverart.primary)
+                    if (knownUrls.Contains(uri) || 
+                        (Options.CoversSearch == CTDBCoversSearch.Primary && !coverart.primary))
                        continue;
                    var ms = new MemoryStream();
                    if (!this.ctdb.FetchFile(uri, ms))
--- a/CUETools.CTDB.EACPlugin/Options.Designer.cs
+++ b/CUETools.CTDB.EACPlugin/Options.Designer.cs
@@ -41,36 +41,43 @@ namespace AudioDataPlugIn
            this.buttonCancel = new System.Windows.Forms.Button();
            this.groupBox2 = new System.Windows.Forms.GroupBox();
            this.radioButtonCoversNone = new System.Windows.Forms.RadioButton();
+            this.radioButtonCoversPrimary = new System.Windows.Forms.RadioButton();
+            this.radioButtonCoversExtensive = new System.Windows.Forms.RadioButton();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
            this.radioButtonCoversSmall = new System.Windows.Forms.RadioButton();
            this.radioButtonCoversLarge = new System.Windows.Forms.RadioButton();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
            this.groupBox1.SuspendLayout();
            this.groupBox2.SuspendLayout();
+            this.groupBox3.SuspendLayout();
            this.SuspendLayout();
            // 
            // label1
            // 
            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(95, 13);
+            this.label1.Location = new System.Drawing.Point(142, 20);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(139, 13);
+            this.label1.Size = new System.Drawing.Size(205, 20);
            this.label1.TabIndex = 0;
            this.label1.Text = "CUETools DB Plugin V2.1.7";
            // 
            // label2
            // 
-            this.label2.Location = new System.Drawing.Point(95, 67);
+            this.label2.Location = new System.Drawing.Point(142, 103);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(230, 34);
+            this.label2.Size = new System.Drawing.Size(345, 52);
            this.label2.TabIndex = 1;
            this.label2.Text = "Copyright (c) 2011-12 Grigory Chudov";
            // 
            // linkLabel1
            // 
            this.linkLabel1.AutoSize = true;
-            this.linkLabel1.Location = new System.Drawing.Point(95, 36);
+            this.linkLabel1.Location = new System.Drawing.Point(142, 55);
+            this.linkLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.linkLabel1.Name = "linkLabel1";
-            this.linkLabel1.Size = new System.Drawing.Size(164, 13);
+            this.linkLabel1.Size = new System.Drawing.Size(234, 20);
            this.linkLabel1.TabIndex = 3;
            this.linkLabel1.TabStop = true;
            this.linkLabel1.Text = "http://db.cuetools.net/about.php";
@@ -79,18 +86,20 @@ namespace AudioDataPlugIn
            // pictureBox1
            // 
            this.pictureBox1.Image = global::CUETools.CTDB.EACPlugin.Properties.Resources.ctdb64;
-            this.pictureBox1.Location = new System.Drawing.Point(13, 13);
+            this.pictureBox1.Location = new System.Drawing.Point(20, 20);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(64, 64);
+            this.pictureBox1.Size = new System.Drawing.Size(96, 98);
            this.pictureBox1.TabIndex = 4;
            this.pictureBox1.TabStop = false;
            // 
            // radioButtonMBExtensive
            // 
            this.radioButtonMBExtensive.AutoSize = true;
-            this.radioButtonMBExtensive.Location = new System.Drawing.Point(6, 16);
+            this.radioButtonMBExtensive.Location = new System.Drawing.Point(9, 25);
+            this.radioButtonMBExtensive.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.radioButtonMBExtensive.Name = "radioButtonMBExtensive";
-            this.radioButtonMBExtensive.Size = new System.Drawing.Size(71, 17);
+            this.radioButtonMBExtensive.Size = new System.Drawing.Size(102, 24);
            this.radioButtonMBExtensive.TabIndex = 6;
            this.radioButtonMBExtensive.TabStop = true;
            this.radioButtonMBExtensive.Text = "Extensive";
@@ -99,9 +108,10 @@ namespace AudioDataPlugIn
            // radioButtonMBFast
            // 
            this.radioButtonMBFast.AutoSize = true;
-            this.radioButtonMBFast.Location = new System.Drawing.Point(6, 50);
+            this.radioButtonMBFast.Location = new System.Drawing.Point(9, 77);
+            this.radioButtonMBFast.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.radioButtonMBFast.Name = "radioButtonMBFast";
-            this.radioButtonMBFast.Size = new System.Drawing.Size(45, 17);
+            this.radioButtonMBFast.Size = new System.Drawing.Size(66, 24);
            this.radioButtonMBFast.TabIndex = 7;
            this.radioButtonMBFast.TabStop = true;
            this.radioButtonMBFast.Text = "Fast";
@@ -110,9 +120,10 @@ namespace AudioDataPlugIn
            // radioButtonMBDefault
            // 
            this.radioButtonMBDefault.AutoSize = true;
-            this.radioButtonMBDefault.Location = new System.Drawing.Point(6, 33);
+            this.radioButtonMBDefault.Location = new System.Drawing.Point(9, 51);
+            this.radioButtonMBDefault.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.radioButtonMBDefault.Name = "radioButtonMBDefault";
-            this.radioButtonMBDefault.Size = new System.Drawing.Size(59, 17);
+            this.radioButtonMBDefault.Size = new System.Drawing.Size(86, 24);
            this.radioButtonMBDefault.TabIndex = 8;
            this.radioButtonMBDefault.TabStop = true;
            this.radioButtonMBDefault.Text = "Default";
@@ -123,9 +134,11 @@ namespace AudioDataPlugIn
            this.groupBox1.Controls.Add(this.radioButtonMBFast);
            this.groupBox1.Controls.Add(this.radioButtonMBDefault);
            this.groupBox1.Controls.Add(this.radioButtonMBExtensive);
-            this.groupBox1.Location = new System.Drawing.Point(12, 127);
+            this.groupBox1.Location = new System.Drawing.Point(18, 195);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(136, 87);
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.groupBox1.Size = new System.Drawing.Size(204, 134);
            this.groupBox1.TabIndex = 15;
            this.groupBox1.TabStop = false;
            this.groupBox1.Text = "Metadata search mode:";
@@ -133,9 +146,10 @@ namespace AudioDataPlugIn
            // buttonOk
            // 
            this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.buttonOk.Location = new System.Drawing.Point(303, 189);
+            this.buttonOk.Location = new System.Drawing.Point(648, 291);
+            this.buttonOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.buttonOk.Name = "buttonOk";
-            this.buttonOk.Size = new System.Drawing.Size(75, 25);
+            this.buttonOk.Size = new System.Drawing.Size(112, 38);
            this.buttonOk.TabIndex = 17;
            this.buttonOk.Text = "OK";
            this.buttonOk.UseVisualStyleBackColor = true;
@@ -144,9 +158,10 @@ namespace AudioDataPlugIn
            // buttonCancel
            // 
            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.buttonCancel.Location = new System.Drawing.Point(303, 158);
+            this.buttonCancel.Location = new System.Drawing.Point(648, 243);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(75, 25);
+            this.buttonCancel.Size = new System.Drawing.Size(112, 38);
            this.buttonCancel.TabIndex = 19;
            this.buttonCancel.Text = "Cancel";
            this.buttonCancel.UseVisualStyleBackColor = true;
@@ -154,11 +169,13 @@ namespace AudioDataPlugIn
            // groupBox2
            // 
            this.groupBox2.Controls.Add(this.radioButtonCoversNone);
-            this.groupBox2.Controls.Add(this.radioButtonCoversSmall);
-            this.groupBox2.Controls.Add(this.radioButtonCoversLarge);
-            this.groupBox2.Location = new System.Drawing.Point(154, 127);
+            this.groupBox2.Controls.Add(this.radioButtonCoversPrimary);
+            this.groupBox2.Controls.Add(this.radioButtonCoversExtensive);
+            this.groupBox2.Location = new System.Drawing.Point(231, 195);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(136, 87);
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.groupBox2.Size = new System.Drawing.Size(204, 134);
            this.groupBox2.TabIndex = 16;
            this.groupBox2.TabStop = false;
            this.groupBox2.Text = "Covers search mode:";
@@ -166,20 +183,59 @@ namespace AudioDataPlugIn
            // radioButtonCoversNone
            // 
            this.radioButtonCoversNone.AutoSize = true;
-            this.radioButtonCoversNone.Location = new System.Drawing.Point(6, 50);
+            this.radioButtonCoversNone.Location = new System.Drawing.Point(9, 77);
+            this.radioButtonCoversNone.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.radioButtonCoversNone.Name = "radioButtonCoversNone";
-            this.radioButtonCoversNone.Size = new System.Drawing.Size(51, 17);
+            this.radioButtonCoversNone.Size = new System.Drawing.Size(72, 24);
            this.radioButtonCoversNone.TabIndex = 7;
            this.radioButtonCoversNone.TabStop = true;
            this.radioButtonCoversNone.Text = "None";
            this.radioButtonCoversNone.UseVisualStyleBackColor = true;
            // 
+            // radioButtonCoversPrimary
+            // 
+            this.radioButtonCoversPrimary.AutoSize = true;
+            this.radioButtonCoversPrimary.Location = new System.Drawing.Point(9, 51);
+            this.radioButtonCoversPrimary.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.radioButtonCoversPrimary.Name = "radioButtonCoversPrimary";
+            this.radioButtonCoversPrimary.Size = new System.Drawing.Size(86, 24);
+            this.radioButtonCoversPrimary.TabIndex = 8;
+            this.radioButtonCoversPrimary.TabStop = true;
+            this.radioButtonCoversPrimary.Text = "Primary";
+            this.radioButtonCoversPrimary.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonCoversExtensive
+            // 
+            this.radioButtonCoversExtensive.AutoSize = true;
+            this.radioButtonCoversExtensive.Location = new System.Drawing.Point(9, 25);
+            this.radioButtonCoversExtensive.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.radioButtonCoversExtensive.Name = "radioButtonCoversExtensive";
+            this.radioButtonCoversExtensive.Size = new System.Drawing.Size(102, 24);
+            this.radioButtonCoversExtensive.TabIndex = 6;
+            this.radioButtonCoversExtensive.TabStop = true;
+            this.radioButtonCoversExtensive.Text = "Extensive";
+            this.radioButtonCoversExtensive.UseVisualStyleBackColor = true;
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.radioButtonCoversSmall);
+            this.groupBox3.Controls.Add(this.radioButtonCoversLarge);
+            this.groupBox3.Location = new System.Drawing.Point(443, 195);
+            this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.groupBox3.Size = new System.Drawing.Size(163, 134);
+            this.groupBox3.TabIndex = 17;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "Covers size:";
+            // 
            // radioButtonCoversSmall
            // 
            this.radioButtonCoversSmall.AutoSize = true;
-            this.radioButtonCoversSmall.Location = new System.Drawing.Point(6, 33);
+            this.radioButtonCoversSmall.Location = new System.Drawing.Point(9, 51);
+            this.radioButtonCoversSmall.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.radioButtonCoversSmall.Name = "radioButtonCoversSmall";
-            this.radioButtonCoversSmall.Size = new System.Drawing.Size(50, 17);
+            this.radioButtonCoversSmall.Size = new System.Drawing.Size(73, 24);
            this.radioButtonCoversSmall.TabIndex = 8;
            this.radioButtonCoversSmall.TabStop = true;
            this.radioButtonCoversSmall.Text = "Small";
@@ -188,9 +244,10 @@ namespace AudioDataPlugIn
            // radioButtonCoversLarge
            // 
            this.radioButtonCoversLarge.AutoSize = true;
-            this.radioButtonCoversLarge.Location = new System.Drawing.Point(6, 16);
+            this.radioButtonCoversLarge.Location = new System.Drawing.Point(9, 25);
+            this.radioButtonCoversLarge.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.radioButtonCoversLarge.Name = "radioButtonCoversLarge";
-            this.radioButtonCoversLarge.Size = new System.Drawing.Size(52, 17);
+            this.radioButtonCoversLarge.Size = new System.Drawing.Size(75, 24);
            this.radioButtonCoversLarge.TabIndex = 6;
            this.radioButtonCoversLarge.TabStop = true;
            this.radioButtonCoversLarge.Text = "Large";
@@ -199,10 +256,11 @@ namespace AudioDataPlugIn
            // Options
            // 
            this.AcceptButton = this.buttonOk;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.CancelButton = this.buttonCancel;
-            this.ClientSize = new System.Drawing.Size(390, 227);
+            this.ClientSize = new System.Drawing.Size(773, 354);
+            this.Controls.Add(this.groupBox3);
            this.Controls.Add(this.groupBox2);
            this.Controls.Add(this.buttonCancel);
            this.Controls.Add(this.buttonOk);
@@ -212,6 +270,7 @@ namespace AudioDataPlugIn
            this.Controls.Add(this.label2);
            this.Controls.Add(this.label1);
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
            this.MaximizeBox = false;
            this.MinimizeBox = false;
            this.Name = "Options";
@@ -223,6 +282,8 @@ namespace AudioDataPlugIn
            this.groupBox1.PerformLayout();
            this.groupBox2.ResumeLayout(false);
            this.groupBox2.PerformLayout();
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
            this.ResumeLayout(false);
            this.PerformLayout();

@@ -242,6 +303,9 @@ namespace AudioDataPlugIn
 		private System.Windows.Forms.Button buttonCancel;
        private System.Windows.Forms.GroupBox groupBox2;
        private System.Windows.Forms.RadioButton radioButtonCoversNone;
+        private System.Windows.Forms.RadioButton radioButtonCoversPrimary;
+        private System.Windows.Forms.RadioButton radioButtonCoversExtensive;
+        private System.Windows.Forms.GroupBox groupBox3;
        private System.Windows.Forms.RadioButton radioButtonCoversSmall;
        private System.Windows.Forms.RadioButton radioButtonCoversLarge;
    }
--- a/CUETools.CTDB.EACPlugin/Options.cs
+++ b/CUETools.CTDB.EACPlugin/Options.cs
@@ -12,18 +12,25 @@ using System.Runtime.Serialization.Formatters.Binary;

 namespace AudioDataPlugIn
 {
+    public enum CTDBCoversSize
+    {
+        Small,
+        Large
+    }
+
    public enum CTDBCoversSearch
    {
-        Large,
-        Small,
-        None
+        None,
+        Primary,
+        Extensive
    }

    public partial class Options : Form
    {
 		private static CTDBMetadataSearch? metadataSearch = null;
        private static CTDBCoversSearch? coversSearch = null;
-		private static string optionsKey = @"SOFTWARE\CUETools\EACPugin";
+        private static CTDBCoversSize? coversSize = null;
+        private static string optionsKey = @"SOFTWARE\CUETools\EACPugin";
 		public static CTDBMetadataSearch MetadataSearch
 		{
 			get
@@ -67,7 +74,7 @@ namespace AudioDataPlugIn
                    {
                        using (var key = Registry.CurrentUser.OpenSubKey(optionsKey, false))
                        {
-                            var val = key.GetValue("CoversSearch") as string;
+                            var val = key.GetValue("CoversSearchMode") as string;
                            coversSearch = (CTDBCoversSearch)Enum.Parse(typeof(CTDBCoversSearch), val);
                        }
                    }
@@ -76,7 +83,40 @@ namespace AudioDataPlugIn
                    }
                }

-                return coversSearch ?? CTDBCoversSearch.Small;
+                return coversSearch ?? CTDBCoversSearch.Primary;
+            }
+
+            set
+            {
+                using (var key = Registry.CurrentUser.CreateSubKey(optionsKey))
+                {
+                    key.SetValue("CoversSearchMode", value.ToString());
+                }
+
+                coversSearch = value;
+            }
+        }
+
+        public static CTDBCoversSize CoversSize
+        {
+            get
+            {
+                if (!coversSize.HasValue)
+                {
+                    try
+                    {
+                        using (var key = Registry.CurrentUser.OpenSubKey(optionsKey, false))
+                        {
+                            var val = key.GetValue("CoversSearch") as string;
+                            coversSize = (CTDBCoversSize)Enum.Parse(typeof(CTDBCoversSize), val);
+                        }
+                    }
+                    catch (Exception)
+                    {
+                    }
+                }
+
+                return coversSize ?? CTDBCoversSize.Small;
            }

            set
@@ -86,7 +126,7 @@ namespace AudioDataPlugIn
                    key.SetValue("CoversSearch", value.ToString());
                }

-                coversSearch = value;
+                coversSize = value;
            }
        }

@@ -135,19 +175,23 @@ namespace AudioDataPlugIn
 			this.radioButtonMBExtensive.Checked = MetadataSearch == CTDBMetadataSearch.Extensive;
 			this.radioButtonMBDefault.Checked = MetadataSearch == CTDBMetadataSearch.Default;
 			this.radioButtonMBFast.Checked = MetadataSearch == CTDBMetadataSearch.Fast;
-            this.radioButtonCoversLarge.Checked = CoversSearch == CTDBCoversSearch.Large;
-            this.radioButtonCoversSmall.Checked = CoversSearch == CTDBCoversSearch.Small;
+            this.radioButtonCoversExtensive.Checked = CoversSearch == CTDBCoversSearch.Extensive;
+            this.radioButtonCoversPrimary.Checked = CoversSearch == CTDBCoversSearch.Primary;
            this.radioButtonCoversNone.Checked = CoversSearch == CTDBCoversSearch.None;
-		}
+            this.radioButtonCoversLarge.Checked = CoversSize == CTDBCoversSize.Large;
+            this.radioButtonCoversSmall.Checked = CoversSize == CTDBCoversSize.Small;
+        }

-		private void button2_Click(object sender, EventArgs e)
+        private void button2_Click(object sender, EventArgs e)
 		{
 			Options.MetadataSearch = this.radioButtonMBExtensive.Checked ? CTDBMetadataSearch.Extensive
 				: this.radioButtonMBDefault.Checked ? CTDBMetadataSearch.Default
 				: this.radioButtonMBFast.Checked ? CTDBMetadataSearch.Fast
 				: CTDBMetadataSearch.None;
-            Options.CoversSearch = this.radioButtonCoversLarge.Checked ? CTDBCoversSearch.Large
-                : this.radioButtonCoversSmall.Checked ? CTDBCoversSearch.Small
+            Options.CoversSize = this.radioButtonCoversLarge.Checked ? CTDBCoversSize.Large
+                : CTDBCoversSize.Small;
+            Options.CoversSearch = this.radioButtonCoversExtensive.Checked ? CTDBCoversSearch.Extensive
+                : this.radioButtonCoversPrimary.Checked ? CTDBCoversSearch.Primary
                : CTDBCoversSearch.None;
        }
    }
--- a/CUETools.CTDB.Types/CUETools.CTDB.Types.csproj
+++ b/CUETools.CTDB.Types/CUETools.CTDB.Types.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.CTDB.Types</AssemblyName>
    <RootNamespace>CUETools.CTDB</RootNamespace>
--- a/CUETools.CTDB/CUETools.CTDB.csproj
+++ b/CUETools.CTDB/CUETools.CTDB.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.CTDB</AssemblyName>
    <RootNamespace>CUETools.CTDB</RootNamespace>
@@ -25,7 +25,7 @@
  <ItemGroup Condition="'$(TargetFramework)'=='net20'">
    <Reference Include="System.Management" />
  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net40'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net47'">
    <PackageReference Include="DeviceId" Version="4.0.0" />
  </ItemGroup>
  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
--- a/CUETools.CTDB/CUEToolsDB.cs
+++ b/CUETools.CTDB/CUEToolsDB.cs
@@ -296,7 +296,7 @@ namespace CUETools.CTDB
 #else
                uuidInfo = new DeviceIdBuilder()
                    .AddMachineName()
-#if NET40
+#if NET47
                    .AddProcessorId()
                    .AddMotherboardSerialNumber()
 #endif
--- a/CUETools.ChaptersToCue/CUETools.ChaptersToCue.csproj
+++ b/CUETools.ChaptersToCue/CUETools.ChaptersToCue.csproj
@@ -5,7 +5,7 @@
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProductVersion>9.0.30729</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9253A314-1821-42BF-B02F-2BF986B1765D}</ProjectGuid>
+    <ProjectGuid>{6ADBBF4B-AD3A-4782-A694-18662196780B}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>CUETools.ChaptersToCue</RootNamespace>
@@ -15,7 +15,7 @@
    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -36,7 +36,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -45,7 +45,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -69,6 +69,10 @@
      <Project>{1DD41038-D885-46C5-8DDE-E0B82F066584}</Project>
      <Name>CUETools.CDImage</Name>
    </ProjectReference>
+    <ProjectReference Include="..\CUETools.CTDB.Types\CUETools.CTDB.Types.csproj">
+      <Project>{c36efaa5-4f81-4a29-800d-ba866ff13bc8}</Project>
+      <Name>CUETools.CTDB.Types</Name>
+    </ProjectReference>
    <ProjectReference Include="..\CUETools.CTDB\CUETools.CTDB.csproj">
      <Project>{AA2A9A7E-45FB-4632-AD85-85B0E556F818}</Project>
      <Name>CUETools.CTDB</Name>
--- a/CUETools.Codecs.ALAC/CUETools.Codecs.ALAC.csproj
+++ b/CUETools.Codecs.ALAC/CUETools.Codecs.ALAC.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.ALAC</AssemblyName>
    <RootNamespace>CUETools.Codecs</RootNamespace>
--- a/CUETools.Codecs.CoreAudio/CUETools.Codecs.CoreAudio.csproj
+++ b/CUETools.Codecs.CoreAudio/CUETools.Codecs.CoreAudio.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20</TargetFrameworks>
+    <TargetFrameworks>net47;net20</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.CoreAudio</AssemblyName>
    <RootNamespace>CUETools.Codecs.CoreAudio</RootNamespace>
--- a/CUETools.Codecs.DirectSound/CUETools.Codecs.DirectSound.csproj
+++ b/CUETools.Codecs.DirectSound/CUETools.Codecs.DirectSound.csproj
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>CUETools.Codecs.DirectSound</RootNamespace>
    <AssemblyName>CUETools.Codecs.DirectSound</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -37,7 +37,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
--- a/CUETools.Codecs.FLACCL/CUETools.Codecs.FLACCL.csproj
+++ b/CUETools.Codecs.FLACCL/CUETools.Codecs.FLACCL.csproj
@@ -15,7 +15,7 @@
    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -36,7 +36,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\plugins\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\plugins\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\plugins\net40\</OutputPath>
+    <OutputPath>..\bin\Release\plugins\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -55,7 +55,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\CUETools\packages\Newtonsoft.Json.11.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\CUETools\packages\Newtonsoft.Json.11.0.1\lib\net47\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
--- a/CUETools.Codecs.FLAKE/CUETools.Codecs.FLAKE.csproj
+++ b/CUETools.Codecs.FLAKE/CUETools.Codecs.FLAKE.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.Flake</AssemblyName>
    <RootNamespace>CUETools.Codecs.Flake</RootNamespace>
--- a/CUETools.Codecs.FlaCuda/CUETools.Codecs.FlaCuda.csproj
+++ b/CUETools.Codecs.FlaCuda/CUETools.Codecs.FlaCuda.csproj
@@ -15,7 +15,7 @@
    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -36,7 +36,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\plugins\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\plugins\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\plugins\net40\</OutputPath>
+    <OutputPath>..\bin\Release\plugins\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
--- a/CUETools.Codecs.Flake/AudioEncoder.cs
+++ b/CUETools.Codecs.Flake/AudioEncoder.cs
@@ -2065,7 +2065,7 @@ new int[] { // 30
 			if (!inited)
 			{
 				if (_IO == null)
-					_IO = new FileStream(_path, FileMode.Create, FileAccess.Write, FileShare.Read, 0x10000);
+					_IO = new FileStream(_path, FileMode.Create, FileAccess.Write, FileShare.Read, 0x20000);
                inited = true;
                int header_size = flake_encode_init();
 				_IO.Write(header, 0, header_size);
--- a/CUETools.Codecs.HDCD/CUETools.Codecs.HDCD.csproj
+++ b/CUETools.Codecs.HDCD/CUETools.Codecs.HDCD.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.HDCD</AssemblyName>
    <RootNamespace>CUETools.Codecs.HDCD</RootNamespace>
--- a/CUETools.Codecs.HDCD/HDCDDLL.cs
+++ b/CUETools.Codecs.HDCD/HDCDDLL.cs
@@ -53,7 +53,7 @@ namespace CUETools.Codecs.HDCD
            var myFolder = System.IO.Path.GetDirectoryName(myPath);
            var is64 = IntPtr.Size == 8;
            var subfolder = is64 ? "x64" : "win32";
-#if NET40
+#if NET47
            IntPtr Dll = LoadLibrary(System.IO.Path.Combine(myFolder, subfolder, DllName + ".dll"));
 #else
            IntPtr Dll = LoadLibrary(System.IO.Path.Combine(System.IO.Path.Combine(myFolder, subfolder), DllName + ".dll"));
--- a/CUETools.Codecs.Icecast/CUETools.Codecs.Icecast.csproj
+++ b/CUETools.Codecs.Icecast/CUETools.Codecs.Icecast.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.Icecast</AssemblyName>
    <RootNamespace>CUETools.Codecs.Icecast</RootNamespace>
--- a/CUETools.Codecs.LossyWAV/CUETools.Codecs.LossyWAV.csproj
+++ b/CUETools.Codecs.LossyWAV/CUETools.Codecs.LossyWAV.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.LossyWAV</AssemblyName>
    <RootNamespace>CUETools.Codecs.LossyWAV</RootNamespace>
--- a/CUETools.Codecs.MACLib/CUETools.Codecs.MACLib.csproj
+++ b/CUETools.Codecs.MACLib/CUETools.Codecs.MACLib.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.MACLib</AssemblyName>
    <RootNamespace>CUETools.Codecs.MACLib</RootNamespace>
--- a/CUETools.Codecs.MACLib/MACLibDll.cs
+++ b/CUETools.Codecs.MACLib/MACLibDll.cs
@@ -72,7 +72,7 @@ namespace CUETools.Codecs.MACLib
            var myFolder = System.IO.Path.GetDirectoryName(myPath);
            var is64 = IntPtr.Size == 8;
            var subfolder = is64 ? "x64" : "win32";
-#if NET40
+#if NET47
            IntPtr Dll = LoadLibrary(System.IO.Path.Combine(myFolder, subfolder, DllName + ".dll"));
 #else
            IntPtr Dll = LoadLibrary(System.IO.Path.Combine(System.IO.Path.Combine(myFolder, subfolder), DllName + ".dll"));
--- a/CUETools.Codecs.MPEG/CUETools.Codecs.MPEG.csproj
+++ b/CUETools.Codecs.MPEG/CUETools.Codecs.MPEG.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.MPEG</AssemblyName>
    <RootNamespace>CUETools.Codecs.MPEG</RootNamespace>
--- a/CUETools.Codecs.WMA/CUETools.Codecs.WMA.csproj
+++ b/CUETools.Codecs.WMA/CUETools.Codecs.WMA.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20</TargetFrameworks>
+    <TargetFrameworks>net47;net20</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.WMA</AssemblyName>
    <RootNamespace>CUETools.Codecs.WMA</RootNamespace>
--- a/CUETools.Codecs.lame_enc/CUETools.Codecs.LAME.csproj
+++ b/CUETools.Codecs.lame_enc/CUETools.Codecs.LAME.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.lame_enc</AssemblyName>
    <RootNamespace>CUETools.Codecs.lame_enc</RootNamespace>
--- a/CUETools.Codecs.libFLAC/CUETools.Codecs.libFLAC.csproj
+++ b/CUETools.Codecs.libFLAC/CUETools.Codecs.libFLAC.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.libFLAC</AssemblyName>
    <RootNamespace>CUETools.Codecs.libFLAC</RootNamespace>
--- a/CUETools.Codecs.libFLAC/FLACDLL.cs
+++ b/CUETools.Codecs.libFLAC/FLACDLL.cs
@@ -163,7 +163,7 @@ namespace CUETools.Codecs.libFLAC
            var myFolder = System.IO.Path.GetDirectoryName(myPath);
            var is64 = IntPtr.Size == 8;
            var subfolder = is64 ? "x64" : "win32";
-#if NET40
+#if NET47
            IntPtr Dll = LoadLibrary(System.IO.Path.Combine(myFolder, subfolder, DllName + ".dll"));
 #else
            IntPtr Dll = LoadLibrary(System.IO.Path.Combine(System.IO.Path.Combine(myFolder, subfolder), DllName + ".dll"));
--- a/CUETools.Codecs.libmp3lame/CUETools.Codecs.libmp3lame.csproj
+++ b/CUETools.Codecs.libmp3lame/CUETools.Codecs.libmp3lame.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.libmp3lame</AssemblyName>
    <RootNamespace>CUETools.Codecs.libmp3lame</RootNamespace>
--- a/CUETools.Codecs.libmp3lame/libmp3lamedll.cs
+++ b/CUETools.Codecs.libmp3lame/libmp3lamedll.cs
@@ -52,7 +52,7 @@ namespace CUETools.Codecs.libmp3lame
            var myFolder = System.IO.Path.GetDirectoryName(myPath);
            var is64 = IntPtr.Size == 8;
            var subfolder = is64 ? "x64" : "win32";
-#if NET40
+#if NET47
            IntPtr Dll = LoadLibrary(System.IO.Path.Combine(myFolder, subfolder, DllName + ".dll"));
 #else
            IntPtr Dll = LoadLibrary(System.IO.Path.Combine(System.IO.Path.Combine(myFolder, subfolder), DllName + ".dll"));
--- a/CUETools.Codecs.libwavpack/CUETools.Codecs.libwavpack.csproj
+++ b/CUETools.Codecs.libwavpack/CUETools.Codecs.libwavpack.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs.libwavpack</AssemblyName>
    <RootNamespace>CUETools.Codecs.libwavpack</RootNamespace>
--- a/CUETools.Codecs.libwavpack/wavpackdll.cs
+++ b/CUETools.Codecs.libwavpack/wavpackdll.cs
@@ -71,7 +71,7 @@ namespace CUETools.Codecs.libwavpack
            var myFolder = System.IO.Path.GetDirectoryName(myPath);
            var is64 = IntPtr.Size == 8;
            var subfolder = is64 ? "x64" : "win32";
-#if NET40
+#if NET47
            IntPtr Dll = LoadLibrary(System.IO.Path.Combine(myFolder, subfolder, DllName + ".dll"));
 #else
            IntPtr Dll = LoadLibrary(System.IO.Path.Combine(System.IO.Path.Combine(myFolder, subfolder), DllName + ".dll"));
--- a/CUETools.Codecs/CUETools.Codecs.csproj
+++ b/CUETools.Codecs/CUETools.Codecs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Codecs</AssemblyName>
    <RootNamespace>CUETools.Codecs</RootNamespace>
--- a/CUETools.Compression.Rar/CUETools.Compression.Rar.csproj
+++ b/CUETools.Compression.Rar/CUETools.Compression.Rar.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Compression.Rar</AssemblyName>
    <RootNamespace>CUETools.Compression.Rar</RootNamespace>
--- a/CUETools.Compression.Zip/CUETools.Compression.Zip.csproj
+++ b/CUETools.Compression.Zip/CUETools.Compression.Zip.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Compression.Zip</AssemblyName>
    <RootNamespace>CUETools.Compression.Zip</RootNamespace>
--- a/CUETools.Compression/CUETools.Compression.csproj
+++ b/CUETools.Compression/CUETools.Compression.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Compression</AssemblyName>
    <RootNamespace>CUETools.Compression</RootNamespace>
--- a/CUETools.Converter/CUETools.Converter.csproj
+++ b/CUETools.Converter/CUETools.Converter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Converter</AssemblyName>
    <RootNamespace>CUETools.Converter</RootNamespace>
--- a/CUETools.DSP.Mixer/CUETools.DSP.Mixer.csproj
+++ b/CUETools.DSP.Mixer/CUETools.DSP.Mixer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.DSP.Mixer</AssemblyName>
    <RootNamespace>CUETools.DSP.Mixer</RootNamespace>
--- a/CUETools.DSP.Resampler/CUETools.DSP.Resampler.csproj
+++ b/CUETools.DSP.Resampler/CUETools.DSP.Resampler.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.DSP.Resampler</AssemblyName>
    <RootNamespace>CUETools.DSP.Resampler</RootNamespace>
--- a/CUETools.FLACCL.cmd/CUETools.FLACL.cmd.csproj
+++ b/CUETools.FLACCL.cmd/CUETools.FLACL.cmd.csproj
@@ -15,7 +15,7 @@
    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -36,7 +36,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -56,7 +56,7 @@
  <ItemGroup>
    <Reference Include="OpenCLNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\OpenCLNet.dll</HintPath>
+      <HintPath>..\ThirdParty\openclnet\source\bin\Release\net40\OpenCLNet.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
--- a/CUETools.FlaCudaExe/CUETools.FlaCuda.csproj
+++ b/CUETools.FlaCudaExe/CUETools.FlaCuda.csproj
@@ -15,7 +15,7 @@
    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -36,7 +36,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
--- a/CUETools.Flake/CUETools.Flake.csproj
+++ b/CUETools.Flake/CUETools.Flake.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netcoreapp2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Flake</AssemblyName>
    <RootNamespace>CUETools.Flake</RootNamespace>
--- a/CUETools.LossyWAV/CUETools.LossyWAV.csproj
+++ b/CUETools.LossyWAV/CUETools.LossyWAV.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netcoreapp2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.LossyWAV</AssemblyName>
    <RootNamespace>CUETools.LossyWAV</RootNamespace>
--- a/CUETools.Parity/CUETools.Parity.csproj
+++ b/CUETools.Parity/CUETools.Parity.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Parity</AssemblyName>
    <RootNamespace>CUETools.Parity</RootNamespace>
--- a/CUETools.Processor/CUEConfigAdvanced.cs
+++ b/CUETools.Processor/CUEConfigAdvanced.cs
@@ -14,11 +14,17 @@ namespace CUETools.Processor
            Custom
        }

+        public enum CTDBCoversSize
+        {
+            Small,
+            Large
+        }
+
        public enum CTDBCoversSearch
        {
-            Large,
-            Small,
-            None
+            None,
+            Primary,
+            Extensive
        }

        public CUEConfigAdvanced()
@@ -92,7 +98,10 @@ namespace CUETools.Processor
        [DefaultValue(CUETools.CTDB.CTDBMetadataSearch.Default), Category("CTDB"), DisplayName("Metadata search")]
        public CUETools.CTDB.CTDBMetadataSearch metadataSearch { get; set; }

-        [DefaultValue(CTDBCoversSearch.Small), Category("CTDB"), DisplayName("Album art search")]
+        [DefaultValue(CTDBCoversSize.Large), Category("CTDB"), DisplayName("Album art size")]
+        public CTDBCoversSize coversSize { get; set; }
+
+        [DefaultValue(CTDBCoversSearch.Primary), Category("CTDB"), DisplayName("Album art search")]
        public CTDBCoversSearch coversSearch { get; set; }

        [DefaultValue(false), Category("CTDB"), DisplayName("Detailed log")]
--- a/CUETools.Processor/CUESheet.cs
+++ b/CUETools.Processor/CUESheet.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Drawing;
-#if NET40 || NET20
+#if NET47 || NET20
 using System.Drawing.Drawing2D;
 #endif
 using System.Globalization;
@@ -125,7 +125,7 @@ namespace CUETools.Processor
            get { return _albumArt; }
        }

-#if NET40 || NET20
+#if NET47 || NET20
        public Image Cover
        {
            get
@@ -1581,6 +1581,10 @@ namespace CUETools.Processor
                            sourceInfo1.Length = (tocFromLog[tocFromLog.FirstAudio + trNo].Pregap - _toc[_toc.FirstAudio + trNo].Pregap) * 588;
                            _sources.Insert(0, sourceInfo1);
                            _toc[_toc.FirstAudio + trNo].Pregap = tocFromLog[tocFromLog.FirstAudio + trNo].Pregap;
+                        }
+                        else if (trNo > 1 && _toc[_toc.FirstAudio + trNo].Start - tocFromLog[tocFromLog.FirstAudio + trNo].Pregap <= _toc[_toc.FirstAudio + trNo - 1][(int) _toc[_toc.FirstAudio + trNo - 1].LastIndex].Start)
+                        {
+
                        }
                        else
                            _toc[_toc.FirstAudio + trNo].Pregap = tocFromLog[tocFromLog.FirstAudio + trNo].Pregap;
@@ -1663,7 +1667,8 @@ namespace CUETools.Processor
                if (tocFromLog.AudioTracks == _toc.AudioTracks
                    && tocFromLog.TrackCount == _toc.TrackCount
                    && tocFromLog.FirstAudio == _toc.FirstAudio
-                    && tocFromLog.TrackCount == tocFromLog.FirstAudio + tocFromLog.AudioTracks - 1)
+                    && tocFromLog.TrackCount == tocFromLog.FirstAudio + tocFromLog.AudioTracks - 1
+                    && tocFromLog[_toc.FirstAudio].Start >= _toc[_toc.FirstAudio].Start)
                {
                    //DataTrackLength = tocFromLog[1].Length;
                    uint delta = tocFromLog[_toc.FirstAudio].Start - _toc[_toc.FirstAudio].Start;
@@ -1732,7 +1737,7 @@ namespace CUETools.Processor
            }

            LoadAlbumArt(_tracks[0]._fileInfo ?? _fileInfo);
-#if NET40 || NET20
+#if NET47 || NET20
            ResizeAlbumArt();
 #endif
            if (_config.embedAlbumArt || _config.CopyAlbumArt)
@@ -2038,7 +2043,7 @@ namespace CUETools.Processor
                    return "";
                try { outputPath = Path.ChangeExtension(outputPath, ext); }
                catch { return ""; }
-                if (outputPath.Length < 255)
+                if (outputPath.Length < 255 || outputPath.StartsWith("\\\\?\\"))
                    return outputPath;
            }
            return outputPath;
@@ -2089,7 +2094,7 @@ namespace CUETools.Processor
                    ArLogFileName = "ar.log";
                    break;
                }
-                if (Path.Combine(OutputDir, ArLogFileName).Length < 255)
+                 if (Path.Combine(OutputDir, ArLogFileName).Length < 255 || OutputDir.StartsWith("\\\\?\\"))
                    break;
            }

@@ -2135,7 +2140,7 @@ namespace CUETools.Processor
                            filename = vars["tracknumber"];
                            break;
                        }
-                        if (OutputDir.Length + filename.Length < 255)
+                        if (OutputDir.Length + filename.Length < 255 || OutputDir.StartsWith("\\\\?\\"))
                            break;
                    }

@@ -2869,7 +2874,7 @@ namespace CUETools.Processor
            return entry;
        }

-#if NET40 || NET20
+#if NET47 || NET20
        private static Bitmap resizeImage(Image imgToResize, Size size)
        {
            int sourceWidth = imgToResize.Width;
@@ -2932,7 +2937,7 @@ namespace CUETools.Processor
                List<string> files = new List<string>();
                foreach (string tpl in _config.advanced.CoverArtFiles.Split(';'))
                {
-                    string name = tpl.Replace("%album%", Metadata.Title).Replace("%artist%", Metadata.Artist);
+                    string name = tpl.Replace("%album%", _config.CleanseString(Metadata.Title)).Replace("%artist%", _config.CleanseString(Metadata.Artist));
                    string imgPath = Path.Combine(_isArchive ? _archiveCUEpath : _inputDir, name);
                    bool exists = _isArchive ? _archiveContents.Contains(imgPath) : File.Exists(imgPath);
                    if (exists) files.Add(imgPath);
@@ -2944,10 +2949,11 @@ namespace CUETools.Processor
                if (files.Count == 0 && !_isArchive && _config.advanced.CoverArtSearchSubdirs)
                {
                    List<string> allfiles = new List<string>(Directory.GetFiles(_inputDir, "*.jpg", SearchOption.AllDirectories));
+                    allfiles.AddRange(new List<string>(Directory.GetFiles(_inputDir, "*.png", SearchOption.AllDirectories)));
                    // TODO: archive case
                    foreach (string tpl in _config.advanced.CoverArtFiles.Split(';'))
                    {
-                        string name = tpl.Replace("%album%", Metadata.Title).Replace("%artist%", Metadata.Artist);
+                        string name = tpl.Replace("%album%", _config.CleanseString(Metadata.Title)).Replace("%artist%", _config.CleanseString(Metadata.Artist));
                        List<string> matching = allfiles.FindAll(s => Path.GetFileName(s) == name);
                        files.AddRange(matching);
                    }
@@ -2977,7 +2983,7 @@ namespace CUETools.Processor
                    using (MemoryStream imageStream = new MemoryStream(pic.Data.Data, 0, pic.Data.Count))
                        try
                        {
-#if NET40 || NET20
+#if NET47 || NET20
                            var image = Image.FromStream(imageStream);
                            pic.Description += $" ({image.Width}x{image.Height})";
                            if (image.Height > 0 && image.Width > 0 && (image.Height * 1.0 / image.Width) > 0.9 && (image.Width * 1.0 / image.Height) > 0.9)
@@ -3003,7 +3009,7 @@ namespace CUETools.Processor
            }
        }

-#if NET40 || NET20
+#if NET47 || NET20
        public void ResizeAlbumArt()
        {
            if (_albumArt == null)
--- a/CUETools.Processor/CUETools.Processor.csproj
+++ b/CUETools.Processor/CUETools.Processor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Processor</AssemblyName>
    <RootNamespace>CUETools.Processor</RootNamespace>
--- a/CUETools.Processor/General.cs
+++ b/CUETools.Processor/General.cs
@@ -359,9 +359,10 @@ namespace CUETools.Processor
            {
                while (exists(result))
                {
+                    var oldkey = tags[unique_key];
                    tags[unique_key] = unique.ToString();
                    string new_result = ReplaceMultiple(fmt, tags, maxLen);
-                    if (new_result == result || new_result == String.Empty || new_result == null)
+                    if ((new_result == result && oldkey != tags[unique_key]) || new_result == String.Empty || new_result == null)
                        break;
                    result = new_result;
                    unique++;
--- a/CUETools.Processor/Tagging.cs
+++ b/CUETools.Processor/Tagging.cs
@@ -150,14 +150,14 @@ namespace CUETools.Processor
            {
                foreach (string tag in xiph)
                    foreach (string value in xiph.GetField(tag))
-                        if (!IsKnownXiphTag(tag))
+                        if (!IsKnownXiphTag(tag) && value != null)
                            tags.Add(tag, value);
            }
            else if (ape != null)
            {
                foreach (string tag in ape)
                    foreach (string value in ape.GetItem(tag).ToStringArray())
-                        if (!IsKnownApeTag(tag))
+                        if (!IsKnownApeTag(tag) && value != null)
                            tags.Add(tag, value);
            }
            else if (asf != null)
--- a/CUETools.Ripper.Console/CUETools.ConsoleRipper.csproj
+++ b/CUETools.Ripper.Console/CUETools.ConsoleRipper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20</TargetFrameworks>
+    <TargetFrameworks>net47;net20</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Ripper.Console</AssemblyName>
    <RootNamespace>CUETools.Ripper.Console</RootNamespace>
--- a/CUETools.Ripper.SCSI/CUETools.Ripper.SCSI.csproj
+++ b/CUETools.Ripper.SCSI/CUETools.Ripper.SCSI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20</TargetFrameworks>
+    <TargetFrameworks>net47;net20</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Ripper.SCSI</AssemblyName>
    <RootNamespace>CUETools.Ripper.SCSI</RootNamespace>
--- a/CUETools.Ripper/CUETools.Ripper.csproj
+++ b/CUETools.Ripper/CUETools.Ripper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net20;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net47;net20;netstandard2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.Ripper</AssemblyName>
    <RootNamespace>CUETools.Ripper</RootNamespace>
--- a/CUETools.TestHelpers/CUETools.TestHelpers.csproj
+++ b/CUETools.TestHelpers/CUETools.TestHelpers.csproj
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>CUETools.TestHelpers</RootNamespace>
    <AssemblyName>CUETools.TestHelpers</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -37,7 +37,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
--- a/CUETools.eac3to/CUETools.eac3to.csproj
+++ b/CUETools.eac3to/CUETools.eac3to.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
    <Version>2.1.7.0</Version>
    <AssemblyName>CUETools.eac3to</AssemblyName>
    <RootNamespace>CUETools.eac3to</RootNamespace>
--- a/CUETools.eac3ui/BLUTools.csproj
+++ b/CUETools.eac3ui/BLUTools.csproj
@@ -8,7 +8,7 @@
    <OutputType>WinExe</OutputType>
    <RootNamespace>BluTools</RootNamespace>
    <AssemblyName>BluTools</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <WarningLevel>4</WarningLevel>
@@ -29,10 +29,11 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup>
    <ApplicationIcon>Icons\cue2.ico</ApplicationIcon>
--- a/CUETools/CUETools.TestCodecs/CUETools.TestCodecs.csproj
+++ b/CUETools/CUETools.TestCodecs/CUETools.TestCodecs.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,7 +16,7 @@
    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -32,6 +32,7 @@
    <IsWebBootstrapper>false</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -41,6 +42,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -50,6 +52,7 @@
    <DebugType>full</DebugType>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="CSScriptLibrary.v1.1, Version=2.3.2.0, Culture=neutral">
--- a/CUETools/CUETools.TestParity/CUETools.TestParity.csproj
+++ b/CUETools/CUETools.TestParity/CUETools.TestParity.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>CUETools.TestParity</RootNamespace>
    <AssemblyName>CUETools.TestParity</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <FileUpgradeFlags>
@@ -32,6 +32,7 @@
    <IsWebBootstrapper>false</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -43,6 +44,7 @@
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -53,6 +55,7 @@
    <WarningLevel>4</WarningLevel>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
--- a/CUETools/CUETools.TestParity/app.config
+++ b/CUETools/CUETools.TestParity/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-	<startup/></configuration>
+	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/></startup></configuration>
--- a/CUETools/CUETools.TestProcessor/CUETools.TestProcessor.csproj
+++ b/CUETools/CUETools.TestProcessor/CUETools.TestProcessor.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,7 +16,7 @@
    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -32,6 +32,7 @@
    <IsWebBootstrapper>false</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -40,6 +41,7 @@
    <OutputPath>..\..\bin\Debug\net40\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -48,6 +50,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <DebugType>full</DebugType>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
--- a/CUETools/CUETools.csproj
+++ b/CUETools/CUETools.csproj
@@ -22,7 +22,7 @@
    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <TargetFrameworkProfile />
    <PublishUrl>ftp://cuetools.net/cuetools.net/install/cuetools/</PublishUrl>
    <Install>true</Install>
@@ -49,7 +49,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -60,7 +60,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -68,6 +68,7 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <UseVSHostingProcess>true</UseVSHostingProcess>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
--- a/CUETools/CUETools.sln
+++ b/CUETools/CUETools.sln
@@ -163,7 +163,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsMediaLib", "..\Third
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Codecs.WMA", "..\CUETools.Codecs.WMA\CUETools.Codecs.WMA.csproj", "{082D6B9E-326E-4D15-9798-DE70A6EDAE9E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Codecs.BDLPCM", "..\CUETools.Codecs.MPEG\CUETools.Codecs.MPEG.csproj", "{E75F7CCD-4266-42E1-A039-DC7EB5EDD8F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Codecs.MPEG", "..\CUETools.Codecs.MPEG\CUETools.Codecs.MPEG.csproj", "{E75F7CCD-4266-42E1-A039-DC7EB5EDD8F6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.eac3to", "..\CUETools.eac3to\CUETools.eac3to.csproj", "{E3FF7539-6B22-4922-8FEF-6D26F2C2E3CE}"
 EndProject
@@ -199,6 +199,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Codecs.ffmpeg", ".
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFmpeg.AutoGen", "..\..\FFmpeg.AutoGen\FFmpeg.AutoGen\FFmpeg.AutoGen.csproj", "{B0A0C17A-C1BC-4CB1-BE1E-F545F54A7923}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.ChaptersToCue", "..\CUETools.ChaptersToCue\CUETools.ChaptersToCue.csproj", "{6ADBBF4B-AD3A-4782-A694-18662196780B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -773,6 +775,18 @@ Global
 		{B0A0C17A-C1BC-4CB1-BE1E-F545F54A7923}.Release|Win32.Build.0 = Release|Any CPU
 		{B0A0C17A-C1BC-4CB1-BE1E-F545F54A7923}.Release|x64.ActiveCfg = Release|Any CPU
 		{B0A0C17A-C1BC-4CB1-BE1E-F545F54A7923}.Release|x64.Build.0 = Release|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Debug|Win32.Build.0 = Debug|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Debug|x64.Build.0 = Debug|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Release|Win32.ActiveCfg = Release|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Release|Win32.Build.0 = Release|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Release|x64.ActiveCfg = Release|Any CPU
+		{6ADBBF4B-AD3A-4782-A694-18662196780B}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -835,6 +849,7 @@ Global
 		{8FE405A0-E837-4088-88AD-B63652E34790} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{A2C09014-C430-4E58-A323-306CCDF313C5} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{B0A0C17A-C1BC-4CB1-BE1E-F545F54A7923} = {8B179853-B7D6-479C-B8B2-6CBCE835D040}
+		{6ADBBF4B-AD3A-4782-A694-18662196780B} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C634D169-5814-4203-94B6-6A11371DDA95}
--- a/CUETools/TestRipper/TestRipper.csproj
+++ b/CUETools/TestRipper/TestRipper.csproj
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>TestRipper</RootNamespace>
    <AssemblyName>TestRipper</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <FileUpgradeFlags>
--- a/CUETools/frmChoice.Designer.cs
+++ b/CUETools/frmChoice.Designer.cs
@@ -48,6 +48,8 @@ namespace JDP
            this.Item = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Value = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
+            this.buttonMusicBrainz = new System.Windows.Forms.Button();
+            this.buttonNavigateCTDB = new System.Windows.Forms.Button();
            this.tableLayoutPanel1.SuspendLayout();
            this.tableLayoutPanel2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -118,6 +120,8 @@ namespace JDP
            // 
            resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2");
            this.tableLayoutPanel2.Controls.Add(this.buttonOk, 3, 0);
+            this.tableLayoutPanel2.Controls.Add(this.buttonMusicBrainz, 0, 0);
+            this.tableLayoutPanel2.Controls.Add(this.buttonNavigateCTDB, 1, 0);
            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
            // 
            // pictureBox1
@@ -234,6 +238,22 @@ namespace JDP
            this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker1_DoWork);
            this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker1_RunWorkerCompleted);
            // 
+            // buttonMusicBrainz
+            // 
+            resources.ApplyResources(this.buttonMusicBrainz, "buttonMusicBrainz");
+            this.buttonMusicBrainz.Image = global::JDP.Properties.Resources.musicbrainz;
+            this.buttonMusicBrainz.Name = "buttonMusicBrainz";
+            this.buttonMusicBrainz.UseVisualStyleBackColor = true;
+            this.buttonMusicBrainz.Click += new System.EventHandler(this.buttonMusicBrainz_Click);
+            // 
+            // buttonNavigateCTDB
+            // 
+            resources.ApplyResources(this.buttonNavigateCTDB, "buttonNavigateCTDB");
+            this.buttonNavigateCTDB.Image = global::JDP.Properties.Resources.cdrepair1;
+            this.buttonNavigateCTDB.Name = "buttonNavigateCTDB";
+            this.buttonNavigateCTDB.UseVisualStyleBackColor = true;
+            this.buttonNavigateCTDB.Click += new System.EventHandler(this.buttonNavigateCTDB_Click);
+            // 
            // frmChoice
            // 
            this.AcceptButton = this.buttonOk;
@@ -279,5 +299,7 @@ namespace JDP
 		private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumnTrackLength;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Item;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Value;
-	}
+        private System.Windows.Forms.Button buttonMusicBrainz;
+        private System.Windows.Forms.Button buttonNavigateCTDB;
+    }
 }
--- a/CUETools/frmChoice.cs
+++ b/CUETools/frmChoice.cs
@@ -105,6 +105,8 @@ namespace JDP
                    tableLayoutPanelMeta.Show();
                    tableLayoutPanel1.SetRowSpan(listChoices, 2);
                    tableLayoutPanel1.PerformLayout();
+                    buttonMusicBrainz.Show();
+                    buttonNavigateCTDB.Show();
                }
                else
                {
@@ -113,6 +115,8 @@ namespace JDP
                    tableLayoutPanelMeta.Hide();
                    tableLayoutPanel1.SetRowSpan(textBox1, 3);
                    tableLayoutPanel1.PerformLayout();
+                    buttonMusicBrainz.Hide();
+                    buttonNavigateCTDB.Hide();
                }
                if (listChoices.Items.Count > 0)
                    listChoices.Items[0].Selected = true;
@@ -176,7 +180,13 @@ namespace JDP
            CUEMetadataEntry ri = ChosenRelease;
            if (e.CloseReason != CloseReason.None || DialogResult != DialogResult.OK || ri == null || CUE == null)
                return;
+            for (int i = 0; i < ri.metadata.Tracks.Count; i++)
+            {
+                if (ri.metadata.Tracks[i].ISRC == "")
+                    ri.metadata.Tracks[i].ISRC = CUE.Metadata.Tracks[i].ISRC;
+            }
            CUE.CopyMetadata(ri.metadata);
+
            // TODO: copy album art

        }
@@ -330,8 +340,8 @@ namespace JDP
        {
            ListViewItem item = ChosenItem;
            CUEMetadataEntry r = ChosenRelease;
-            var label = dataGridViewMetadata.Rows[e.RowIndex].Cells[1].Value as string;
-            if (label != null && item != null && r != null)
+            var label = dataGridViewMetadata.Rows[e.RowIndex].Cells[1].Value as string ?? "";
+            if (item != null && r != null)
            {
                switch (e.RowIndex)
                {
@@ -399,6 +409,7 @@ namespace JDP
                        break;
                }
                ResetPictureBox();
+                e.Handled = true;
                return;
            }

@@ -417,6 +428,7 @@ namespace JDP
                        break;
                }
                ResetPictureBox();
+                e.Handled = true;
                return;
            }

@@ -426,6 +438,7 @@ namespace JDP
                else trimEdge <<= 1;
                if (trimEdge > 1024) trimEdge = 0;
                ResetPictureBox();
+                e.Handled = true;
                return;
            }
        }
@@ -485,6 +498,18 @@ namespace JDP
                catch { }
        }

+        private void buttonMusicBrainz_Click(object sender, EventArgs e)
+        {
+            if (CUE == null) return;
+            System.Diagnostics.Process.Start($"http://musicbrainz.org/bare/cdlookup.html?toc={CUE.TOC.MusicBrainzTOC}");
+        }
+
+        private void buttonNavigateCTDB_Click(object sender, EventArgs e)
+        {
+            if (CUE == null) return;
+            System.Diagnostics.Process.Start($"http://{config.advanced.CTDBServer}/?tocid={CUE.TOC.TOCID}");
+        }
+
        /*
        private void listTracks_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
        {
--- a/CUETools/frmChoice.resx
+++ b/CUETools/frmChoice.resx
@@ -123,13 +123,13 @@
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="buttonOk.Location" type="System.Drawing.Point, System.Drawing">
-    <value>947, 5</value>
+    <value>989, 5</value>
  </data>
  <data name="buttonOk.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>4, 5, 4, 5</value>
  </data>
  <data name="buttonOk.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 43</value>
+    <value>190, 43</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="buttonOk.TabIndex" type="System.Int32, mscorlib">
@@ -172,179 +172,178 @@
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAc
-        KAAAAk1TRnQBSQFMAgEBCQEAAWQBAAFkAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
-        AwABMAMAAQEBAAEgBgABMBIAAwsBDwMUARsDHQEpAyIBMgFPAVIBTwGmAUoBXwFJAdEBSgFfAUkB0QM8
-        AWYEAAM8AWYBSgFfAUkB0QFKAV8BSQHRAUoBXwFJAdEBSgFfAUkB0QFPAVIBTwGpAyMBM8AAAwYBCAMK
-        AQ4DEAEVAxIBGQFMAV4BSwHMAR4B1QENAf8BMwGRAS0B7wFNAU4BTQGZBAABTQFOAU0BmQEzAZEBLQHv
-        AR4B1QENAf8BHgHVAQ0B/wEeAdUBDQH/AUoBYwFJAdEDEwEa0AABTgFfAUsBzAEhAc0BEAH/AUoBXgFJ
-        AdEDIwEzBAADIwEzAUoBXgFJAdEBHgHMAQ0B/wEeAcwBDQH/AR4BzAENAf8BTQFmAUkB0cQAASsBLAEr
-        AUMBUQFbAVABuAFRAVsBUAG4ASsBLAErAUMBTgFiAUsBzAElAcQBFAH/AUoBXQFJAdEDPAFmBAADPAFm
-        AUoBXQFJAdEBHgHBAQ0B/wEeAcEBDQH/AR4BwQENAf8BTQFmAUkB0cQAAVIBWQFQAbIBSwHGAToB/wFJ
-        AZoBOwHzAU4BYgFLAcwBRwFrAUQB2QEfAbcBDgH/ATgBhQEvAe8BRwFdAUcB0wFLAVkBSwHMAUcBXQFH
-        AdMBNAGDAS4B7wEgAbcBDwH/AR8BtgEOAf8BHgG2AQ0B/wFNAWYBSQHRxAABTgFkAUsBzAFKAcUBOQH/
-        AUABuwEvAf8BSQHEATgB/wE/Ab0BLgH/AR4BqwENAf8BIAGsAQ8B/wEkAa8BEwH/ASQBrwETAf8BIwGv
-        ARIB/wE4AYcBLwHvAUoBZgFJAdEBSgFmAUkB0QE0AYYBLgHvAU0BZgFJAdHEAAFSAVoBUAGyAVIBzQFB
-        Af8BTAGfAT0B8wFOAWQBSwHMAU0BbwFHAdkBMAGwAR8B/wEfAaIBDgH/AR4BoQENAf8BHgGhAQ0B/wEl
-        AagBFAH/AUoBZwFHAdMDPAFmAyMBMwFNAU4BTQGZAzwBZsQAASsBLAErAUMBUQFcAVABuAFRAVwBUAG4
-        ASsBLAErAUMBTgFmAUsBzAFMAccBOwH/ATsBtwEqAf8BMQGtASAB/wEnAaQBFgH/AS4BqgEdAf8BSwFi
-        AUsBzOQAAU4BZgFLAcwBTwHKAT4B/wFBAbwBMAH/AUEBvAEwAf8BQQG8ATAB/wFJAcQBOAH/AUsBZwFL
-        AdMDPAFmAyMBMwFNAU4BTQGZAzwBZtQAAU4BZgFLAcwBVAHPAUMB/wFGAcEBNQH/AUYBwQE1Af8BRgHB
-        ATUB/wFIAcMBNwH/AUsBlQFCAe8BSgFmAUoB0QFKAWYBSgHRAUsBlAFCAe8BTgFmAUsBzNQAAU4BZgFL
-        AcwBYQHcAVAB/wFZAdQBSAH/AVgB0wFHAf8BVwHSAUYB/wFRAcwBQAH/AUsBxgE6Af8BUwHOAUIB/wFc
-        AdcBSwH/AVoB1QFJAf8BTgFmAUsBzNQAAU0BUAFNAZkBTwFpAUsBzAFPAWkBSwHMAU8BaQFLAcwBTwFp
-        AUsBzAFNAXQBSQHZAVcB0gFGAf8BTQF0AUcB2QFPAWkBSwHMAU8BaQFLAcwBTQFQAU0BmeQAASsBLAEr
-        AUMBTwFpAUsBzAFiAd0BUQH/AU8BaQFLAcwBKwEsASsBQ+wAAVIBXgFQAbgBXAGvAUwB8wFdAdgBTAH/
-        AVsBrwFMAfMBUgFeAVABuOwAAVIBXgFQAbgBbgHpAV0B/wFpAeQBWAH/AW0B6AFcAf8BUgFeAVABuOwA
-        ASsBLAErAUMBUgFcAVABsgFPAWkBSwHMAVIBXAFQAbIBKwEsASsBQ9gAAx0BKgNDAXcDHQEqOAADJwE7
-        A04BlAJeAVwBzgFqAWMBWQHrAWoBYwFZAesCXgFcAc4DTgGUAgAB4gH/AgAB4gH/JAABYAFoAXAB/wFg
-        AWgBcAH/AWABaAFwAf8BYAFoAXAB/xwAA8cB/wNsAf8DbQH/A8cB/wPGAf8DxgH/A8cB/wPHAf8DxgH/
-        A8cB/wPHAf8DxwH/A8cB/wPHAf8MAAMdASkDQgF0Av8B8AH/A0IBdAMdASksAAMKAQ0DTgGWAY8BcwFN
-        AfoB4QHNAbkB/wHxAeABzgH/AfkB5wHWAf8B+AHmAdQB/wHwAd0BzAH/AeEBzQG5Af8CAAHiAf8CAAHi
-        Af8DCgENGAABYAFoAXAB/wM3Af8DNwH/AR4CLgH/AwUB/wMFAf8DAAH/AwUB/xAAA20B/wMAAf8DFAH/
-        Ay8B/wMAAf8DCQH/A8cB/wPGAf8DxgH/A8cB/wPHAf8DxwH/A8YB/wPHAf8DxwH/A8cB/wQAAxwBKANA
-        AXEC/wHwAf8C6QHaA/8B8QH/A0ABcQMcASgkAAMKAQ0DVwG4AdkBvwGlAf8B/gHyAeQC/wHnAc8B/wH8
-        AdsBuwH/AfkB0wGyAf8B9gHQAawB/wH0AdEBrgH/AfYB2AG7Af8CAAHiAf8CAAHiAf8DVwG4AwoBDRAA
-        AzcB/wG9AsYB/wFgAWgBcAH/AzcB/wEWAh4B/wMFAf8DBQH/AwAB/wMAAf8DBQH/DwAB/wPDDf8DLwH/
-        AwkB/wPHAf8DxgH/A8cB/wPGAf8DxgH/A8cB/wPHAf8DxwH/A8cB/wMcAScDQAFvAv8B8AH/AesB3QGx
-        Af8B9wHBAScB/wHtAd8BswP/AfIB/wNAAW8DHAEnIAADTgGWAdkBvwGlAv8B+AHrAv8B6wHRAv8B4QHD
-        Af8B/gHbAboB/wH7AdYBsgH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/
-        AgAB4gH/CAABFgIeAf8DNwH/AWABaAFwAf8BvQLGAf8BYAFoAXAB/wEWAh4B/wMFAf8DBQH/AwAB/wMA
-        Af8DAAH/AwUB/wsAAf8DwxH/AwAB/wPHAf8DxgH/A8cB/wPHAf8DxwH/A8cB/wPHAf8DxwH/A8cB/wNA
-        AW4C/wHwAf8C6QHaAf8B5wGrAREB/wHnAasBEQH/AecBqwERAf8B6gHbAbAD/wH0Af8DQAFuAxwBJxgA
-        AyYBOAGpAYcBSAH9Av4B+gL/AfkB6QL/Ae8B2AL/AecBzQL/AeEBwgH/AfwB3AG7Af8CAAHiAf8CAAHi
-        Af8CAAHiAf8CAAHiAf8CAAHiAf8CAAHiAf8CAAHiAf8CAAHiAf8EAAEWAh4B/wEeAi4B/wM3Af8DNwH/
-        AWABaAFwAf8BYAFoAXAB/wEeAi4B/wEWAh4B/wMFAf8DAAH/AwAB/wMAAf8DAAH/ARYCHgH/BAADbQH/
-        AwkB/wNQAf8DrAH/A60B/wPDAf8DAAH/AxUB/wMAAf8DAAH/AwAB/wMAAf8DFQH/A8cB/wPHAf8DxwH/
-        AxwBJwM/AW0C/wHxAf8B5wHXAasB/wHXAZYBAAH/AdcBlgEAAf8B1wGWAQAB/wHoAdgBrgP/AfUB/wM/
-        AW0DHAEnFAADTgGWAeIBzgG6Af8B9wHeAcYC/wHpAdEC/wH2AeIC/wHyAd0C/wHwAd0B/wH4AeoB2QH/
-        AfgB5gHUAf8B+wHfAccB/wH1Ac8BqwH/AgAB4gH/AgAB4gH/AfgB3QHDAf8B4gHOAboB/wNOAZYEAAMF
-        Af8BFgIeAf8BFgIeAf8BHgIuAf8BHgIuAf8DBQH/AQ0BWAFgAf8BDQFYAWAB/wMAAf8DAAH/AwAB/wMA
-        Af8DAAH/AwAB/wQAA8cB/wNtAf8DCQH/AwAB/wMABf8DAAH/AwkB/wOTCf8DiQH/AxUB/wMVAf8DxgH/
-        A8cB/wQAAxsBJgM/AWwC/wHyAf8B5QHUAakB/wHNAYkBAAH/Ac0BiQEAAf8BzQGJAQAB/wHoAdcBrwP/
-        AfcB/wM/AWwDGwEmEAACXgFbAdAB7wHgAdAB/wHnAb4BlgH/AecBvAGUAf8B8AHMAakB/wH+AewB2gH/
-        Ad0BxAGsAf8CZAFcAecCZAFcAecB3QHDAaoB/wH4Ad0BxAH/AgAB4gH/AgAB4gH/AfUB1gG4Af8B8QHf
-        Ac8B/wJeAVsB0AFgAWgBcAH/AwAB/wMFAf8DBQH/AwUB/wMFAf8BAAHGAdYB/wEAAcYB1gH/AQABxgHW
-        Af8BAAHGAdYB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AWABaAFwAf8DxwH/A8cB/wPHAf8DxgH/AwAF/wMA
-        Af8DFRH/A8IB/wMAAf8DxwH/A8YB/wgAAxsBJgM+AWsC/wH0Af8B5wHWAawB/wHRAY4BAAH/AdEBjgEA
-        Af8B0QGOAQAB/wHsAdsBswP/AfgB/wM+AWsDGwEmDAABagFkAVkB7AH1AeQB1QH/AekBvgGXAf8B6AG8
-        AZYB/wHnAbwBlAH/AfMB3gHKAf8BZgFhAVkB5gMUARsDFAEbAWYBYQFZAeYB9gHjAdMB/wIAAeIB/wIA
-        AeIB/wHtAckBpAH/AfYB5AHSAf8BagFkAVkB7AFgAWgBcAH/AwAB/wMAAf8DAAH/AwAB/wENAVgBYAH/
-        AQABxgHWAf8BAAHGAdYB/wEAAcYB1gH/AQABxgHWAf8BDQFYAWAB/wMAAf8DAAH/AwAB/wMAAf8BYAFo
-        AXAB/wNUAf8DVAH/A1UB/wNUAf8DAAX/AwAB/wMAAf8DLwH/A8MN/wMAAf8DVAH/A1QB/wwAAxsBJgM+
-        AWsC/wH1Af8B6wHcAbMB/wHfAaEBBwH/Ad8BoQEHAf8B3wGhAQcB/wHxAeIBuwP/AfoB/wM+AWsDGwEm
-        CAABagFkAVkB7AH1AeQB1QH/AekBvwGZAf8B6QHAAZkB/wHpAcEBmgH/AfMB3QHJAf8BZgFhAVkB5gMU
-        ARsDFAEbAWYBYQFZAeYB+AHoAdkB/wHyAdIBsgH/AfABzAGrAf8B8AHMAasB/wH2AeQB0wH/AWoBZAFZ
-        AewBYAFoAXAB/wMAAf8DAAH/AwAB/wMAAf8BDQFYAWAB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wEA
-        AcYB1gH/AQ0BWAFgAf8DBQH/AwUB/wMFAf8DBQH/AWABaAFwAf8DVAH/A1QB/wNUAf8DVQH/AwAF/wMA
-        Af8DMQH/AwkB/wMAAf8DAAH/AwAF/wMAAf8DVAH/A1UB/xAAAxsBJgM+AWoC/wH3Af8B8gHkAbsB/wHw
-        AbgBHgH/AfABuAEeAf8B8AG4AR4B/wL4AfQD/wH7Af8DPgFqAxoBJQQAAl4BWwHQAfAB4QHRAf8B6gHE
-        AaEB/wHpAcEBmwH/AekBwAGXAf8B8QHOAbIB/wHcAcMBqgH/AmQBXAHnAmQBXAHnAd0BxAGsAv8B/AHz
-        Av8B9AHlAv8B7gHaAf8B/AHlAdEB/wHxAeEB0QH/Al4BWwHQAWABaAFwAf8DAAH/AwAB/wMAAf8DAAH/
-        AwUB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wEAAcYB1gH/AwUB/wEWAh4B/wEWAh4B/wMFAf8DBQH/
-        AWABaAFwAf8DVAH/A1QB/wNVAf8DVAH/AwAF/wMJAf8DAAH/AxUB/wMxAf8DMQH/AwAF/wMAAf8DVAH/
-        A1QB/xQAAxoBJQM9AWkC/wH4Af8B9wHqAcMB/wH9AckBLwH/AfkB7AHHAf8C+wH3Af8C/AH5A/8B/AH/
-        Az0BaQMaASUDTgGWAeIBzgG6Af8B8QHSAbYB/wHrAcEBmwH/AesBvwGZAv8B5AHTAv8B6AHbAf8B8wHa
-        AccB/wH4AfEB5AL/AfgB7QL/AfcB6QL/Af4B8QL/AfwB7wL/AfwB8gH/AeIBzgG6Af8DTgGWBAADBQH/
-        AwAB/wMAAf8DAAH/AwAB/wMFAf8BDQFYAWAB/wENAVgBYAH/AwUB/wM3Af8DNwH/ARYCHgH/ARYCHgH/
-        ARYCHgH/BAADVQH/A1UB/wNVAf8DVAH/AwAJ/wOIAf8DFQH/AwAB/wMJAf8DAAX/AwAB/wNUAf8DVAH/
-        GAADGgElAz0BaAL/AfoB/wL4AfQB/wL7AfcB/wLoAd4B/wLYAckB/wLoAd4D/wH+Af8DPQFoAyYBOAGp
-        AYcBSAH9AfoB7QHhAf8B7AHHAaMC/wHsAdoF/wH3Ac0BtgH/AewBvQGXAv8B9AHcA/8B9wL/AfcB6AP/
-        AfMD/wH5Af8C/gH5Af8BqQGHAUgB/QMmATgEAAM3Af8DAAH/AwAB/wMAAf8DBQH/AwUB/wEWAh4B/wM3
-        Af8BYAFoAXAB/wFgAq0B/wM3Af8DNwH/ARYCHgH/AzcB/wQAA1QB/wNUAf8DVAH/A1QB/wMAAf8DrA3/
-        A8MB/wNDAf8DAAX/AwAB/wNUAf8DVAH/HAADGgElAz0BaAL/AfsB/wL8AfkB/wLLAbsB/wQAAssBvAP/
-        Af4B/wM9AWgEAANOAZYB2QG/AaUC/wH6AfAG/wH9AfMB/wHwAcEBowH/Ae4BxgGgAf8B/QHwAdED/wH+
-        Av8B/QHwAv8B/QHxBf8B2QG/AaUB/wNOAZYMAAEWAh4B/wMAAf8DAAH/AwUB/wMFAf8BFgIeAf8BHgIu
-        Af8BYAFoAXAB/wG9AsYB/wFgAWgBcAH/AR4CLgH/AzcB/wgAA1QB/wNVAf8DVAH/A1QB/wMVAf8DLwH/
-        A60Z/wMAAf8DVQH/A1QB/yAAAxoBJQM9AWcC/wH8Af8C1AHKAf8CrwGfAf8C1AHLA/8B/gH/Az0BZwQA
-        AwoBDQNXAbgB2QG/AaUB/wH+Af0B/AL/AfEB5AH/AfIBygGuAf8B8gHSAa0B/wH5Ae0ByAP/AfcD/wH9
-        Af8B/gH9AfwB/wHZAb8BpQH/A1cBuAMKAQ0QAAM3Af8DAAH/AwUB/wMFAf8BFgIeAf8BHgIuAf8DNwH/
-        AWABaAFwAf8BYAFoAXAB/wFgAWgBcAH/DAADVAH/A1QB/wNVAf8DVAH/A1QB/wMVAf8DAAH/AxUB/wOJ
-        Ef8DAAH/A1UB/wNUAf8kAAMaASQDPQFnAv8B/gP/Af4D/wH+Bf8DPQFnCAADCgENA04BlgGPAXMBTQH6
-        AeEBzQG5Af8B8QHiAdQB/wH5AewB3wH/AfsB8wHlAf8B9AHtAeQB/wHiAc4BuwH/AY8BcwFNAfoDTgGW
-        AwoBDRgAAR4CLgH/AR4CLgH/AwUB/wMFAf8DBQH/ARYCHgH/AzcB/wM3Af8QAANUAf8DVAH/A1QB/wNU
-        Af8DVAH/A1QB/wNUAf8DFQH/AwAB/wMJAf8DUAH/A8IF/wMAAf8DVQH/A1QB/ygAAxoBJAM8AWYDPAFm
-        AzwBZgM8AWYDMQFNEAADJwE7A04BlAJeAVwBzgFqAWMBWQHrAWgBYgFYAe8CXgFbAdkDTwGXAycBOygA
-        AWABaAFwAf8BYAFoAXAB/wFgAWgBcAH/AWABaAFwAf8cAANUAf8DVAH/A1QB/wNUAf8DVQH/A1QB/wNU
-        Af8DVAH/A1QB/wMJAf8DAAH/Ay8B/wMVAf8DVQH/EAADAgEDAxQBHAMwAUwDRAF5A1ABmgNQAaQDUAGa
-        A0QBeQMwAUwDFAEcAwMBBAgAA5YB/wENAgAB/wENAgAB/wENAgAB/wENAgAB/wENAgAB/wENAgAB/wEN
-        AgAB/wENAgAB/wENAgAB/wENAgAB/wENAgAB/wENAgAB/wENAgAB/wENAgAB/wENAgAB/wQAAUABzAL/
-        AQ0CmQH/AQ0CmQH/AUABzAL/AUABzAL/AUABzAL/AUABzAL/AUABzAL/AUABzAL/AUABzAL/AUABzAL/
-        AUABzAL/AUABzAL/AUABzAL/EAADAgEDAxQBHAMwAUwDRAF5A1ABmgNQAaQDUAGaA0QBeQMwAUwDFAEc
-        AwMBBBAAAwQBBgMkATYDUwGwAWMCXgHlA18B+wGzAqkB/wNfAfsDYAHrA1oB0wNTAawDRwGCAygBPAMH
-        AQkEAAHMApkB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wPqAf8D6gH/A+oB/wGAAgAB/wPqAf8D6gH/
-        A+oB/wGAAgAB/wGAAgAB/wFAAgAB/wENAgAB/wENApkB/wMAAf8DAwH/AycB/wMAAf8DAAH/AUABzAL/
-        AUABzAL/AUABzAL/AUABzAL/AUABzAL/AUABzAL/AUABzAL/AUABzAL/AUABzAL/AUABzAL/CAADBAEG
-        AyQBNgNTAbABYwJeAeUDXwH7AbMCqQH/A18B+wNgAesDWgHTA1MBrANHAYIDKAE8AwcBCQgAAwIBAwMx
-        AU8DXAHqAc8CtAL/At0C/wLiAv8C6AL/Au4C/wLzAf8DzwH/A18B8wNYAcYDTAGSAygBPAMDAQQBzAKZ
-        Af8BgAIAAf8BgAIAAf8BgAIAAf8D8QH/AYACAAH/AYACAAH/A/EB/wGAAgAB/wPxAf8BgAIAAf8BgAIA
-        Af8D8QH/AYACAAH/AYACAAH/AQ0CAAH/AwAB/wPMDf8DJwH/AwAB/wFAAcwC/wFAAcwC/wFAAcwC/wFA
-        AcwC/wFAAcwC/wFAAcwC/wFAAcwC/wFAAcwC/wFAAcwC/wQAAwIBAwMxAU8DXAHqAc8CtAL/At0C/wLi
-        Av8C6AL/Au4C/wLzAf8DzwH/A18B8wNYAcYDTAGSAygBPAMDAQQEAAMmATgDbQH3AfUCxwL/AtIC/wLY
-        Av8C3QL/AuIC/wLoAv8C9AX/A/UB/wNfAfsDWAHGA0cBggMUARwBzAKZAf8BmQEAAQ0B/wGAAgAB/wGA
-        AgAF/wGAAgAB/wGAAgAF/wGAAgAF/wGAAgAB/wGAAgAF/wGAAgAB/wGAAgAB/wENAgAB/wMAAf8DzBH/
-        AwAB/wFAAcwC/wFAAcwC/wFAAcwC/wFAAcwC/wFAAcwC/wFAAcwC/wFAAcwC/wFAAcwC/wFAAcwC/wQA
-        AyYBOANtAfcB9QLHAv8C0gL/AtgC/wLdAv8C4gL/AugC/wL0Bf8D9QH/A18B+wNYAcYDRwGCAxQBHAMH
-        AQkDXgHdAfUCzQL/As8C/wLNAv8C0gL/AtgC/wLdAv8C4gL/AvoJ/wP1Af8DXwHzA1MBrAMwAUwBzAKZ
-        Af8BmQEAAQ0B/wGAAgAB/wGAAgAB/wGAAgAN/wGAAgAN/wGAAgAB/wGAAgAB/wGAAgAB/wENAgAB/wEN
-        ApkB/wMAAf8DUQH/A8AB/wPAAf8DzAH/AwAB/wMDAf8DAAH/AwAB/wMAAf8DAAH/AwMB/wFAAcwC/wFA
-        AcwC/wFAAcwC/wMHAQkDXgHdAfUCzQL/As8C/wLNAv8C0gL/AtgC/wLdAv8C4gL/AvoJ/wP1Af8DXwHz
-        A1MBrAMwAUwDPgFqAcYCsQL/AtkC/wLUAv8CzwL/As0C/wHUAdsC/wHXAeIC/wHkAeoR/wHSAswB/wNa
-        AdMDQwF3AcwCmQH/AZkBAAENAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIABf8BgAIABf8BgAIA
-        Af8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BDQIAAf8BQAHMAv8BDQKZAf8DAAH/AwAB/wMABf8DAAH/
-        AwAB/wGkAqAJ/wOZAf8DAwH/AwMB/wFAAcwC/wFAAcwC/wM+AWoBxgKxAv8C2QL/AtQC/wLPAv8CzQL/
-        AdQB2wL/AdcB4gL/AeQB6hH/AdICzAH/A1oB0wNDAXcDVgG2Af8C4wH/AQABCAEJAf8BAAEIAQkB/wEA
-        AQgBCQL/Ad4B5wH/AQABCAEJAv8B0QHzAf8BAAEIAQkC/wH4Av8BSAJOAf8BAAEIAQkB/wFIAk4B/wHM
-        ApkB/wFcAlUB6gNOAZQBzAKZAf8BmQEAAQ0B/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAF/wGA
-        AgAF/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wENAgAB/wFAAcwC/wFAAcwC/wFAAcwC/wFA
-        AcwC/wMABf8DAAH/AwMR/wPMAf8DAAH/AUABzAL/AUABzAL/A1YBtgH/AuMB/wFIAk4B/wEAAQgBCQH/
-        AUgCTgL/Ad4B5wH/AUgCTgH/AQABCAEJAf8BSAJOAv8B+AL/AQABCAEJAf8BAAEIAQkB/wEAAQgBCQH/
-        AcwCmQH/AVwCVQHqA04BlANhAeIB/wLnAf8BAAEIAQkC/wLeAv8C4AL/Ae8B/AH/AQABCAEJAv8B4gH8
-        Af8BAAEIAQkB/wH8AfAB+QH/AQABCAEJAf8BzAKZAf8BAAEIAQkB/wHMApkB/wFtAmwB9wNRAaEBzAKZ
-        Af8BmQEAAQ0B/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGA
-        AgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wENAgAB/wGZAkAB/wGZAkAB/wGZAkAB/wGZAkAB/wMA
-        Bf8DAAH/AwAB/wMnAf8DzA3/AwAB/wGZAkAB/wGZAkAB/wNhAeIB/wLnAf8BAAEIAQkC/wLeAf8BAAEI
-        AQkC/wHvAfwB/wEAAQgBCQL/AeIB/AH/AQABCAEJAf8B/AHwAfkB/wEAAQgBCQH/AcwCmQH/AcwCmQH/
-        AcwCmQH/AW0CbAH3A1EBoQGeAowB/wHpAr4B/wEAAQgBCQH/AQABCAEJAf8B+QLWAv8B6QHzAf8BAAEI
-        AQkB/wEAAQgBCQH/AQABCAEJAf8B+QHoAewB/wEAAQgBCQH/AeYCugH/AeYCvQH/AeYCwAH/AaYClAH/
-        A04BlDT/A/EB/wPqAf8DgAH/AZkCQAH/AZkCQAH/AZkCQAH/AZkCQAH/AwAF/wMAAf8DLwH/AwAB/wMA
-        Af8DAAH/AwAF/wMAAf8BmQJAAf8BmQJAAf8BngKMAf8B6QK+Af8BAAEIAQkB/wHzAsUB/wH5AtYC/wHp
-        AfMB/wEAAQgBCQL/AekB8wH/AQABCAEJAf8B+QHoAewB/wEAAQgBCQH/AQABCAEJAf8B5gK9Af8B5gLA
-        Af8BpgKUAf8DTgGUA10B0gHbAqgB/wEAAQgBCQH/AeoCtwH/AfMCzQL/Ae4B/AH/AQABCAEJAv8B0gH1
-        Af8BAAEIAQkC/wH0AfwB/wEAAQgBCQL/AtgB/wEAAQgBCQL/AuIB/wNiAfYDQwF3BP8BmQEAAQ0J/wGA
-        AgAN/wGAAgAB/wGAAgAN/wGAAgAB/wGAAgAB/wOAAf8BmQJAAf8BmQJAAf8BmQJAAf8BmQJAAf8DAAX/
-        AwAB/wMAAf8DAwH/Ay8B/wMvAf8DAAX/AwAB/wGZAkAB/wGZAkAB/wNdAdIB2wKoAf8BAAEIAQkB/wHq
-        ArcB/wEAAQgBCQL/Ae4B/AH/AQABCAEJAv8B0gH1Af8BAAEIAQkC/wH0AfwB/wEAAQgBCQL/AtgC/wLd
-        Av8C4gH/A2IB9gNDAXcDVgGxAdUCogH/AQABCAEJAf8BAAEIAQkB/wEAAQgBCQL/AfYC/wFIAk4B/wEA
-        AQgBCQH/AUgCTgL/AeAB5wH/AUgCTgH/AQABCAEJAf8BSAJOAv8C3QH/A1oB5AMwAUwE/wGZAQABDQn/
-        AYACAAn/AYACABH/AYACAAH/A/EB/wPqAf8DgAH/AZkCQAH/AZkCQAH/AZkCQAH/AZkCQAH/AwAJ/wOZ
-        Af8DAwH/AwAB/wMAAf8DAAX/AwAB/wGZAkAB/wGZAkAB/wNWAbEB1QKiAf8BSAJOAf8BAAEIAQkB/wFI
-        Ak4C/wH2Av8BAAEIAQkC/wHSAfUB/wEAAQgBCQL/AeAB5wH/AQABCAEJAf8BAAEIAQkB/wEAAQgBCQL/
-        At0B/wNaAeQDMAFMAzIBUAHDAr8S/wHsAfEC/wHbAecC/wHZAd4C/wLUAv8CzwL/As0C/wLSAf8BxgKt
-        Af8DUwGsAxQBGwT/AZkBAAENCf8BgAIACf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIABf8BgAIAAf8BgAIA
-        Af8BgAIAAf8BDQIAAf8BmQJAAf8BmQJAAf8BmQJAAf8BmQJAAf8DAAH/A8AN/wPMAf8DOQH/AwAF/wMA
-        Af8BmQJAAf8BmQJAAf8DMgFQAcMCvxL/AewB8QL/AdsB5wL/AdkB3gL/AtQC/wLPAv8CzQL/AtIB/wHG
-        Aq0B/wNTAawDFAEbBAADWgHAA/UK/wL+Av8C5wL/AuMC/wLeAv8C2QL/AtQC/wLPAf8B9QLHAf8DXwHj
-        AyMBNAMCAQME/wGZAQABDQH/AYACAAX/AYACAAn/AYACAAn/AYACAAX/AYACAAH/A/EB/wPqAf8BDQIA
-        Af8BmQJAAf8BmQJAAf8BmQJAAf8BmQJAAf8DAwH/AycB/wPAGf8DAAH/AZkCQAH/AZkCQAH/BAADWgHA
-        A/UK/wL+Av8C5wL/AuMC/wLeAv8C2QL/AtQC/wLPAf8B9QLHAf8DXwHjAyMBNAMCAQMEAAMXASADYgHv
-        A/UG/wL4Av8C7AL/AucC/wLjAv8C3gL/AtkB/wH1As0B/wNtAfcDMAFNAwQBBgQABP8BmQINCf8BgAIA
-        Af8BgAIACf8BgAIAAf8BgAIADf8BgAIAAf8BgAIAAf8DhgH/AZkCQAH/AZkCQAH/AZkCQAH/AZkCQAH/
-        AZkCQAH/AwMB/wMAAf8DAwH/A5kR/wMAAf8BmQJAAf8BmQJAAf8EAAMXASADYgHvA/UG/wL4Av8C7AL/
-        AucC/wLjAv8C3gL/AtkB/wH1As0B/wNtAfcDMAFNAwQBBgwAAxcBIANaAcADxgL/AvcC/wLyAv8C7AL/
-        AucC/wLjAf8BxgKxAf8DXgHQAyQBNgMCAQMIAAT/AZkCDS3/A/EB/wPqAf8DhgH/AZkCQAH/AZkCQAH/
-        AZkCQAH/AZkCQAH/AZkCQAH/AZkCQAH/AZkCQAH/AwMB/wMAAf8DAAH/A1EB/wPMBf8DAAH/AZkCQAH/
-        AZkCQAH/CAADFwEgA1oBwAPGAv8C9wL/AvIC/wLsAv8C5wL/AuMB/wHGArEB/wNeAdADJAE2AwIBAxgA
-        AzIBUANRAaIDXQHSAYwCiQH/A2AB1ANUAaYDNwFaAwUBBxAACP8BzAKZLf8D8QH/A8AB/wQAAZkCQAH/
-        AZkCQAH/AZkCQAH/AZkCQAH/AZkCQAH/AZkCQAH/AZkCQAH/AZkCQAH/AZkCQAH/AwAB/wMAAf8DJwH/
-        AwMB/wGZAkAB/xQAAzIBUANRAaIDXQHSAYwCiQH/A2AB1ANUAaYDNwFaAwUBBxAAAUIBTQE+BwABPgMA
-        ASgDAAFAAwABMAMAAQEBAAEBBQABgAEBFgAD/wIAAYAHAAGABgAB8AGBBwABgQcAAQEHAAEBBwABAQcA
-        AR8GAAHwAQEGAAHwAQEGAAHwAQEGAAHwAQEGAAH/AQcGAAH/AQcGAAH/AQcGAAH/AQcGAAHjAf8B8AEH
-        AfwBPwGAAQEBwQH/AcABAwHwAQ8CAAGAAf8BgAEBAeABBwMAAX8BgAEAAcABAwMAAT8CAAGAAQEDAAEf
-        AgABgAEBAgABgAEPBgABwAEHBgAB4AEDBgAB8AEBBgAB+AMAAYABAQIAAfwDAAGAAQECAAH+AQgBgAEB
-        AcABAwIAAf8BAAGAAQEB4AEHAgAB/wGAAcABAwHwAQ8CAAH/AcAB8AEPAfwBPwGAAQEB4AEDAgABgAEB
-        AeABAwHAAQEEAAHAAQEBgAUAAYABAAGABQABgEEAAYAFAAGAAQABgAEBBAABgAEBAcABAwQAAcABAwHw
-        AQ8CAAGAAQEB8AEPCw==
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAE
+        KAAAAk1TRnQBSQFMAgEBCQEAAWwBAAFsAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABMAMAAQEBAAEgBgABMBIAAwsBDwMUARsDHQEpAyIBMgFRAVIBUQGmAVABXgFQAdEBUAFeAVAB0QM8
+        AWYEAAM8AWYBUAFeAVAB0QFQAV4BUAHRAVABXgFQAdEBUAFeAVAB0QFRAVIBUQGpAyMBM8AAAwYBCAMK
+        AQ4DEAEVAxIBGQFSAVwBUQHMAR0B1QEMAf8BOAGMATIB7wNOAZkEAANOAZkBOAGMATIB7wEdAdUBDAH/
+        AR0B1QEMAf8BHQHVAQwB/wFQAWABUAHRAxMBGtAAAVIBXgFRAcwBIAHNAQ8B/wFQAV0BUAHRAyMBMwQA
+        AyMBMwFQAV0BUAHRAR0BzAEMAf8BHQHMAQwB/wEdAcwBDAH/AVEBYwFQAdHEAAErASwBKwFDAVQBWQFU
+        AbgBVAFZAVQBuAErASwBKwFDAVIBXwFRAcwBJAHEARMB/wFQAVwBUAHRAzwBZgQAAzwBZgFQAVwBUAHR
+        AR0BwQEMAf8BHQHBAQwB/wEdAcEBDAH/AVEBYwFQAdHEAAFUAVYBUwGyAUoBxgE5Af8BSwGVAT0B8wFS
+        AV8BUQHMAU0BZgFLAdkBHgG3AQ0B/wE8AYEBNAHvAU4BXQFOAdMBUQFZAVEBzAFOAV0BTgHTATkBfwEz
+        Ae8BHwG3AQ4B/wEeAbYBDQH/AR0BtgEMAf8BUQFjAVAB0cQAAVIBYQFRAcwBSQHFATgB/wE/AbsBLgH/
+        AUgBxAE3Af8BPgG9AS0B/wEdAasBDAH/AR8BrAEOAf8BIwGvARIB/wEjAa8BEgH/ASIBrwERAf8BPAGD
+        ATQB7wFQAWMBUAHRAVABYwFQAdEBOQGCATMB7wFRAWMBUAHRxAABVAFYAVMBsgFRAc0BQAH/AUwBmgE/
+        AfMBUgFhAVEBzAFSAWkBTQHZAS8BsAEeAf8BHgGiAQ0B/wEdAaEBDAH/AR0BoQEMAf8BJAGoARMB/wFP
+        AWIBTgHTAzwBZgMjATMDTgGZAzwBZsQAASsBLAErAUMBVAFZAVQBuAFUAVkBVAG4ASsBLAErAUMBUgFi
+        AVEBzAFLAccBOgH/AToBtwEpAf8BMAGtAR8B/wEmAaQBFQH/AS0BqgEcAf8BUQFfAVEBzOQAAVIBYgFR
+        AcwBTgHKAT0B/wFAAbwBLwH/AUABvAEvAf8BQAG8AS8B/wFIAcQBNwH/AU8BYgFPAdMDPAFmAyMBMwNO
+        AZkDPAFm1AABUgFiAVEBzAFTAc8BQgH/AUUBwQE0Af8BRQHBATQB/wFFAcEBNAH/AUcBwwE2Af8BTAGP
+        AUYB7wFQAWMBUAHRAVABYwFQAdEBTAGOAUYB7wFSAWIBUQHM1AABUgFiAVEBzAFgAdwBTwH/AVgB1AFH
+        Af8BVwHTAUYB/wFWAdIBRQH/AVABzAE/Af8BSgHGATkB/wFSAc4BQQH/AVsB1wFKAf8BWQHVAUgB/wFS
+        AWIBUQHM1AADTgGZAVIBZAFRAcwBUgFkAVEBzAFSAWQBUQHMAVIBZAFRAcwBUgFvAU0B2QFWAdIBRQH/
+        AVIBbwFNAdkBUgFkAVEBzAFSAWQBUQHMA04BmeQAASsBLAErAUMBUgFkAVEBzAFhAd0BUAH/AVIBZAFR
+        AcwBKwEsASsBQ+wAAVQBWwFUAbgBXQGoAUwB8wFcAdgBSwH/AVwBqAFMAfMBVAFbAVQBuOwAAVQBWwFU
+        AbgBbQHpAVwB/wFoAeQBVwH/AWwB6AFbAf8BVAFbAVQBuOwAASsBLAErAUMBVAFZAVMBsgFSAWQBUQHM
+        AVQBWQFTAbIBKwEsASsBQ9gAAx0BKgNDAXcDHQEqOAADJwE7A04BlAJeAVwBzgFpAWIBWQHrAWkBYgFZ
+        AesCXgFcAc4DTgGUAgAB4gH/AgAB4gH/JAABXwFnAW8B/wFfAWcBbwH/AV8BZwFvAf8BXwFnAW8B/xwA
+        A8cB/wNrAf8DbAH/A8cB/wPGAf8DxgH/A8cB/wPHAf8DxgH/A8cB/wPHAf8DxwH/A8cB/wPHAf8MAAMd
+        ASkDQgF0Av8B8AH/A0IBdAMdASksAAMKAQ0DTgGWAYwBcgFNAfoB4QHNAbkB/wHxAeABzgH/AfkB5wHW
+        Af8B+AHmAdQB/wHwAd0BzAH/AeEBzQG5Af8CAAHiAf8CAAHiAf8DCgENGAABXwFnAW8B/wM2Af8DNgH/
+        AR0CLQH/AwQB/wMEAf8DAAH/AwQB/xAAA2wB/wMAAf8DEwH/Ay4B/wMAAf8DCAH/A8cB/wPGAf8DxgH/
+        A8cB/wPHAf8DxwH/A8YB/wPHAf8DxwH/A8cB/wQAAxwBKANAAXEC/wHwAf8C6QHaA/8B8QH/A0ABcQMc
+        ASgkAAMKAQ0DVwG4AdkBvwGlAf8B/gHyAeQC/wHnAc8B/wH8AdsBuwH/AfkB0wGyAf8B9gHQAawB/wH0
+        AdEBrgH/AfYB2AG7Af8CAAHiAf8CAAHiAf8DVwG4AwoBDRAAAzYB/wG9AsYB/wFfAWcBbwH/AzYB/wEV
+        Ah0B/wMEAf8DBAH/AwAB/wMAAf8DBAH/DwAB/wPDDf8DLgH/AwgB/wPHAf8DxgH/A8cB/wPGAf8DxgH/
+        A8cB/wPHAf8DxwH/A8cB/wMcAScDQAFvAv8B8AH/AesB3QGxAf8B9wHBASYB/wHtAd8BswP/AfIB/wNA
+        AW8DHAEnIAADTgGWAdkBvwGlAv8B+AHrAv8B6wHRAv8B4QHDAf8B/gHbAboB/wH7AdYBsgH/AgAB4gH/
+        AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/AgAB4gH/CAABFQIdAf8DNgH/AV8BZwFv
+        Af8BvQLGAf8BXwFnAW8B/wEVAh0B/wMEAf8DBAH/AwAB/wMAAf8DAAH/AwQB/wsAAf8DwxH/AwAB/wPH
+        Af8DxgH/A8cB/wPHAf8DxwH/A8cB/wPHAf8DxwH/A8cB/wNAAW4C/wHwAf8C6QHaAf8B5wGrARAB/wHn
+        AasBEAH/AecBqwEQAf8B6gHbAbAD/wH0Af8DQAFuAxwBJxgAAyYBOAGoAYcBRwH9Av4B+gL/AfkB6QL/
+        Ae8B2AL/AecBzQL/AeEBwgH/AfwB3AG7Af8CAAHiAf8CAAHiAf8CAAHiAf8CAAHiAf8CAAHiAf8CAAHi
+        Af8CAAHiAf8CAAHiAf8EAAEVAh0B/wEdAi0B/wM2Af8DNgH/AV8BZwFvAf8BXwFnAW8B/wEdAi0B/wEV
+        Ah0B/wMEAf8DAAH/AwAB/wMAAf8DAAH/ARUCHQH/BAADbAH/AwgB/wNPAf8DrAH/A60B/wPDAf8DAAH/
+        AxQB/wMAAf8DAAH/AwAB/wMAAf8DFAH/A8cB/wPHAf8DxwH/AxwBJwM/AW0C/wHxAf8B5wHXAasB/wHX
+        AZYBAAH/AdcBlgEAAf8B1wGWAQAB/wHoAdgBrgP/AfUB/wM/AW0DHAEnFAADTgGWAeIBzgG6Af8B9wHe
+        AcYC/wHpAdEC/wH2AeIC/wHyAd0C/wHwAd0B/wH4AeoB2QH/AfgB5gHUAf8B+wHfAccB/wH1Ac8BqwH/
+        AgAB4gH/AgAB4gH/AfgB3QHDAf8B4gHOAboB/wNOAZYEAAMEAf8BFQIdAf8BFQIdAf8BHQItAf8BHQIt
+        Af8DBAH/AQwBVwFfAf8BDAFXAV8B/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wQAA8cB/wNsAf8DCAH/
+        AwAB/wMABf8DAAH/AwgB/wOTCf8DiQH/AxQB/wMUAf8DxgH/A8cB/wQAAxsBJgM/AWwC/wHyAf8B5QHU
+        AakB/wHNAYkBAAH/Ac0BiQEAAf8BzQGJAQAB/wHoAdcBrwP/AfcB/wM/AWwDGwEmEAACXgFbAdAB7wHg
+        AdAB/wHnAb4BlgH/AecBvAGUAf8B8AHMAakB/wH+AewB2gH/Ad0BxAGsAf8CZAFcAecCZAFcAecB3QHD
+        AaoB/wH4Ad0BxAH/AgAB4gH/AgAB4gH/AfUB1gG4Af8B8QHfAc8B/wJeAVsB0AFfAWcBbwH/AwAB/wME
+        Af8DBAH/AwQB/wMEAf8BAAHGAdYB/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wMAAf8DAAH/AwAB/wMA
+        Af8DAAH/AV8BZwFvAf8DxwH/A8cB/wPHAf8DxgH/AwAF/wMAAf8DFBH/A8IB/wMAAf8DxwH/A8YB/wgA
+        AxsBJgM+AWsC/wH0Af8B5wHWAawB/wHRAY4BAAH/AdEBjgEAAf8B0QGOAQAB/wHsAdsBswP/AfgB/wM+
+        AWsDGwEmDAABaAFkAVkB7AH1AeQB1QH/AekBvgGXAf8B6AG8AZYB/wHnAbwBlAH/AfMB3gHKAf8BZAFh
+        AVkB5gMUARsDFAEbAWQBYQFZAeYB9gHjAdMB/wIAAeIB/wIAAeIB/wHtAckBpAH/AfYB5AHSAf8BaAFk
+        AVkB7AFfAWcBbwH/AwAB/wMAAf8DAAH/AwAB/wEMAVcBXwH/AQABxgHWAf8BAAHGAdYB/wEAAcYB1gH/
+        AQABxgHWAf8BDAFXAV8B/wMAAf8DAAH/AwAB/wMAAf8BXwFnAW8B/wNTAf8DUwH/A1QB/wNTAf8DAAX/
+        AwAB/wMAAf8DLgH/A8MN/wMAAf8DUwH/A1MB/wwAAxsBJgM+AWsC/wH1Af8B6wHcAbMB/wHfAaEBBgH/
+        Ad8BoQEGAf8B3wGhAQYB/wHxAeIBuwP/AfoB/wM+AWsDGwEmCAABaAFkAVkB7AH1AeQB1QH/AekBvwGZ
+        Af8B6QHAAZkB/wHpAcEBmgH/AfMB3QHJAf8BZAFhAVkB5gMUARsDFAEbAWQBYQFZAeYB+AHoAdkB/wHy
+        AdIBsgH/AfABzAGrAf8B8AHMAasB/wH2AeQB0wH/AWgBZAFZAewBXwFnAW8B/wMAAf8DAAH/AwAB/wMA
+        Af8BDAFXAV8B/wEAAcYB1gH/AQABxgHWAf8BAAHGAdYB/wEAAcYB1gH/AQwBVwFfAf8DBAH/AwQB/wME
+        Af8DBAH/AV8BZwFvAf8DUwH/A1MB/wNTAf8DVAH/AwAF/wMAAf8DMAH/AwgB/wMAAf8DAAH/AwAF/wMA
+        Af8DUwH/A1QB/xAAAxsBJgM+AWoC/wH3Af8B8gHkAbsB/wHwAbgBHQH/AfABuAEdAf8B8AG4AR0B/wL4
+        AfQD/wH7Af8DPgFqAxoBJQQAAl4BWwHQAfAB4QHRAf8B6gHEAaEB/wHpAcEBmwH/AekBwAGXAf8B8QHO
+        AbIB/wHcAcMBqgH/AmQBXAHnAmQBXAHnAd0BxAGsAv8B/AHzAv8B9AHlAv8B7gHaAf8B/AHlAdEB/wHx
+        AeEB0QH/Al4BWwHQAV8BZwFvAf8DAAH/AwAB/wMAAf8DAAH/AwQB/wEAAcYB1gH/AQABxgHWAf8BAAHG
+        AdYB/wEAAcYB1gH/AwQB/wEVAh0B/wEVAh0B/wMEAf8DBAH/AV8BZwFvAf8DUwH/A1MB/wNUAf8DUwH/
+        AwAF/wMIAf8DAAH/AxQB/wMwAf8DMAH/AwAF/wMAAf8DUwH/A1MB/xQAAxoBJQM9AWkC/wH4Af8B9wHq
+        AcMB/wH9AckBLgH/AfkB7AHHAf8C+wH3Af8C/AH5A/8B/AH/Az0BaQMaASUDTgGWAeIBzgG6Af8B8QHS
+        AbYB/wHrAcEBmwH/AesBvwGZAv8B5AHTAv8B6AHbAf8B8wHaAccB/wH4AfEB5AL/AfgB7QL/AfcB6QL/
+        Af4B8QL/AfwB7wL/AfwB8gH/AeIBzgG6Af8DTgGWBAADBAH/AwAB/wMAAf8DAAH/AwAB/wMEAf8BDAFX
+        AV8B/wEMAVcBXwH/AwQB/wM2Af8DNgH/ARUCHQH/ARUCHQH/ARUCHQH/BAADVAH/A1QB/wNUAf8DUwH/
+        AwAJ/wOIAf8DFAH/AwAB/wMIAf8DAAX/AwAB/wNTAf8DUwH/GAADGgElAz0BaAL/AfoB/wL4AfQB/wL7
+        AfcB/wLoAd4B/wLYAckB/wLoAd4D/wH+Af8DPQFoAyYBOAGoAYcBRwH9AfoB7QHhAf8B7AHHAaMC/wHs
+        AdoF/wH3Ac0BtgH/AewBvQGXAv8B9AHcA/8B9wL/AfcB6AP/AfMD/wH5Af8C/gH5Af8BqAGHAUcB/QMm
+        ATgEAAM2Af8DAAH/AwAB/wMAAf8DBAH/AwQB/wEVAh0B/wM2Af8BXwFnAW8B/wFfAq0B/wM2Af8DNgH/
+        ARUCHQH/AzYB/wQAA1MB/wNTAf8DUwH/A1MB/wMAAf8DrA3/A8MB/wNCAf8DAAX/AwAB/wNTAf8DUwH/
+        HAADGgElAz0BaAL/AfsB/wL8AfkB/wLLAbsB/wQAAssBvAP/Af4B/wM9AWgEAANOAZYB2QG/AaUC/wH6
+        AfAG/wH9AfMB/wHwAcEBowH/Ae4BxgGgAf8B/QHwAdED/wH+Av8B/QHwAv8B/QHxBf8B2QG/AaUB/wNO
+        AZYMAAEVAh0B/wMAAf8DAAH/AwQB/wMEAf8BFQIdAf8BHQItAf8BXwFnAW8B/wG9AsYB/wFfAWcBbwH/
+        AR0CLQH/AzYB/wgAA1MB/wNUAf8DUwH/A1MB/wMUAf8DLgH/A60Z/wMAAf8DVAH/A1MB/yAAAxoBJQM9
+        AWcC/wH8Af8C1AHKAf8CrwGfAf8C1AHLA/8B/gH/Az0BZwQAAwoBDQNXAbgB2QG/AaUB/wH+Af0B/AL/
+        AfEB5AH/AfIBygGuAf8B8gHSAa0B/wH5Ae0ByAP/AfcD/wH9Af8B/gH9AfwB/wHZAb8BpQH/A1cBuAMK
+        AQ0QAAM2Af8DAAH/AwQB/wMEAf8BFQIdAf8BHQItAf8DNgH/AV8BZwFvAf8BXwFnAW8B/wFfAWcBbwH/
+        DAADUwH/A1MB/wNUAf8DUwH/A1MB/wMUAf8DAAH/AxQB/wOJEf8DAAH/A1QB/wNTAf8kAAMaASQDPQFn
+        Av8B/gP/Af4D/wH+Bf8DPQFnCAADCgENA04BlgGMAXIBTQH6AeEBzQG5Af8B8QHiAdQB/wH5AewB3wH/
+        AfsB8wHlAf8B9AHtAeQB/wHiAc4BuwH/AYwBcgFNAfoDTgGWAwoBDRgAAR0CLQH/AR0CLQH/AwQB/wME
+        Af8DBAH/ARUCHQH/AzYB/wM2Af8QAANTAf8DUwH/A1MB/wNTAf8DUwH/A1MB/wNTAf8DFAH/AwAB/wMI
+        Af8DTwH/A8IF/wMAAf8DVAH/A1MB/ygAAxoBJAM8AWYDPAFmAzwBZgM8AWYDMQFNEAADJwE7A04BlAJe
+        AVwBzgFpAWIBWQHrAWYBYgFYAe8CXgFbAdkDTwGXAycBOygAAV8BZwFvAf8BXwFnAW8B/wFfAWcBbwH/
+        AV8BZwFvAf8cAANTAf8DUwH/A1MB/wNTAf8DVAH/A1MB/wNTAf8DUwH/A1MB/wMIAf8DAAH/Ay4B/wMU
+        Af8DVAH/EAADAgEDAxQBHAMwAUwDRAF5A1ABmgNQAaQDUAGaA0QBeQMwAUwDFAEcAwMBBAgAA5YB/wEM
+        AgAB/wEMAgAB/wEMAgAB/wEMAgAB/wEMAgAB/wEMAgAB/wEMAgAB/wEMAgAB/wEMAgAB/wEMAgAB/wEM
+        AgAB/wEMAgAB/wEMAgAB/wEMAgAB/wEMAgAB/wQAAT8BzAL/AQwCmQH/AQwCmQH/AT8BzAL/AT8BzAL/
+        AT8BzAL/AT8BzAL/AT8BzAL/AT8BzAL/AT8BzAL/AT8BzAL/AT8BzAL/AT8BzAL/AT8BzAL/EAADAgED
+        AxQBHAMwAUwDRAF5A1ABmgNQAaQDUAGaA0QBeQMwAUwDFAEcAwMBBBAAAwQBBgMkATYDUwGwAWMCXgHl
+        A18B+wGzAqkB/wNfAfsDYAHrA1oB0wNTAawDRwGCAygBPAMHAQkEAAHMApkB/wGAAgAB/wGAAgAB/wGA
+        AgAB/wGAAgAB/wPqAf8D6gH/A+oB/wGAAgAB/wPqAf8D6gH/A+oB/wGAAgAB/wGAAgAB/wE/AgAB/wEM
+        AgAB/wEMApkB/wMAAf8DAgH/AyYB/wMAAf8DAAH/AT8BzAL/AT8BzAL/AT8BzAL/AT8BzAL/AT8BzAL/
+        AT8BzAL/AT8BzAL/AT8BzAL/AT8BzAL/AT8BzAL/CAADBAEGAyQBNgNTAbABYwJeAeUDXwH7AbMCqQH/
+        A18B+wNgAesDWgHTA1MBrANHAYIDKAE8AwcBCQgAAwIBAwMxAU8DXAHqAc8CtAL/At0C/wLiAv8C6AL/
+        Au4C/wLzAf8DzwH/A18B8wNYAcYDTAGSAygBPAMDAQQBzAKZAf8BgAIAAf8BgAIAAf8BgAIAAf8D8QH/
+        AYACAAH/AYACAAH/A/EB/wGAAgAB/wPxAf8BgAIAAf8BgAIAAf8D8QH/AYACAAH/AYACAAH/AQwCAAH/
+        AwAB/wPMDf8DJgH/AwAB/wE/AcwC/wE/AcwC/wE/AcwC/wE/AcwC/wE/AcwC/wE/AcwC/wE/AcwC/wE/
+        AcwC/wE/AcwC/wQAAwIBAwMxAU8DXAHqAc8CtAL/At0C/wLiAv8C6AL/Au4C/wLzAf8DzwH/A18B8wNY
+        AcYDTAGSAygBPAMDAQQEAAMmATgDbQH3AfUCxwL/AtIC/wLYAv8C3QL/AuIC/wLoAv8C9AX/A/UB/wNf
+        AfsDWAHGA0cBggMUARwBzAKZAf8BmQEAAQwB/wGAAgAB/wGAAgAF/wGAAgAB/wGAAgAF/wGAAgAF/wGA
+        AgAB/wGAAgAF/wGAAgAB/wGAAgAB/wEMAgAB/wMAAf8DzBH/AwAB/wE/AcwC/wE/AcwC/wE/AcwC/wE/
+        AcwC/wE/AcwC/wE/AcwC/wE/AcwC/wE/AcwC/wE/AcwC/wQAAyYBOANtAfcB9QLHAv8C0gL/AtgC/wLd
+        Av8C4gL/AugC/wL0Bf8D9QH/A18B+wNYAcYDRwGCAxQBHAMHAQkDXgHdAfUCzQL/As8C/wLNAv8C0gL/
+        AtgC/wLdAv8C4gL/AvoJ/wP1Af8DXwHzA1MBrAMwAUwBzAKZAf8BmQEAAQwB/wGAAgAB/wGAAgAB/wGA
+        AgAN/wGAAgAN/wGAAgAB/wGAAgAB/wGAAgAB/wEMAgAB/wEMApkB/wMAAf8DUAH/A8AB/wPAAf8DzAH/
+        AwAB/wMCAf8DAAH/AwAB/wMAAf8DAAH/AwIB/wE/AcwC/wE/AcwC/wE/AcwC/wMHAQkDXgHdAfUCzQL/
+        As8C/wLNAv8C0gL/AtgC/wLdAv8C4gL/AvoJ/wP1Af8DXwHzA1MBrAMwAUwDPgFqAcYCsQL/AtkC/wLU
+        Av8CzwL/As0C/wHUAdsC/wHXAeIC/wHkAeoR/wHSAswB/wNaAdMDQwF3AcwCmQH/AZkBAAEMAf8BgAIA
+        Af8BgAIAAf8BgAIAAf8BgAIAAf8BgAIABf8BgAIABf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIA
+        Af8BDAIAAf8BPwHMAv8BDAKZAf8DAAH/AwAB/wMABf8DAAH/AwAB/wGkAqAJ/wOZAf8DAgH/AwIB/wE/
+        AcwC/wE/AcwC/wM+AWoBxgKxAv8C2QL/AtQC/wLPAv8CzQL/AdQB2wL/AdcB4gL/AeQB6hH/AdICzAH/
+        A1oB0wNDAXcDVgG2Af8C4wH/AQABBwEIAf8BAAEHAQgB/wEAAQcBCAL/Ad4B5wH/AQABBwEIAv8B0QHz
+        Af8BAAEHAQgC/wH4Av8BRwJNAf8BAAEHAQgB/wFHAk0B/wHMApkB/wFcAlUB6gNOAZQBzAKZAf8BmQEA
+        AQwB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAF/wGAAgAF/wGAAgAB/wGAAgAB/wGAAgAB/wGA
+        AgAB/wGAAgAB/wEMAgAB/wE/AcwC/wE/AcwC/wE/AcwC/wE/AcwC/wMABf8DAAH/AwIR/wPMAf8DAAH/
+        AT8BzAL/AT8BzAL/A1YBtgH/AuMB/wFHAk0B/wEAAQcBCAH/AUcCTQL/Ad4B5wH/AUcCTQH/AQABBwEI
+        Af8BRwJNAv8B+AL/AQABBwEIAf8BAAEHAQgB/wEAAQcBCAH/AcwCmQH/AVwCVQHqA04BlANhAeIB/wLn
+        Af8BAAEHAQgC/wLeAv8C4AL/Ae8B/AH/AQABBwEIAv8B4gH8Af8BAAEHAQgB/wH8AfAB+QH/AQABBwEI
+        Af8BzAKZAf8BAAEHAQgB/wHMApkB/wFtAmwB9wNRAaEBzAKZAf8BmQEAAQwB/wGAAgAB/wGAAgAB/wGA
+        AgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGAAgAB/wGA
+        AgAB/wEMAgAB/wGZAj8B/wGZAj8B/wGZAj8B/wGZAj8B/wMABf8DAAH/AwAB/wMmAf8DzA3/AwAB/wGZ
+        Aj8B/wGZAj8B/wNhAeIB/wLnAf8BAAEHAQgC/wLeAf8BAAEHAQgC/wHvAfwB/wEAAQcBCAL/AeIB/AH/
+        AQABBwEIAf8B/AHwAfkB/wEAAQcBCAH/AcwCmQH/AcwCmQH/AcwCmQH/AW0CbAH3A1EBoQGeAowB/wHp
+        Ar4B/wEAAQcBCAH/AQABBwEIAf8B+QLWAv8B6QHzAf8BAAEHAQgB/wEAAQcBCAH/AQABBwEIAf8B+QHo
+        AewB/wEAAQcBCAH/AeYCugH/AeYCvQH/AeYCwAH/AaYClAH/A04BlDT/A/EB/wPqAf8DgAH/AZkCPwH/
+        AZkCPwH/AZkCPwH/AZkCPwH/AwAF/wMAAf8DLgH/AwAB/wMAAf8DAAH/AwAF/wMAAf8BmQI/Af8BmQI/
+        Af8BngKMAf8B6QK+Af8BAAEHAQgB/wHzAsUB/wH5AtYC/wHpAfMB/wEAAQcBCAL/AekB8wH/AQABBwEI
+        Af8B+QHoAewB/wEAAQcBCAH/AQABBwEIAf8B5gK9Af8B5gLAAf8BpgKUAf8DTgGUA10B0gHbAqgB/wEA
+        AQcBCAH/AeoCtwH/AfMCzQL/Ae4B/AH/AQABBwEIAv8B0gH1Af8BAAEHAQgC/wH0AfwB/wEAAQcBCAL/
+        AtgB/wEAAQcBCAL/AuIB/wNiAfYDQwF3BP8BmQEAAQwJ/wGAAgAN/wGAAgAB/wGAAgAN/wGAAgAB/wGA
+        AgAB/wOAAf8BmQI/Af8BmQI/Af8BmQI/Af8BmQI/Af8DAAX/AwAB/wMAAf8DAgH/Ay4B/wMuAf8DAAX/
+        AwAB/wGZAj8B/wGZAj8B/wNdAdIB2wKoAf8BAAEHAQgB/wHqArcB/wEAAQcBCAL/Ae4B/AH/AQABBwEI
+        Av8B0gH1Af8BAAEHAQgC/wH0AfwB/wEAAQcBCAL/AtgC/wLdAv8C4gH/A2IB9gNDAXcDVgGxAdUCogH/
+        AQABBwEIAf8BAAEHAQgB/wEAAQcBCAL/AfYC/wFHAk0B/wEAAQcBCAH/AUcCTQL/AeAB5wH/AUcCTQH/
+        AQABBwEIAf8BRwJNAv8C3QH/A1oB5AMwAUwE/wGZAQABDAn/AYACAAn/AYACABH/AYACAAH/A/EB/wPq
+        Af8DgAH/AZkCPwH/AZkCPwH/AZkCPwH/AZkCPwH/AwAJ/wOZAf8DAgH/AwAB/wMAAf8DAAX/AwAB/wGZ
+        Aj8B/wGZAj8B/wNWAbEB1QKiAf8BRwJNAf8BAAEHAQgB/wFHAk0C/wH2Av8BAAEHAQgC/wHSAfUB/wEA
+        AQcBCAL/AeAB5wH/AQABBwEIAf8BAAEHAQgB/wEAAQcBCAL/At0B/wNaAeQDMAFMAzIBUAHDAr8S/wHs
+        AfEC/wHbAecC/wHZAd4C/wLUAv8CzwL/As0C/wLSAf8BxgKtAf8DUwGsAxQBGwT/AZkBAAEMCf8BgAIA
+        Cf8BgAIAAf8BgAIAAf8BgAIAAf8BgAIABf8BgAIAAf8BgAIAAf8BgAIAAf8BDAIAAf8BmQI/Af8BmQI/
+        Af8BmQI/Af8BmQI/Af8DAAH/A8AN/wPMAf8DOAH/AwAF/wMAAf8BmQI/Af8BmQI/Af8DMgFQAcMCvxL/
+        AewB8QL/AdsB5wL/AdkB3gL/AtQC/wLPAv8CzQL/AtIB/wHGAq0B/wNTAawDFAEbBAADWgHAA/UK/wL+
+        Av8C5wL/AuMC/wLeAv8C2QL/AtQC/wLPAf8B9QLHAf8DXwHjAyMBNAMCAQME/wGZAQABDAH/AYACAAX/
+        AYACAAn/AYACAAn/AYACAAX/AYACAAH/A/EB/wPqAf8BDAIAAf8BmQI/Af8BmQI/Af8BmQI/Af8BmQI/
+        Af8DAgH/AyYB/wPAGf8DAAH/AZkCPwH/AZkCPwH/BAADWgHAA/UK/wL+Av8C5wL/AuMC/wLeAv8C2QL/
+        AtQC/wLPAf8B9QLHAf8DXwHjAyMBNAMCAQMEAAMXASADYgHvA/UG/wL4Av8C7AL/AucC/wLjAv8C3gL/
+        AtkB/wH1As0B/wNtAfcDMAFNAwQBBgQABP8BmQIMCf8BgAIAAf8BgAIACf8BgAIAAf8BgAIADf8BgAIA
+        Af8BgAIAAf8DhgH/AZkCPwH/AZkCPwH/AZkCPwH/AZkCPwH/AZkCPwH/AwIB/wMAAf8DAgH/A5kR/wMA
+        Af8BmQI/Af8BmQI/Af8EAAMXASADYgHvA/UG/wL4Av8C7AL/AucC/wLjAv8C3gL/AtkB/wH1As0B/wNt
+        AfcDMAFNAwQBBgwAAxcBIANaAcADxgL/AvcC/wLyAv8C7AL/AucC/wLjAf8BxgKxAf8DXgHQAyQBNgMC
+        AQMIAAT/AZkCDC3/A/EB/wPqAf8DhgH/AZkCPwH/AZkCPwH/AZkCPwH/AZkCPwH/AZkCPwH/AZkCPwH/
+        AZkCPwH/AwIB/wMAAf8DAAH/A1AB/wPMBf8DAAH/AZkCPwH/AZkCPwH/CAADFwEgA1oBwAPGAv8C9wL/
+        AvIC/wLsAv8C5wL/AuMB/wHGArEB/wNeAdADJAE2AwIBAxgAAzIBUANRAaIDXQHSAYwCiQH/A2AB1ANU
+        AaYDNwFaAwUBBxAACP8BzAKZLf8D8QH/A8AB/wQAAZkCPwH/AZkCPwH/AZkCPwH/AZkCPwH/AZkCPwH/
+        AZkCPwH/AZkCPwH/AZkCPwH/AZkCPwH/AwAB/wMAAf8DJgH/AwIB/wGZAj8B/xQAAzIBUANRAaIDXQHS
+        AYwCiQH/A2AB1ANUAaYDNwFaAwUBBxAAAUIBTQE+BwABPgMAASgDAAFAAwABMAMAAQEBAAEBBQABgAEB
+        FgAD/wIAAYAHAAGABgAB8AGBBwABgQcAAQEHAAEBBwABAQcAAR8GAAHwAQEGAAHwAQEGAAHwAQEGAAHw
+        AQEGAAH/AQcGAAH/AQcGAAH/AQcGAAH/AQcGAAHjAf8B8AEHAfwBPwGAAQEBwQH/AcABAwHwAQ8CAAGA
+        Af8BgAEBAeABBwMAAX8BgAEAAcABAwMAAT8CAAGAAQEDAAEfAgABgAEBAgABgAEPBgABwAEHBgAB4AED
+        BgAB8AEBBgAB+AMAAYABAQIAAfwDAAGAAQECAAH+AQgBgAEBAcABAwIAAf8BAAGAAQEB4AEHAgAB/wGA
+        AcABAwHwAQ8CAAH/AcAB8AEPAfwBPwGAAQEB4AEDAgABgAEBAeABAwHAAQEEAAHAAQEBgAUAAYABAAGA
+        BQABgEEAAYAFAAGAAQABgAEBBAABgAEBAcABAwQAAcABAwHwAQ8CAAGAAQEB8AEPCw==
 </value>
  </data>
  <data name="listChoices.TabIndex" type="System.Int32, mscorlib">
@@ -404,6 +403,66 @@
  <data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
    <value>4</value>
  </data>
+  <data name="buttonMusicBrainz.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="buttonMusicBrainz.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="buttonMusicBrainz.Size" type="System.Drawing.Size, System.Drawing">
+    <value>191, 47</value>
+  </data>
+  <data name="buttonMusicBrainz.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="buttonMusicBrainz.Text" xml:space="preserve">
+    <value>&amp;Musicbrainz</value>
+  </data>
+  <data name="buttonMusicBrainz.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageBeforeText</value>
+  </data>
+  <data name="&gt;&gt;buttonMusicBrainz.Name" xml:space="preserve">
+    <value>buttonMusicBrainz</value>
+  </data>
+  <data name="&gt;&gt;buttonMusicBrainz.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;buttonMusicBrainz.Parent" xml:space="preserve">
+    <value>tableLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;buttonMusicBrainz.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="buttonNavigateCTDB.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="buttonNavigateCTDB.Location" type="System.Drawing.Point, System.Drawing">
+    <value>200, 3</value>
+  </data>
+  <data name="buttonNavigateCTDB.Size" type="System.Drawing.Size, System.Drawing">
+    <value>191, 47</value>
+  </data>
+  <data name="buttonNavigateCTDB.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="buttonNavigateCTDB.Text" xml:space="preserve">
+    <value>CT&amp;DB</value>
+  </data>
+  <data name="buttonNavigateCTDB.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageBeforeText</value>
+  </data>
+  <data name="&gt;&gt;buttonNavigateCTDB.Name" xml:space="preserve">
+    <value>buttonNavigateCTDB</value>
+  </data>
+  <data name="&gt;&gt;buttonNavigateCTDB.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;buttonNavigateCTDB.Parent" xml:space="preserve">
+    <value>tableLayoutPanel2</value>
+  </data>
+  <data name="&gt;&gt;buttonNavigateCTDB.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
  <data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
@@ -435,7 +494,7 @@
    <value>0</value>
  </data>
  <data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="buttonOk" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,37.59399,Percent,22.93233,Percent,19.17293,Percent,20.11278" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="buttonOk" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="buttonMusicBrainz" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="buttonNavigateCTDB" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,16.66667,Percent,16.66667,Percent,50,Percent,16.66667" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
  </data>
  <data name="pictureBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
--- a/Freedb/Freedb.csproj
+++ b/Freedb/Freedb.csproj
@@ -28,7 +28,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -46,7 +46,7 @@
    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
    <BaseAddress>285212672</BaseAddress>
    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
@@ -70,7 +70,7 @@
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
    <BaseAddress>285212672</BaseAddress>
    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
--- a/MusicBrainz/MusicBrainz.csproj
+++ b/MusicBrainz/MusicBrainz.csproj
@@ -18,19 +18,19 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <AssemblyKeyFile>.</AssemblyKeyFile>
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
    <RunWithWarnings>false</RunWithWarnings>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <AssemblyKeyFile>.</AssemblyKeyFile>
--- a/ProgressODoom/ProgressODoom.csproj
+++ b/ProgressODoom/ProgressODoom.csproj
@@ -16,7 +16,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -36,7 +36,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>..\bin\Debug\net40\</OutputPath>
+    <OutputPath>..\bin\Debug\net47\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -45,7 +45,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>..\bin\Release\net40\</OutputPath>
+    <OutputPath>..\bin\Release\net47\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>