diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 85eed0cc5..51ed3077e 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ContentModelStore">
-    <e p="$USER_HOME$/.cache/JetBrains/Rider2020.1/extResources" t="IncludeRecursive" />
-    <e p="$USER_HOME$/.cache/JetBrains/Rider2020.1/resharper-host/local/Transient/ReSharperHost/v201/SolutionCaches/_Aaru.232757112.00" t="ExcludeRecursive" />
-    <e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
-    <e p="$APPLICATION_CONFIG_DIR$/scratches" t="IncludeRecursive" />
-    <e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
-    <e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
-    <e p="$PROJECT_DIR$" t="IncludeFlat">
-      <e p=".git/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Checksums/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.CommonTypes/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Console/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Decoders/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Dto/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Helpers/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/CICMMetadata/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/cuetools.net/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/cuetoolsnet/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/oxyplot-avalonia/info/exclude" t="IncludeRecursive" />
-      <e p=".github/CODE_OF_CONDUCT.md" t="Include" />
-      <e p=".github/ISSUE_TEMPLATE.md" t="Include" />
-      <e p=".github/PULL_REQUEST_TEMPLATE.md" t="Include" />
+    <e p="C:\Users\claunia\AppData\Local\JetBrains\Rider2020.1\extResources" t="IncludeRecursive" />
+    <e p="C:\Users\claunia\AppData\Local\JetBrains\Rider2020.1\resharper-host\Local\Transient\ReSharperHost\v201\SolutionCaches\_Aaru.795230756.00" t="ExcludeRecursive" />
+    <e p="C:\Users\claunia\AppData\Local\JetBrains\Toolbox\apps\Rider\ch-0\201.6668.197.plugins\puppet\lib\stubs" t="IncludeRecursive" />
+    <e p="C:\Users\claunia\Development\Aaru\Aaru" t="IncludeFlat">
+      <e p=".git\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.Checksums\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.CommonTypes\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.Console\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.Decoders\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.Dto\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.Helpers\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\CICMMetadata\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\cuetools.net\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\cuetoolsnet\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\oxyplot-avalonia\info\exclude" t="IncludeRecursive" />
+      <e p=".github\CODE_OF_CONDUCT.md" t="Include" />
+      <e p=".github\ISSUE_TEMPLATE.md" t="Include" />
+      <e p=".github\PULL_REQUEST_TEMPLATE.md" t="Include" />
       <e p=".travis.yml" t="Include" />
       <e p="Aaru" t="IncludeRecursive">
         <e p="Aaru.csproj" t="IncludeRecursive" />
-        <e p="Aaru.icns" t="Include" />
+        <e p="aaruformat.xml" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Commands" t="Include">
           <e p="Configure.cs" t="Include" />
           <e p="Database" t="Include">
@@ -74,13 +72,6 @@
         <e p="Info.plist" t="Include" />
         <e p="MacIcon.icns" t="Include" />
         <e p="Main.cs" t="Include" />
-        <e p="Progress.cs" t="Include" />
-        <e p="Properties" t="Include">
-          <e p="launchSettings.json" t="Include" />
-        </e>
-        <e p="Settings.StyleCop" t="Include" />
-        <e p="aaruformat.xml" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp2.1" t="Include">
@@ -88,12 +79,18 @@
             </e>
           </e>
         </e>
+        <e p="Progress.cs" t="Include" />
+        <e p="Properties" t="Include">
+          <e p="launchSettings.json" t="Include" />
+        </e>
+        <e p="Settings.StyleCop" t="Include" />
       </e>
       <e p="Aaru.Checksums" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
         <e p="Aaru.Checksums.csproj" t="IncludeRecursive" />
         <e p="Adler32Context.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CDChecksums.cs" t="Include" />
         <e p="CRC16CCITTContext.cs" t="Include" />
         <e p="CRC16Context.cs" t="Include" />
@@ -102,7 +99,6 @@
         <e p="CRC64Context.cs" t="Include" />
         <e p="FletcherContext.cs" t="Include" />
         <e p="MD5Context.cs" t="Include" />
-<<<<<<< HEAD
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp2.1" t="Include">
@@ -110,8 +106,6 @@
             </e>
           </e>
         </e>
-=======
->>>>>>> fd40d036... Fix case collision.
         <e p="ReedSolomon.cs" t="Include" />
         <e p="Register.cs" t="Include" />
         <e p="SHA1Context.cs" t="Include" />
@@ -119,19 +113,12 @@
         <e p="SHA384Context.cs" t="Include" />
         <e p="SHA512Context.cs" t="Include" />
         <e p="SpamSumContext.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Checksums.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
       </e>
       <e p="Aaru.CommonTypes" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
         <e p="Aaru.CommonTypes.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Enums" t="Include">
           <e p="DeviceType.cs" t="Include" />
           <e p="ErrorNumber.cs" t="Include" />
@@ -190,6 +177,13 @@
           <e p="Statistics.cs" t="Include" />
           <e p="Version.cs" t="Include" />
         </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp2.1" t="Include">
+              <e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="Partition.cs" t="Include" />
         <e p="PluginBase.cs" t="Include" />
         <e p="Structs" t="Include">
@@ -210,32 +204,10 @@
           <e p="TapeFile.cs" t="Include" />
           <e p="TapePartition.cs" t="Include" />
         </e>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-=======
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
->>>>>>> fd40d036... Fix case collision.
-              <e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
-<<<<<<< HEAD
-=======
->>>>>>> b56058a0... Update flake library to latest version.
-=======
->>>>>>> fd40d036... Fix case collision.
       </e>
       <e p="Aaru.Compression" t="IncludeRecursive">
         <e p="Aaru.Compression.csproj" t="IncludeRecursive" />
         <e p="AppleRle.cs" t="Include" />
-        <e p="TeleDiskLzh.cs" t="Include" />
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
@@ -244,6 +216,7 @@
             </e>
           </e>
         </e>
+        <e p="TeleDiskLzh.cs" t="Include" />
       </e>
       <e p="Aaru.Console" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
@@ -261,6 +234,7 @@
       </e>
       <e p="Aaru.Core" t="IncludeRecursive">
         <e p="Aaru.Core.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Checksum.cs" t="Include" />
         <e p="DataFile.cs" t="Include" />
         <e p="Delegates.cs" t="Include" />
@@ -281,8 +255,8 @@
               <e p="Trim.cs" t="Include" />
             </e>
             <e p="Dump.cs" t="Include" />
-            <e p="MMC.cs" t="Include" />
             <e p="Metadata.cs" t="Include" />
+            <e p="MMC.cs" t="Include" />
             <e p="NVMe.cs" t="Include" />
             <e p="PlayStationPortable" t="Include">
               <e p="MemoryStick.cs" t="Include" />
@@ -292,11 +266,11 @@
             <e p="ResumeSupport.cs" t="Include" />
             <e p="SBC.cs" t="Include" />
             <e p="SCSI.cs" t="Include" />
-            <e p="SSC.cs" t="Include" />
             <e p="SecureDigital.cs" t="Include" />
+            <e p="SSC.cs" t="Include" />
             <e p="XGD.cs" t="Include" />
           </e>
-          <e p="Info" t="Include">
+          <e p="info" t="Include">
             <e p="DeviceInfo.cs" t="Include" />
             <e p="Plextor.cs" t="Include" />
             <e p="Properties.cs" t="Include" />
@@ -310,17 +284,17 @@
             <e p="FireWire.cs" t="Include" />
             <e p="MMC.cs" t="Include" />
             <e p="PCMCIA.cs" t="Include" />
-            <e p="SSC.cs" t="Include" />
-            <e p="Scsi.cs" t="Include" />
+            <e p="SCSI.cs" t="Include" />
             <e p="SecureDigital.cs" t="Include" />
-            <e p="USB.cs" t="Include" />
+            <e p="SSC.cs" t="Include" />
+            <e p="Usb.cs" t="Include" />
           </e>
           <e p="Scanning" t="Include">
             <e p="ATA.cs" t="Include" />
             <e p="MediaScan.cs" t="Include" />
             <e p="NVMe.cs" t="Include" />
-            <e p="SCSI.cs" t="Include" />
             <e p="ScanResults.cs" t="Include" />
+            <e p="SCSI.cs" t="Include" />
             <e p="SecureDigital.cs" t="Include" />
           </e>
         </e>
@@ -340,12 +314,19 @@
           <e p="Detection" t="Include">
             <e p="MMC.cs" t="Include" />
           </e>
-          <e p="Info" t="Include">
+          <e p="info" t="Include">
             <e p="CompactDisc.cs" t="Include" />
             <e p="ScsiInfo.cs" t="Include" />
             <e p="XgdInfo.cs" t="Include" />
           </e>
         </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp2.1" t="Include">
+              <e p="Aaru.Core.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="Options.cs" t="Include" />
         <e p="Partitions.cs" t="Include" />
         <e p="PrintScsiModePages.cs" t="Include" />
@@ -362,81 +343,61 @@
           <e p="Sidecar.cs" t="Include" />
         </e>
         <e p="Statistics.cs" t="Include" />
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-=======
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
->>>>>>> fd40d036... Fix case collision.
-              <e p="Aaru.Core.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
-<<<<<<< HEAD
-=======
->>>>>>> b56058a0... Update flake library to latest version.
-=======
->>>>>>> fd40d036... Fix case collision.
       </e>
       <e p="Aaru.Database" t="IncludeRecursive">
         <e p="Aaru.Database.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Context.cs" t="Include" />
         <e p="ContextFactory.cs" t="Include" />
         <e p="Migrations" t="Include">
-          <e p="20181126222301_DeviceReportV2.Designer.cs" t="Include" />
           <e p="20181126222301_DeviceReportV2.cs" t="Include" />
-          <e p="20181127001622_AddDeviceBasicFields.Designer.cs" t="Include" />
+          <e p="20181126222301_DeviceReportV2.Designer.cs" t="Include" />
           <e p="20181127001622_AddDeviceBasicFields.cs" t="Include" />
-          <e p="20181127013131_CorrectReportsDbSet.Designer.cs" t="Include" />
+          <e p="20181127001622_AddDeviceBasicFields.Designer.cs" t="Include" />
           <e p="20181127013131_CorrectReportsDbSet.cs" t="Include" />
-          <e p="20181221015906_NameValueStatistics.Designer.cs" t="Include" />
+          <e p="20181127013131_CorrectReportsDbSet.Designer.cs" t="Include" />
           <e p="20181221015906_NameValueStatistics.cs" t="Include" />
-          <e p="20181221032605_MediaStatistics.Designer.cs" t="Include" />
+          <e p="20181221015906_NameValueStatistics.Designer.cs" t="Include" />
           <e p="20181221032605_MediaStatistics.cs" t="Include" />
-          <e p="20181221034941_SeenDevicesStatistics.Designer.cs" t="Include" />
+          <e p="20181221032605_MediaStatistics.Designer.cs" t="Include" />
           <e p="20181221034941_SeenDevicesStatistics.cs" t="Include" />
-          <e p="20181221040408_OperatingSystemStatistics.Designer.cs" t="Include" />
+          <e p="20181221034941_SeenDevicesStatistics.Designer.cs" t="Include" />
           <e p="20181221040408_OperatingSystemStatistics.cs" t="Include" />
-          <e p="20181221041242_VersionStatistics.Designer.cs" t="Include" />
+          <e p="20181221040408_OperatingSystemStatistics.Designer.cs" t="Include" />
           <e p="20181221041242_VersionStatistics.cs" t="Include" />
-          <e p="20181221125353_AddStatsCounters.Designer.cs" t="Include" />
+          <e p="20181221041242_VersionStatistics.Designer.cs" t="Include" />
           <e p="20181221125353_AddStatsCounters.cs" t="Include" />
-          <e p="20181223183913_FixUnsignedFields.Designer.cs" t="Include" />
+          <e p="20181221125353_AddStatsCounters.Designer.cs" t="Include" />
           <e p="20181223183913_FixUnsignedFields.cs" t="Include" />
-          <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs" t="Include" />
+          <e p="20181223183913_FixUnsignedFields.Designer.cs" t="Include" />
           <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs" t="Include" />
-          <e p="20181224044809_StoreUsbIdsInDatabase.Designer.cs" t="Include" />
+          <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs" t="Include" />
           <e p="20181224044809_StoreUsbIdsInDatabase.cs" t="Include" />
-          <e p="20181224172147_FixUsbIdsAndIndexes.Designer.cs" t="Include" />
+          <e p="20181224044809_StoreUsbIdsInDatabase.Designer.cs" t="Include" />
           <e p="20181224172147_FixUsbIdsAndIndexes.cs" t="Include" />
-          <e p="20181225002740_AddCdOffsets.Designer.cs" t="Include" />
+          <e p="20181224172147_FixUsbIdsAndIndexes.Designer.cs" t="Include" />
           <e p="20181225002740_AddCdOffsets.cs" t="Include" />
-          <e p="20181225152947_StoreMmcGetConfigurationResponse.Designer.cs" t="Include" />
+          <e p="20181225002740_AddCdOffsets.Designer.cs" t="Include" />
           <e p="20181225152947_StoreMmcGetConfigurationResponse.cs" t="Include" />
-          <e p="20181225214500_StoreReadResultsInReportDatabase.Designer.cs" t="Include" />
+          <e p="20181225152947_StoreMmcGetConfigurationResponse.Designer.cs" t="Include" />
           <e p="20181225214500_StoreReadResultsInReportDatabase.cs" t="Include" />
-          <e p="20190102061236_AddMultisessionLeadTest.Designer.cs" t="Include" />
+          <e p="20181225214500_StoreReadResultsInReportDatabase.Designer.cs" t="Include" />
           <e p="20190102061236_AddMultisessionLeadTest.cs" t="Include" />
-          <e p="20190102230036_AddOptimalReadMultipleCount.Designer.cs" t="Include" />
+          <e p="20190102061236_AddMultisessionLeadTest.Designer.cs" t="Include" />
           <e p="20190102230036_AddOptimalReadMultipleCount.cs" t="Include" />
-          <e p="20190108013456_AddChangeableScsiModes.Designer.cs" t="Include" />
+          <e p="20190102230036_AddOptimalReadMultipleCount.Designer.cs" t="Include" />
           <e p="20190108013456_AddChangeableScsiModes.cs" t="Include" />
-          <e p="20190525183723_IdForDensityCode.Designer.cs" t="Include" />
+          <e p="20190108013456_AddChangeableScsiModes.Designer.cs" t="Include" />
           <e p="20190525183723_IdForDensityCode.cs" t="Include" />
-          <e p="20191103000828_MakeFieldsUnsigned.Designer.cs" t="Include" />
+          <e p="20190525183723_IdForDensityCode.Designer.cs" t="Include" />
           <e p="20191103000828_MakeFieldsUnsigned.cs" t="Include" />
-          <e p="20191207175444_SyncWithServerChanges.Designer.cs" t="Include" />
+          <e p="20191103000828_MakeFieldsUnsigned.Designer.cs" t="Include" />
           <e p="20191207175444_SyncWithServerChanges.cs" t="Include" />
-          <e p="20191207183522_AddNameCountModel.Designer.cs" t="Include" />
+          <e p="20191207175444_SyncWithServerChanges.Designer.cs" t="Include" />
           <e p="20191207183522_AddNameCountModel.cs" t="Include" />
-          <e p="20191207184342_AddRemoteStats.Designer.cs" t="Include" />
+          <e p="20191207183522_AddNameCountModel.Designer.cs" t="Include" />
           <e p="20191207184342_AddRemoteStats.cs" t="Include" />
+          <e p="20191207184342_AddRemoteStats.Designer.cs" t="Include" />
           <e p="AaruContextModelSnapshot.cs" t="Include" />
         </e>
         <e p="Models" t="Include">
@@ -461,7 +422,6 @@
           <e p="UsbVendor.cs" t="Include" />
           <e p="Version.cs" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp2.1" t="Include">
@@ -473,11 +433,12 @@
       <e p="Aaru.Decoders" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
+        <e p="Aaru.Decoders.csproj" t="IncludeRecursive" />
         <e p="ATA" t="Include">
           <e p="Identify.cs" t="Include" />
           <e p="Registers.cs" t="Include" />
         </e>
-        <e p="Aaru.Decoders.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Blu-ray" t="Include">
           <e p="BCA.cs" t="Include" />
           <e p="Cartridge.cs" t="Include" />
@@ -499,9 +460,9 @@
           <e p="AACS.cs" t="Include" />
           <e p="ADIP.cs" t="Include" />
           <e p="BCA.cs" t="Include" />
+          <e p="Cartridge.cs" t="Include" />
           <e p="CPRM.cs" t="Include" />
           <e p="CSS&amp;CPRM.cs" t="Include" />
-          <e p="Cartridge.cs" t="Include" />
           <e p="DDS.cs" t="Include" />
           <e p="DMI.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -531,6 +492,13 @@
           <e p="OCR.cs" t="Include" />
           <e p="VendorString.cs" t="Include" />
         </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp2.1" t="Include">
+              <e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="PCMCIA" t="Include">
           <e p="CIS.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -594,11 +562,11 @@
             <e p="Mode6.cs" t="Include" />
             <e p="Structs.cs" t="Include" />
           </e>
+          <e p="Sense.cs" t="Include" />
           <e p="SSC" t="Include">
             <e p="BlockLimits.cs" t="Include" />
             <e p="DensitySupport.cs" t="Include" />
           </e>
-          <e p="Sense.cs" t="Include" />
           <e p="Types.cs" t="Include" />
           <e p="VendorString.cs" t="Include" />
         </e>
@@ -618,30 +586,10 @@
           <e p="DMI.cs" t="Include" />
           <e p="SS.cs" t="Include" />
         </e>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-=======
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
->>>>>>> fd40d036... Fix case collision.
-              <e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
-<<<<<<< HEAD
-=======
->>>>>>> b56058a0... Update flake library to latest version.
-=======
->>>>>>> fd40d036... Fix case collision.
       </e>
       <e p="Aaru.Devices" t="IncludeRecursive">
         <e p="Aaru.Devices.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Command.cs" t="Include" />
         <e p="Device" t="Include">
           <e p="AtaCommands" t="Include">
@@ -698,6 +646,13 @@
           <e p="ListDevices.cs" t="Include" />
           <e p="Structs.cs" t="Include" />
         </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp2.1" t="Include">
+              <e p="Aaru.Devices.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="Remote" t="Include">
           <e p="Consts.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -713,38 +668,14 @@
           <e p="Usb.cs" t="Include" />
           <e p="UsbFunctions.cs" t="Include" />
         </e>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-=======
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
->>>>>>> fd40d036... Fix case collision.
-              <e p="Aaru.Devices.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
-<<<<<<< HEAD
-=======
->>>>>>> b56058a0... Update flake library to latest version.
-=======
->>>>>>> fd40d036... Fix case collision.
       </e>
       <e p="Aaru.Dto" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
         <e p="Aaru.Dto.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CdOffsetDto.cs" t="Include" />
         <e p="DeviceDto.cs" t="Include" />
-        <e p="SyncDto.cs" t="Include" />
-        <e p="UsbProductDto.cs" t="Include" />
-        <e p="UsbVendorDto.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp2.1" t="Include">
@@ -752,13 +683,16 @@
             </e>
           </e>
         </e>
+        <e p="SyncDto.cs" t="Include" />
+        <e p="UsbProductDto.cs" t="Include" />
+        <e p="UsbVendorDto.cs" t="Include" />
       </e>
       <e p="Aaru.Filesystems" t="IncludeRecursive">
-        <e p="AODOS.cs" t="Include" />
-        <e p="APFS.cs" t="Include" />
         <e p="Aaru.Filesystems.csproj" t="IncludeRecursive" />
         <e p="Acorn.cs" t="Include" />
         <e p="AmigaDOS.cs" t="Include" />
+        <e p="AODOS.cs" t="Include" />
+        <e p="APFS.cs" t="Include" />
         <e p="AppleCommon" t="Include">
           <e p="Consts.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -794,11 +728,13 @@
         </e>
         <e p="AtheOS.cs" t="Include" />
         <e p="BFS.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="BTRFS.cs" t="Include" />
         <e p="CBM.cs" t="Include" />
         <e p="CPM" t="Include">
-          <e p="CPM.cs" t="Include" />
           <e p="Consts.cs" t="Include" />
+          <e p="CPM.cs" t="Include" />
+          <e p="cpmdefs.xml" t="Include" />
           <e p="Definitions.cs" t="Include" />
           <e p="Dir.cs" t="Include" />
           <e p="File.cs" t="Include" />
@@ -806,11 +742,14 @@
           <e p="Structs.cs" t="Include" />
           <e p="Super.cs" t="Include" />
           <e p="Xattr.cs" t="Include" />
-          <e p="cpmdefs.xml" t="Include" />
         </e>
         <e p="Cram.cs" t="Include" />
+        <e p="Dump.cs" t="Include" />
         <e p="ECMA67.cs" t="Include" />
         <e p="EFS.cs" t="Include" />
+        <e p="exFAT.cs" t="Include" />
+        <e p="ext2FS.cs" t="Include" />
+        <e p="extFS.cs" t="Include" />
         <e p="F2FS.cs" t="Include" />
         <e p="FAT" t="Include">
           <e p="BPB.cs" t="Include" />
@@ -845,8 +784,8 @@
             <e p="CDi.cs" t="Include" />
             <e p="ElTorito.cs" t="Include" />
             <e p="HighSierra.cs" t="Include" />
-            <e p="ISO.cs" t="Include" />
             <e p="Internal.cs" t="Include" />
+            <e p="ISO.cs" t="Include" />
             <e p="RRIP.cs" t="Include" />
             <e p="SUSP.cs" t="Include" />
             <e p="XA.cs" t="Include" />
@@ -855,8 +794,8 @@
           <e p="Date.cs" t="Include" />
           <e p="Dir.cs" t="Include" />
           <e p="File.cs" t="Include" />
-          <e p="ISO9660.cs" t="Include" />
           <e p="Info.cs" t="Include" />
+          <e p="ISO9660.cs" t="Include" />
           <e p="Mode2.cs" t="Include" />
           <e p="PathTable.cs" t="Include" />
           <e p="Structs" t="Include">
@@ -865,8 +804,8 @@
             <e p="CDi.cs" t="Include" />
             <e p="ElTorito.cs" t="Include" />
             <e p="HighSierra.cs" t="Include" />
-            <e p="ISO.cs" t="Include" />
             <e p="Internal.cs" t="Include" />
+            <e p="ISO.cs" t="Include" />
             <e p="Joliet.cs" t="Include" />
             <e p="RRIP.cs" t="Include" />
             <e p="SUSP.cs" t="Include" />
@@ -893,8 +832,15 @@
         <e p="MicroDOS.cs" t="Include" />
         <e p="MinixFS.cs" t="Include" />
         <e p="NILFS2.cs" t="Include" />
-        <e p="NTFS.cs" t="Include" />
         <e p="Nintendo.cs" t="Include" />
+        <e p="NTFS.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp2.1" t="Include">
+              <e p="Aaru.Filesystems.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="ODS.cs" t="Include" />
         <e p="Opera" t="Include">
           <e p="Consts.cs" t="Include" />
@@ -912,11 +858,11 @@
         <e p="QNX4.cs" t="Include" />
         <e p="QNX6.cs" t="Include" />
         <e p="RBF.cs" t="Include" />
-        <e p="RT11.cs" t="Include" />
         <e p="ReFS.cs" t="Include" />
         <e p="Register.cs" t="Include" />
         <e p="Reiser.cs" t="Include" />
         <e p="Reiser4.cs" t="Include" />
+        <e p="RT11.cs" t="Include" />
         <e p="SFS.cs" t="Include" />
         <e p="SolarFS.cs" t="Include" />
         <e p="Squash.cs" t="Include" />
@@ -939,47 +885,17 @@
         <e p="XFS.cs" t="Include" />
         <e p="Xia.cs" t="Include" />
         <e p="ZFS.cs" t="Include" />
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fd40d036... Fix case collision.
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="dump.cs" t="Include" />
-        <e p="exFAT.cs" t="Include" />
-        <e p="ext2FS.cs" t="Include" />
-        <e p="extFS.cs" t="Include" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-<<<<<<< HEAD
-            <e p="netcoreapp2.1" t="Include">
-=======
-            <e p="netcoreapp3.0" t="Include">
->>>>>>> fd40d036... Fix case collision.
-              <e p="Aaru.Filesystems.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
-<<<<<<< HEAD
-=======
->>>>>>> b56058a0... Update flake library to latest version.
-=======
->>>>>>> fd40d036... Fix case collision.
       </e>
       <e p="Aaru.Filters" t="IncludeRecursive">
         <e p="Aaru.Filters.csproj" t="IncludeRecursive" />
         <e p="AppleDouble.cs" t="Include" />
         <e p="AppleSingle.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="BZip2.cs" t="Include" />
         <e p="ForcedSeekStream.cs" t="Include" />
         <e p="GZip.cs" t="Include" />
         <e p="LZip.cs" t="Include" />
         <e p="MacBinary.cs" t="Include" />
-        <e p="OffsetStream.cs" t="Include" />
-        <e p="PCExchange.cs" t="Include" />
-        <e p="Register.cs" t="Include" />
-        <e p="XZ.cs" t="Include" />
-        <e p="ZZZNoFilter.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp2.1" t="Include">
@@ -987,467 +903,12 @@
             </e>
           </e>
         </e>
+        <e p="OffsetStream.cs" t="Include" />
+        <e p="PCExchange.cs" t="Include" />
+        <e p="Register.cs" t="Include" />
+        <e p="XZ.cs" t="Include" />
+        <e p="ZZZNoFilter.cs" t="Include" />
       </e>
-<<<<<<< HEAD
-=======
-      <e p="Aaru.Gui" t="IncludeRecursive">
-        <e p="Aaru.Gui.csproj" t="IncludeRecursive" />
-        <e p="App.xaml" t="Include" />
-        <e p="App.xaml.cs" t="Include" />
-        <e p="Assets" t="Include">
-          <e p="Icons" t="Include">
-            <e p="oxygen" t="Include">
-              <e p="32x32" t="Include">
-                <e p="computer.png" t="Include" />
-                <e p="drive-harddisk.png" t="Include" />
-                <e p="drive-optical.png" t="Include" />
-                <e p="drive-removable-media-usb.png" t="Include" />
-                <e p="drive-removable-media.png" t="Include" />
-                <e p="inode-directory.png" t="Include" />
-                <e p="media-eject.png" t="Include" />
-                <e p="media-flash-sd-mmc.png" t="Include" />
-                <e p="media-tape.png" t="Include" />
-              </e>
-              <e p="COPYING" t="Include" />
-            </e>
-          </e>
-          <e p="Logos" t="Include">
-            <e p="Media" t="Include">
-              <e p="AIT1.png" t="Include" />
-              <e p="AIT1.svg" t="Include" />
-              <e p="AIT1Turbo.png" t="Include" />
-              <e p="AIT1Turbo.svg" t="Include" />
-              <e p="AIT2.png" t="Include" />
-              <e p="AIT2.svg" t="Include" />
-              <e p="AIT2Turbo.png" t="Include" />
-              <e p="AIT2Turbo.svg" t="Include" />
-              <e p="AIT3.png" t="Include" />
-              <e p="AIT3.svg" t="Include" />
-              <e p="AIT3Ex.png" t="Include" />
-              <e p="AIT3Ex.svg" t="Include" />
-              <e p="AIT3Turbo.png" t="Include" />
-              <e p="AIT3Turbo.svg" t="Include" />
-              <e p="AIT4.png" t="Include" />
-              <e p="AIT4.svg" t="Include" />
-              <e p="AIT5.png" t="Include" />
-              <e p="AIT5.svg" t="Include" />
-              <e p="AITETurbo.png" t="Include" />
-              <e p="AITETurbo.svg" t="Include" />
-              <e p="BDR.png" t="Include" />
-              <e p="BDR.svg" t="Include" />
-              <e p="BDRE.png" t="Include" />
-              <e p="BDRE.svg" t="Include" />
-              <e p="BDREXL.png" t="Include" />
-              <e p="BDREXL.svg" t="Include" />
-              <e p="BDROM.png" t="Include" />
-              <e p="BDROM.svg" t="Include" />
-              <e p="BDRXL.png" t="Include" />
-              <e p="BDRXL.svg" t="Include" />
-              <e p="CD.png" t="Include" />
-              <e p="CD.svg" t="Include" />
-              <e p="CD32.png" t="Include" />
-              <e p="CD32.svg" t="Include" />
-              <e p="CDDA.png" t="Include" />
-              <e p="CDDA.svg" t="Include" />
-              <e p="CDEG.png" t="Include" />
-              <e p="CDEG.svg" t="Include" />
-              <e p="CDG.svg" t="Include" />
-              <e p="CDI.png" t="Include" />
-              <e p="CDI.svg" t="Include" />
-              <e p="CDIREADY.png" t="Include" />
-              <e p="CDIREADY.svg" t="Include" />
-              <e p="CDMIDI.png" t="Include" />
-              <e p="CDMIDI.svg" t="Include" />
-              <e p="CDPLUS.png" t="Include" />
-              <e p="CDPLUS.svg" t="Include" />
-              <e p="CDR.png" t="Include" />
-              <e p="CDR.svg" t="Include" />
-              <e p="CDROM.png" t="Include" />
-              <e p="CDROM.svg" t="Include" />
-              <e p="CDROM2.png" t="Include" />
-              <e p="CDROM2.svg" t="Include" />
-              <e p="CDRW.png" t="Include" />
-              <e p="CDRW.svg" t="Include" />
-              <e p="CDTV.png" t="Include" />
-              <e p="CDTV.svg" t="Include" />
-              <e p="CDV.png" t="Include" />
-              <e p="CDV.svg" t="Include" />
-              <e p="CompactCassette.png" t="Include" />
-              <e p="CompactCassette.svg" t="Include" />
-              <e p="DAT160.png" t="Include" />
-              <e p="DAT160.svg" t="Include" />
-              <e p="DAT320.png" t="Include" />
-              <e p="DAT320.svg" t="Include" />
-              <e p="DAT72.png" t="Include" />
-              <e p="DAT72.svg" t="Include" />
-              <e p="DDS1.png" t="Include" />
-              <e p="DDS1.svg" t="Include" />
-              <e p="DDS2.png" t="Include" />
-              <e p="DDS2.svg" t="Include" />
-              <e p="DDS3.png" t="Include" />
-              <e p="DDS3.svg" t="Include" />
-              <e p="DDS4.png" t="Include" />
-              <e p="DDS4.svg" t="Include" />
-              <e p="DLTtapeIII.png" t="Include" />
-              <e p="DLTtapeIII.svg" t="Include" />
-              <e p="DLTtapeIIIxt.png" t="Include" />
-              <e p="DLTtapeIIIxt.svg" t="Include" />
-              <e p="DLTtapeIV.png" t="Include" />
-              <e p="DLTtapeIV.svg" t="Include" />
-              <e p="DLTtapeS4.png" t="Include" />
-              <e p="DLTtapeS4.svg" t="Include" />
-              <e p="DVDDownload.png" t="Include" />
-              <e p="DVDDownload.svg" t="Include" />
-              <e p="DVDPR.png" t="Include" />
-              <e p="DVDPR.svg" t="Include" />
-              <e p="DVDPRDL.png" t="Include" />
-              <e p="DVDPRDL.svg" t="Include" />
-              <e p="DVDPRW.png" t="Include" />
-              <e p="DVDPRW.svg" t="Include" />
-              <e p="DVDR.png" t="Include" />
-              <e p="DVDR.svg" t="Include" />
-              <e p="DVDRAM.png" t="Include" />
-              <e p="DVDRAM.svg" t="Include" />
-              <e p="DVDROM.png" t="Include" />
-              <e p="DVDROM.svg" t="Include" />
-              <e p="DVDRW.png" t="Include" />
-              <e p="DVDRW.svg" t="Include" />
-              <e p="DigitalAudioTape.png" t="Include" />
-              <e p="DigitalAudioTape.svg" t="Include" />
-              <e p="Ditto.png" t="Include" />
-              <e p="Ditto.svg" t="Include" />
-              <e p="DittoMax.png" t="Include" />
-              <e p="DittoMax.svg" t="Include" />
-              <e p="ExpressCard34.png" t="Include" />
-              <e p="ExpressCard34.svg" t="Include" />
-              <e p="ExpressCard54.png" t="Include" />
-              <e p="ExpressCard54.svg" t="Include" />
-              <e p="GDR.png" t="Include" />
-              <e p="GDR.svg" t="Include" />
-              <e p="GDROM.png" t="Include" />
-              <e p="GDROM.svg" t="Include" />
-              <e p="GOD.png" t="Include" />
-              <e p="GOD.svg" t="Include" />
-              <e p="HDDVDR.png" t="Include" />
-              <e p="HDDVDR.svg" t="Include" />
-              <e p="HDDVDRAM.png" t="Include" />
-              <e p="HDDVDRAM.svg" t="Include" />
-              <e p="HDDVDRDL.png" t="Include" />
-              <e p="HDDVDRDL.svg" t="Include" />
-              <e p="HDDVDROM.png" t="Include" />
-              <e p="HDDVDROM.svg" t="Include" />
-              <e p="HDDVDRW.png" t="Include" />
-              <e p="HDDVDRW.svg" t="Include" />
-              <e p="HDDVDRWDL.png" t="Include" />
-              <e p="HDDVDRWDL.svg" t="Include" />
-              <e p="JaguarCD.png" t="Include" />
-              <e p="JaguarCD.svg" t="Include" />
-              <e p="Jaz.png" t="Include" />
-              <e p="Jaz.svg" t="Include" />
-              <e p="Jaz2.png" t="Include" />
-              <e p="Jaz2.svg" t="Include" />
-              <e p="LD.png" t="Include" />
-              <e p="LD.svg" t="Include" />
-              <e p="LDROM.png" t="Include" />
-              <e p="LDROM.svg" t="Include" />
-              <e p="LDROM2.png" t="Include" />
-              <e p="LDROM2.svg" t="Include" />
-              <e p="LTO.png" t="Include" />
-              <e p="LTO.svg" t="Include" />
-              <e p="LTO2.png" t="Include" />
-              <e p="LTO2.svg" t="Include" />
-              <e p="LTO3.png" t="Include" />
-              <e p="LTO3.svg" t="Include" />
-              <e p="LTO3WORM.png" t="Include" />
-              <e p="LTO3WORM.svg" t="Include" />
-              <e p="LTO4.png" t="Include" />
-              <e p="LTO4.svg" t="Include" />
-              <e p="LTO4WORM.png" t="Include" />
-              <e p="LTO4WORM.svg" t="Include" />
-              <e p="LTO5.png" t="Include" />
-              <e p="LTO5.svg" t="Include" />
-              <e p="LTO5WORM.png" t="Include" />
-              <e p="LTO5WORM.svg" t="Include" />
-              <e p="LTO6.png" t="Include" />
-              <e p="LTO6.svg" t="Include" />
-              <e p="LTO6WORM.png" t="Include" />
-              <e p="LTO6WORM.svg" t="Include" />
-              <e p="LTO7.png" t="Include" />
-              <e p="LTO7.svg" t="Include" />
-              <e p="LTO7WORM.png" t="Include" />
-              <e p="LTO7WORM.svg" t="Include" />
-              <e p="LVROM.png" t="Include" />
-              <e p="LVROM.svg" t="Include" />
-              <e p="MD.png" t="Include" />
-              <e p="MD.svg" t="Include" />
-              <e p="MDData.png" t="Include" />
-              <e p="MDData.svg" t="Include" />
-              <e p="MDData2.png" t="Include" />
-              <e p="MDData2.svg" t="Include" />
-              <e p="MEGACD.png" t="Include" />
-              <e p="MEGACD.svg" t="Include" />
-              <e p="MegaLD.png" t="Include" />
-              <e p="MegaLD.svg" t="Include" />
-              <e p="MemoryStick.png" t="Include" />
-              <e p="MemoryStick.svg" t="Include" />
-              <e p="MemoryStickDuo.png" t="Include" />
-              <e p="MemoryStickDuo.svg" t="Include" />
-              <e p="MemoryStickMicro.png" t="Include" />
-              <e p="MemoryStickMicro.svg" t="Include" />
-              <e p="MemoryStickPro.png" t="Include" />
-              <e p="MemoryStickPro.svg" t="Include" />
-              <e p="MemoryStickProDuo.png" t="Include" />
-              <e p="MemoryStickProDuo.svg" t="Include" />
-              <e p="MilCD.png" t="Include" />
-              <e p="MilCD.svg" t="Include" />
-              <e p="NeoGeoCD.png" t="Include" />
-              <e p="NeoGeoCD.svg" t="Include" />
-              <e p="Nintendo3DSGameCard.png" t="Include" />
-              <e p="Nintendo3DSGameCard.svg" t="Include" />
-              <e p="Nintendo_64_Logo.svg" t="Include" />
-              <e p="Nuon.png" t="Include" />
-              <e p="Nuon.svg" t="Include" />
-              <e p="PCD.png" t="Include" />
-              <e p="PCD.svg" t="Include" />
-              <e p="PCFX.png" t="Include" />
-              <e p="PCFX.svg" t="Include" />
-              <e p="PD650.png" t="Include" />
-              <e p="PD650.svg" t="Include" />
-              <e p="PD650_WORM.png" t="Include" />
-              <e p="PD650_WORM.svg" t="Include" />
-              <e p="PS1CD.png" t="Include" />
-              <e p="PS1CD.svg" t="Include" />
-              <e p="PS2CD.png" t="Include" />
-              <e p="PS2CD.svg" t="Include" />
-              <e p="PS2DVD.png" t="Include" />
-              <e p="PS2DVD.svg" t="Include" />
-              <e p="PS3BD.png" t="Include" />
-              <e p="PS3BD.svg" t="Include" />
-              <e p="PS3DVD.png" t="Include" />
-              <e p="PS3DVD.svg" t="Include" />
-              <e p="PS4BD.png" t="Include" />
-              <e p="PS4BD.svg" t="Include" />
-              <e p="Pippin.png" t="Include" />
-              <e p="Pippin.svg" t="Include" />
-              <e p="PlayStationMemoryCard.png" t="Include" />
-              <e p="PlayStationMemoryCard.svg" t="Include" />
-              <e p="PlayStationMemoryCard2.png" t="Include" />
-              <e p="PlayStationMemoryCard2.svg" t="Include" />
-              <e p="PlayStationVitaGameCard.png" t="Include" />
-              <e p="PlayStationVitaGameCard.svg" t="Include" />
-              <e p="Playdia.png" t="Include" />
-              <e p="Playdia.svg" t="Include" />
-              <e p="PocketZip.png" t="Include" />
-              <e p="PocketZip.svg" t="Include" />
-              <e p="SACD.png" t="Include" />
-              <e p="SACD.svg" t="Include" />
-              <e p="SAIT1.png" t="Include" />
-              <e p="SAIT1.svg" t="Include" />
-              <e p="SAIT2.png" t="Include" />
-              <e p="SAIT2.svg" t="Include" />
-              <e p="SATURNCD.png" t="Include" />
-              <e p="SATURNCD.svg" t="Include" />
-              <e p="SVCD.png" t="Include" />
-              <e p="SVCD.svg" t="Include" />
-              <e p="SecureDigital.png" t="Include" />
-              <e p="SecureDigital.svg" t="Include" />
-              <e p="SmartMedia.png" t="Include" />
-              <e p="SmartMedia.svg" t="Include" />
-              <e p="SuperCDROM2.png" t="Include" />
-              <e p="SuperCDROM2.svg" t="Include" />
-              <e p="SwitchGameCard.png" t="Include" />
-              <e p="SwitchGameCard.svg" t="Include" />
-              <e p="ThreeDO.png" t="Include" />
-              <e p="ThreeDO.svg" t="Include" />
-              <e p="VCD.png" t="Include" />
-              <e p="VCD.svg" t="Include" />
-              <e p="WOD.png" t="Include" />
-              <e p="WOD.svg" t="Include" />
-              <e p="WUOD.png" t="Include" />
-              <e p="WUOD.svg" t="Include" />
-              <e p="XGD.png" t="Include" />
-              <e p="XGD.svg" t="Include" />
-              <e p="XGD2.png" t="Include" />
-              <e p="XGD2.svg" t="Include" />
-              <e p="XGD3.png" t="Include" />
-              <e p="XGD3.svg" t="Include" />
-              <e p="XGD4.png" t="Include" />
-              <e p="XGD4.svg" t="Include" />
-              <e p="ZIP100.png" t="Include" />
-              <e p="ZIP100.svg" t="Include" />
-              <e p="ZIP250.png" t="Include" />
-              <e p="ZIP250.svg" t="Include" />
-              <e p="miniSD.png" t="Include" />
-              <e p="miniSD.svg" t="Include" />
-            </e>
-          </e>
-          <e p="aaru-logo.png" t="Include" />
-        </e>
-        <e p="ConsoleHandler.cs" t="Include" />
-        <e p="Controls" t="Include">
-          <e p="BlockMap.cs" t="Include" />
-        </e>
-        <e p="Main.cs" t="Include" />
-        <e p="Models" t="Include">
-          <e p="AssemblyModel.cs" t="Include" />
-          <e p="ChecksumModel.cs" t="Include" />
-          <e p="DeviceModel.cs" t="Include" />
-          <e p="DeviceStatsModel.cs" t="Include" />
-          <e p="DevicesRootModel.cs" t="Include" />
-          <e p="DumpHardwareModel.cs" t="Include" />
-          <e p="EncodingModel.cs" t="Include" />
-          <e p="FileModel.cs" t="Include" />
-          <e p="FileSystemModel.cs" t="Include" />
-          <e p="ImageModel.cs" t="Include" />
-          <e p="ImagePluginModel.cs" t="Include" />
-          <e p="ImagesRootModel.cs" t="Include" />
-          <e p="IsrcModel.cs" t="Include" />
-          <e p="LbaModel.cs" t="Include" />
-          <e p="MediaModel.cs" t="Include" />
-          <e p="MediaStatsModel.cs" t="Include" />
-          <e p="MediaTagModel.cs" t="Include" />
-          <e p="NameCountModel.cs" t="Include" />
-          <e p="PartitionModel.cs" t="Include" />
-          <e p="PartitionSchemeModel.cs" t="Include" />
-          <e p="PcmciaCisModel.cs" t="Include" />
-          <e p="PluginModel.cs" t="Include" />
-          <e p="RootModel.cs" t="Include" />
-          <e p="ScsiPageModel.cs" t="Include" />
-          <e p="SubdirectoryModel.cs" t="Include" />
-          <e p="TrackEntropyModel.cs" t="Include" />
-        </e>
-        <e p="ResourceHandler.cs" t="Include" />
-        <e p="ViewLocator.cs" t="Include" />
-        <e p="ViewModels" t="Include">
-          <e p="Dialogs" t="Include">
-            <e p="AboutViewModel.cs" t="Include" />
-            <e p="ConsoleViewModel.cs" t="Include" />
-            <e p="EncodingsViewModel.cs" t="Include" />
-            <e p="LicenseViewModel.cs" t="Include" />
-            <e p="PluginsViewModel.cs" t="Include" />
-            <e p="SettingsViewModel.cs" t="Include" />
-            <e p="StatisticsViewModel.cs" t="Include" />
-          </e>
-          <e p="Panels" t="Include">
-            <e p="DeviceInfoViewModel.cs" t="Include" />
-            <e p="FileSystemViewModel.cs" t="Include" />
-            <e p="ImageInfoViewModel.cs" t="Include" />
-            <e p="MediaInfoViewModel.cs" t="Include" />
-            <e p="PartitionViewModel.cs" t="Include" />
-            <e p="SubdirectoryViewModel.cs" t="Include" />
-          </e>
-          <e p="Tabs" t="Include">
-            <e p="AtaInfoViewModel.cs" t="Include" />
-            <e p="BlurayInfoViewModel.cs" t="Include" />
-            <e p="CompactDiscInfoViewModel.cs" t="Include" />
-            <e p="DvdInfoViewModel.cs" t="Include" />
-            <e p="DvdWritableInfoViewModel.cs" t="Include" />
-            <e p="PcmciaInfoViewModel.cs" t="Include" />
-            <e p="ScsiInfoViewModel.cs" t="Include" />
-            <e p="SdMmcInfoViewModel.cs" t="Include" />
-            <e p="XboxInfoViewModel.cs" t="Include" />
-          </e>
-          <e p="ViewModelBase.cs" t="Include" />
-          <e p="Windows" t="Include">
-            <e p="DecodeMediaTagsViewModel.cs" t="Include" />
-            <e p="ImageChecksumViewModel.cs" t="Include" />
-            <e p="ImageConvertViewModel.cs" t="Include" />
-            <e p="ImageEntropyViewModel.cs" t="Include" />
-            <e p="ImageSidecarViewModel.cs" t="Include" />
-            <e p="ImageVerifyViewModel.cs" t="Include" />
-            <e p="MainWindowViewModel.cs" t="Include" />
-            <e p="MediaDumpViewModel.cs" t="Include" />
-            <e p="MediaScanViewModel.cs" t="Include" />
-            <e p="SplashWindowViewModel.cs" t="Include" />
-            <e p="ViewSectorViewModel.cs" t="Include" />
-          </e>
-        </e>
-        <e p="Views" t="Include">
-          <e p="Dialogs" t="Include">
-            <e p="About.xaml" t="Include" />
-            <e p="About.xaml.cs" t="Include" />
-            <e p="Console.xaml" t="Include" />
-            <e p="Console.xaml.cs" t="Include" />
-            <e p="Encodings.xaml" t="Include" />
-            <e p="Encodings.xaml.cs" t="Include" />
-            <e p="LicenseDialog.xaml" t="Include" />
-            <e p="LicenseDialog.xaml.cs" t="Include" />
-            <e p="PluginsDialog.xaml" t="Include" />
-            <e p="PluginsDialog.xaml.cs" t="Include" />
-            <e p="SettingsDialog.xaml" t="Include" />
-            <e p="SettingsDialog.xaml.cs" t="Include" />
-            <e p="StatisticsDialog.xaml" t="Include" />
-            <e p="StatisticsDialog.xaml.cs" t="Include" />
-          </e>
-          <e p="Panels" t="Include">
-            <e p="DeviceInfo.xaml" t="Include" />
-            <e p="DeviceInfo.xaml.cs" t="Include" />
-            <e p="FileSystem.xaml" t="Include" />
-            <e p="FileSystem.xaml.cs" t="Include" />
-            <e p="ImageInfo.xaml" t="Include" />
-            <e p="ImageInfo.xaml.cs" t="Include" />
-            <e p="MediaInfo.xaml" t="Include" />
-            <e p="MediaInfo.xaml.cs" t="Include" />
-            <e p="Partition.xaml" t="Include" />
-            <e p="Partition.xaml.cs" t="Include" />
-            <e p="Subdirectory.xaml" t="Include" />
-            <e p="Subdirectory.xaml.cs" t="Include" />
-          </e>
-          <e p="Tabs" t="Include">
-            <e p="AtaInfo.xaml" t="Include" />
-            <e p="AtaInfo.xaml.cs" t="Include" />
-            <e p="BlurayInfo.xaml" t="Include" />
-            <e p="BlurayInfo.xaml.cs" t="Include" />
-            <e p="CompactDiscInfo.xaml" t="Include" />
-            <e p="CompactDiscInfo.xaml.cs" t="Include" />
-            <e p="DvdInfo.xaml" t="Include" />
-            <e p="DvdInfo.xaml.cs" t="Include" />
-            <e p="DvdWritableInfo.xaml" t="Include" />
-            <e p="DvdWritableInfo.xaml.cs" t="Include" />
-            <e p="PcmciaInfo.xaml" t="Include" />
-            <e p="PcmciaInfo.xaml.cs" t="Include" />
-            <e p="ScsiInfo.xaml" t="Include" />
-            <e p="ScsiInfo.xaml.cs" t="Include" />
-            <e p="SdMmcInfo.xaml" t="Include" />
-            <e p="SdMmcInfo.xaml.cs" t="Include" />
-            <e p="XboxInfo.xaml" t="Include" />
-            <e p="XboxInfo.xaml.cs" t="Include" />
-          </e>
-          <e p="Windows" t="Include">
-            <e p="DecodeMediaTags.xaml" t="Include" />
-            <e p="DecodeMediaTags.xaml.cs" t="Include" />
-            <e p="ImageChecksum.xaml" t="Include" />
-            <e p="ImageChecksum.xaml.cs" t="Include" />
-            <e p="ImageConvert.xaml" t="Include" />
-            <e p="ImageConvert.xaml.cs" t="Include" />
-            <e p="ImageEntropy.xaml" t="Include" />
-            <e p="ImageEntropy.xaml.cs" t="Include" />
-            <e p="ImageSidecar.xaml" t="Include" />
-            <e p="ImageSidecar.xaml.cs" t="Include" />
-            <e p="ImageVerify.xaml" t="Include" />
-            <e p="ImageVerify.xaml.cs" t="Include" />
-            <e p="MainWindow.xaml" t="Include" />
-            <e p="MainWindow.xaml.cs" t="Include" />
-            <e p="MediaDump.xaml" t="Include" />
-            <e p="MediaDump.xaml.cs" t="Include" />
-            <e p="MediaScan.xaml" t="Include" />
-            <e p="MediaScan.xaml.cs" t="Include" />
-            <e p="SplashWindow.xaml" t="Include" />
-            <e p="SplashWindow.xaml.cs" t="Include" />
-            <e p="ViewSector.xaml" t="Include" />
-            <e p="ViewSector.xaml.cs" t="Include" />
-          </e>
-        </e>
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Gui.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
-      </e>
->>>>>>> b56058a0... Update flake library to latest version.
       <e p="Aaru.Helpers" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
@@ -1455,6 +916,7 @@
         <e p="ArrayFill.cs" t="Include" />
         <e p="ArrayIsEmpty.cs" t="Include" />
         <e p="BigEndianBitConverter.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="BitEndian.cs" t="Include" />
         <e p="CHS.cs" t="Include" />
         <e p="CompareBytes.cs" t="Include" />
@@ -1462,10 +924,6 @@
         <e p="DateHandlers.cs" t="Include" />
         <e p="Marshal.cs" t="Include" />
         <e p="MarshallingPropertiesAttribute.cs" t="Include" />
-        <e p="PrintHex.cs" t="Include" />
-        <e p="StringHandlers.cs" t="Include" />
-        <e p="Swapping.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp2.1" t="Include">
@@ -1473,6 +931,9 @@
             </e>
           </e>
         </e>
+        <e p="PrintHex.cs" t="Include" />
+        <e p="StringHandlers.cs" t="Include" />
+        <e p="Swapping.cs" t="Include" />
       </e>
       <e p="Aaru.Images" t="IncludeRecursive">
         <e p="Aaru.Images.csproj" t="IncludeRecursive" />
@@ -1484,6 +945,7 @@
           <e p="Enums.cs" t="Include" />
           <e p="Helpers.cs" t="Include" />
           <e p="Identify.cs" t="Include" />
+          <e p="NonClosableStream.cs" t="Include" />
           <e p="Properties.cs" t="Include" />
           <e p="Read.cs" t="Include" />
           <e p="Structs.cs" t="Include" />
@@ -1555,16 +1017,7 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
-        <e p="BLU" t="Include">
-          <e p="BLU.cs" t="Include" />
-          <e p="Constants.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-          <e p="Verify.cs" t="Include" />
-          <e p="Write.cs" t="Include" />
-        </e>
+        <e p="bin" t="ExcludeRecursive" />
         <e p="BlindWrite4" t="Include">
           <e p="BlindWrite4.cs" t="Include" />
           <e p="Constants.cs" t="Include" />
@@ -1586,6 +1039,16 @@
           <e p="Structs.cs" t="Include" />
           <e p="Verify.cs" t="Include" />
         </e>
+        <e p="BLU" t="Include">
+          <e p="BLU.cs" t="Include" />
+          <e p="Constants.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+          <e p="Verify.cs" t="Include" />
+          <e p="Write.cs" t="Include" />
+        </e>
         <e p="CDRDAO" t="Include">
           <e p="CDRDAO.cs" t="Include" />
           <e p="Constants.cs" t="Include" />
@@ -1619,16 +1082,6 @@
           <e p="Structs.cs" t="Include" />
           <e p="Verify.cs" t="Include" />
         </e>
-        <e p="CPCDSK" t="Include">
-          <e p="CPCDSK.cs" t="Include" />
-          <e p="Constants.cs" t="Include" />
-          <e p="Helpers.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Structs.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-        </e>
         <e p="CisCopy" t="Include">
           <e p="CisCopy.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -1666,6 +1119,16 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
+        <e p="CPCDSK" t="Include">
+          <e p="Constants.cs" t="Include" />
+          <e p="CPCDSK.cs" t="Include" />
+          <e p="Helpers.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+        </e>
         <e p="D88" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="D88.cs" t="Include" />
@@ -1756,8 +1219,8 @@
         <e p="IMD" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
-          <e p="IMD.cs" t="Include" />
           <e p="Identify.cs" t="Include" />
+          <e p="IMD.cs" t="Include" />
           <e p="Properties.cs" t="Include" />
           <e p="Read.cs" t="Include" />
           <e p="Unsupported.cs" t="Include" />
@@ -1791,16 +1254,6 @@
           <e p="Structs.cs" t="Include" />
           <e p="Unsupported.cs" t="Include" />
         </e>
-        <e p="NHDr0" t="Include">
-          <e p="Constants.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="NHDr0.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Structs.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-          <e p="Write.cs" t="Include" />
-        </e>
         <e p="Nero" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -1812,6 +1265,23 @@
           <e p="Structs.cs" t="Include" />
           <e p="Verify.cs" t="Include" />
         </e>
+        <e p="NHDr0" t="Include">
+          <e p="Constants.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="NHDr0.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+          <e p="Write.cs" t="Include" />
+        </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp2.1" t="Include">
+              <e p="Aaru.Images.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="Parallels" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Identify.cs" t="Include" />
@@ -1994,16 +1464,6 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="VHDX.cs" t="Include" />
         </e>
-        <e p="VMware" t="Include">
-          <e p="Constants.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Structs.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-          <e p="VMware.cs" t="Include" />
-          <e p="Write.cs" t="Include" />
-        </e>
         <e p="Virtual98" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Identify.cs" t="Include" />
@@ -2014,6 +1474,16 @@
           <e p="Virtual98.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
+        <e p="VMware" t="Include">
+          <e p="Constants.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+          <e p="VMware.cs" t="Include" />
+          <e p="Write.cs" t="Include" />
+        </e>
         <e p="WCDiskImage" t="Include">
           <e p="Identify.cs" t="Include" />
           <e p="Properties.cs" t="Include" />
@@ -2032,27 +1502,6 @@
           <e p="Write.cs" t="Include" />
           <e p="ZZZRawImage.cs" t="Include" />
         </e>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-=======
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
->>>>>>> fd40d036... Fix case collision.
-              <e p="Aaru.Images.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
-<<<<<<< HEAD
-=======
->>>>>>> b56058a0... Update flake library to latest version.
-=======
->>>>>>> fd40d036... Fix case collision.
       </e>
       <e p="Aaru.Partitions" t="IncludeRecursive">
         <e p="Aaru.Partitions.csproj" t="IncludeRecursive" />
@@ -2060,6 +1509,7 @@
         <e p="AppleMap.cs" t="Include" />
         <e p="Apricot.cs" t="Include" />
         <e p="Atari.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="BSD.cs" t="Include" />
         <e p="DEC.cs" t="Include" />
         <e p="DragonFlyBSD.cs" t="Include" />
@@ -2067,6 +1517,13 @@
         <e p="Human68k.cs" t="Include" />
         <e p="MBR.cs" t="Include" />
         <e p="NeXT.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp2.1" t="Include">
+              <e p="Aaru.Partitions.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="PC98.cs" t="Include" />
         <e p="Plan9.cs" t="Include" />
         <e p="RDB.cs" t="Include" />
@@ -2076,36 +1533,11 @@
         <e p="Sun.cs" t="Include" />
         <e p="UNIX.cs" t="Include" />
         <e p="VTOC.cs" t="Include" />
-<<<<<<< HEAD
         <e p="Xbox.cs" t="Include" />
-<<<<<<< HEAD
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.Partitions.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
-=======
         <e p="XENIX.cs" t="Include" />
->>>>>>> b56058a0... Update flake library to latest version.
-=======
-        <e p="XENIX.cs" t="Include" />
-        <e p="Xbox.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Partitions.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
->>>>>>> fd40d036... Fix case collision.
       </e>
       <e p="Aaru.Settings" t="IncludeRecursive">
         <e p="Aaru.Settings.csproj" t="IncludeRecursive" />
-        <e p="Settings.cs" t="Include" />
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
@@ -2114,19 +1546,14 @@
             </e>
           </e>
         </e>
+        <e p="Settings.cs" t="Include" />
       </e>
       <e p="Aaru.sln" t="IncludeFlat" />
-      <e p="CICMMetadata/dotnet/cicm.cs" t="Include" />
-      <e p="CONTRIBUTING.md" t="Include" />
       <e p="Changelog.md" t="Include" />
-      <e p="LICENSE" t="Include" />
-      <e p="LICENSE.LGPL" t="Include" />
-      <e p="LICENSE.MIT" t="Include" />
-      <e p="NEEDED.md" t="Include" />
-      <e p="NEEDINFO.md" t="Include" />
-      <e p="README.md" t="Include" />
-      <e p="TODO.md" t="Include" />
-      <e p="cuetools.net/CUETools.Codecs" t="IncludeRecursive">
+      <e p="CICMMetadata\dotnet\cicm.cs" t="Include" />
+      <e p="CONTRIBUTING.md" t="Include" />
+      <e p="cuetools.net\bin" t="ExcludeRecursive" />
+      <e p="cuetools.net\CUETools.Codecs" t="IncludeRecursive">
         <e p="AudioBuffer.cs" t="Include" />
         <e p="AudioDecoderSettings.cs" t="Include" />
         <e p="AudioEncoderSettings.cs" t="Include" />
@@ -2135,6 +1562,12 @@
         <e p="AudioSamples.cs" t="Include" />
         <e p="BitReader.cs" t="Include" />
         <e p="BitWriter.cs" t="Include" />
+        <e p="CommandLine" t="Include">
+          <e p="AudioDecoder.cs" t="Include" />
+          <e p="AudioEncoder.cs" t="Include" />
+          <e p="DecoderSettings.cs" t="Include" />
+          <e p="EncoderSettings.cs" t="Include" />
+        </e>
         <e p="CRC" t="Include">
           <e p="CRC16.cs" t="Include" />
           <e p="CRC16CCITT.cs" t="Include" />
@@ -2145,12 +1578,6 @@
         <e p="CUEToolsCodecsConfig.cs" t="Include" />
         <e p="CUEToolsFormat.cs" t="Include" />
         <e p="CUEToolsTagger.cs" t="Include" />
-        <e p="CommandLine" t="Include">
-          <e p="AudioDecoder.cs" t="Include" />
-          <e p="AudioEncoder.cs" t="Include" />
-          <e p="DecoderSettings.cs" t="Include" />
-          <e p="EncoderSettings.cs" t="Include" />
-        </e>
         <e p="CyclicBuffer.cs" t="Include" />
         <e p="CyclicBufferInputStream.cs" t="Include" />
         <e p="CyclicBufferOutputStream.cs" t="Include" />
@@ -2159,14 +1586,27 @@
         <e p="IAudioFilter.cs" t="Include" />
         <e p="IAudioSource.cs" t="Include" />
         <e p="IWavePlayer.cs" t="Include" />
-        <e p="LPC.cs" t="Include" />
         <e p="License.txt" t="Include" />
+        <e p="LPC.cs" t="Include" />
         <e p="LpcContext.cs" t="Include" />
         <e p="NULL" t="Include">
           <e p="AudioDecoder.cs" t="Include" />
           <e p="AudioEncoder.cs" t="Include" />
         </e>
         <e p="NullStream.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="net20" t="Include">
+              <e p="CUETools.Codecs.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="net47" t="Include">
+              <e p="CUETools.Codecs.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netstandard2.0" t="Include">
+              <e p="CUETools.Codecs.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="PlaybackState.cs" t="Include" />
         <e p="SRDescriptionAttribute.cs" t="Include" />
         <e p="ViewModel" t="Include">
@@ -2181,20 +1621,13 @@
           <e p="DecoderSettings.cs" t="Include" />
           <e p="EncoderSettings.cs" t="Include" />
         </e>
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netstandard2.0" t="Include">
-              <e p="CUETools.Codecs.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
       </e>
-      <e p="cuetools.net/CUETools.Codecs.Flake" t="IncludeRecursive">
+      <e p="cuetools.net\CUETools.Codecs.FLAKE" t="IncludeRecursive">
         <e p="AudioDecoder.cs" t="Include" />
         <e p="AudioEncoder.cs" t="Include" />
-        <e p="COPYING" t="Include" />
-        <e p="CUETools.Codecs.Flake.csproj" t="IncludeRecursive" />
         <e p="ChannelMode.cs" t="Include" />
+        <e p="COPYING" t="Include" />
+        <e p="CUETools.Codecs.FLAKE.csproj" t="IncludeRecursive" />
         <e p="DecoderSettings.cs" t="Include" />
         <e p="EncoderSettings.cs" t="Include" />
         <e p="FlacFrame.cs" t="Include" />
@@ -2202,6 +1635,19 @@
         <e p="FlacSubframeInfo.cs" t="Include" />
         <e p="Flake.cs" t="Include" />
         <e p="MetadataType.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="net20" t="Include">
+              <e p="CUETools.Codecs.FLAKE.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="net47" t="Include">
+              <e p="CUETools.Codecs.FLAKE.AssemblyInfo.cs" t="Include" />
+            </e>
+            <e p="netstandard2.0" t="Include">
+              <e p="CUETools.Codecs.FLAKE.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="OrderMethod.cs" t="Include" />
         <e p="PredictionType.cs" t="Include" />
         <e p="Properties" t="Include">
@@ -2215,124 +1661,15 @@
         <e p="SubframeType.cs" t="Include" />
         <e p="WindowFunction.cs" t="Include" />
         <e p="WindowMethod.cs" t="Include" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netstandard2.0" t="Include">
-              <e p="CUETools.Codecs.Flake.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
       </e>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       <e p="LICENSE" t="Include" />
       <e p="LICENSE.LGPL" t="Include" />
       <e p="LICENSE.MIT" t="Include" />
       <e p="NEEDED.md" t="Include" />
       <e p="NEEDINFO.md" t="Include" />
-      <e p="oxyplot-avalonia\Source\OxyPlot.Avalonia" t="IncludeRecursive">
-=======
-      <e p="cuetools.net/bin" t="ExcludeRecursive" />
-      <e p="oxyplot-avalonia/Source/OxyPlot.Avalonia" t="IncludeRecursive">
->>>>>>> fd40d036... Fix case collision.
-        <e p="Annotations" t="Include">
-          <e p="Annotation.cs" t="Include" />
-          <e p="ArrowAnnotation.cs" t="Include" />
-          <e p="EllipseAnnotation.cs" t="Include" />
-          <e p="FunctionAnnotation.cs" t="Include" />
-          <e p="LineAnnotation.cs" t="Include" />
-          <e p="PathAnnotation.cs" t="Include" />
-          <e p="PointAnnotation.cs" t="Include" />
-          <e p="PolygonAnnotation.cs" t="Include" />
-          <e p="PolylineAnnotation.cs" t="Include" />
-          <e p="RectangleAnnotation.cs" t="Include" />
-          <e p="ShapeAnnotation.cs" t="Include" />
-          <e p="TextAnnotation.cs" t="Include" />
-          <e p="TextualAnnotation.cs" t="Include" />
-        </e>
-        <e p="Axes" t="Include">
-          <e p="AngleAxis.cs" t="Include" />
-          <e p="Axis.cs" t="Include" />
-          <e p="CategoryAxis.cs" t="Include" />
-          <e p="DateTimeAxis.cs" t="Include" />
-          <e p="LinearAxis.cs" t="Include" />
-          <e p="LinearColorAxis.cs" t="Include" />
-          <e p="LogarithmicAxis.cs" t="Include" />
-          <e p="MagnitudeAxis.cs" t="Include" />
-          <e p="TimeSpanAxis.cs" t="Include" />
-        </e>
-        <e p="CanvasRenderContext.cs" t="Include" />
-        <e p="Converters" t="Include">
-          <e p="OxyColorConverter.cs" t="Include" />
-          <e p="ThicknessConverter.cs" t="Include" />
-        </e>
-        <e p="Extensions" t="Include">
-          <e p="DataPointExtension.cs" t="Include" />
-        </e>
-        <e p="MoreColors.cs" t="Include" />
-        <e p="NamespaceDoc.cs" t="Include" />
-        <e p="OxyPlot.Avalonia.csproj" t="IncludeRecursive" />
-        <e p="OxyPlot.Avalonia.csproj.DotSettings" t="Include" />
-        <e p="OxyPlotModule.cs" t="Include" />
-        <e p="Plot.Properties.cs" t="Include" />
-        <e p="Plot.cs" t="Include" />
-        <e p="PlotBase.Events.cs" t="Include" />
-        <e p="PlotBase.Export.cs" t="Include" />
-        <e p="PlotBase.Properties.cs" t="Include" />
-        <e p="PlotBase.cs" t="Include" />
-        <e p="PlotView.cs" t="Include" />
-        <e p="PngExporter.cs" t="Include" />
-        <e p="Series" t="Include">
-          <e p="AreaSeries.cs" t="Include" />
-          <e p="BarSeries" t="Include">
-            <e p="BarSeries.cs" t="Include" />
-            <e p="BarSeriesBase.cs" t="Include" />
-            <e p="BarSeriesBase{T}.cs" t="Include" />
-            <e p="CategorizedSeries.cs" t="Include" />
-            <e p="ColumnSeries.cs" t="Include" />
-            <e p="LinearBarSeries.cs" t="Include" />
-          </e>
-          <e p="BoxPlotSeries.cs" t="Include" />
-          <e p="DataPointSeries.cs" t="Include" />
-          <e p="HeatMapSeries.cs" t="Include" />
-          <e p="ItemsSeries.cs" t="Include" />
-          <e p="LineSeries.cs" t="Include" />
-          <e p="PieSeries.cs" t="Include" />
-          <e p="ScatterErrorSeries.cs" t="Include" />
-          <e p="ScatterSeries.cs" t="Include" />
-          <e p="ScatterSeries{T}.cs" t="Include" />
-          <e p="Series.cs" t="Include" />
-          <e p="StairStepSeries.cs" t="Include" />
-          <e p="ThreeColorLineSeries.cs" t="Include" />
-          <e p="TwoColorAreaSeries.cs" t="Include" />
-          <e p="TwoColorLineSeries.cs" t="Include" />
-          <e p="XYAxisSeries.cs" t="Include" />
-        </e>
-        <e p="SvgExporter.cs" t="Include" />
-        <e p="Themes" t="Include">
-          <e p="Default.xaml" t="Include" />
-          <e p="Default.xaml.cs" t="Include" />
-        </e>
-        <e p="Tracker" t="Include">
-          <e p="TrackerControl.cs" t="Include" />
-          <e p="TrackerDefinition.cs" t="Include" />
-        </e>
-        <e p="Utilities" t="Include">
-          <e p="ConverterExtensions.cs" t="Include" />
-          <e p="Keyboard.cs" t="Include" />
-        </e>
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netstandard2.0" t="Include">
-              <e p="OxyPlot.Avalonia.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
-      </e>
->>>>>>> b56058a0... Update flake library to latest version.
       <e p="packages" t="ExcludeRecursive" />
+      <e p="README.md" t="Include" />
+      <e p="TODO.md" t="Include" />
     </e>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/Aaru.Checksums b/Aaru.Checksums
index 2c6819f89..880a159c8 160000
--- a/Aaru.Checksums
+++ b/Aaru.Checksums
@@ -1 +1 @@
-Subproject commit 2c6819f89a1aae81f81cfcb47df6ac592100b2f6
+Subproject commit 880a159c8700961223c110e145ee026f4f47caa2
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index a808291e0..43da800f3 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit a808291e0fcbcbccb3446b2b7ef3658d9373ee17
+Subproject commit 43da800f3e85c6929a2a1e26d93583e5ac1d0d97
diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj
index bb3514ab7..b3245d975 100644
--- a/Aaru.Compression/Aaru.Compression.csproj
+++ b/Aaru.Compression/Aaru.Compression.csproj
@@ -12,7 +12,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.0.2879</Version>
+    <Version>5.0.1.2884</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
diff --git a/Aaru.Console b/Aaru.Console
index 24c9e1d85..1af2e62a6 160000
--- a/Aaru.Console
+++ b/Aaru.Console
@@ -1 +1 @@
-Subproject commit 24c9e1d85a2ef9abfd5b3a170c87c3baafbba03e
+Subproject commit 1af2e62a619afde383db68f01db22d3c1fa26261
diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj
index 4a38f6425..a00776c4e 100644
--- a/Aaru.Core/Aaru.Core.csproj
+++ b/Aaru.Core/Aaru.Core.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.0.2879</Version>
+    <Version>5.0.1.2884</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index f56438598..1b085a02d 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -10,7 +10,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.0.2879</Version>
+    <Version>5.0.1.2884</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
diff --git a/Aaru.Decoders b/Aaru.Decoders
index b31266618..507d83000 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit b312666187e7cd58e62390dac61917fab2b1d072
+Subproject commit 507d83000ab36953028a7fee939e8b3914534546
diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj
index 2f4a2cd94..32379be88 100644
--- a/Aaru.Devices/Aaru.Devices.csproj
+++ b/Aaru.Devices/Aaru.Devices.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.0.2879</Version>
+    <Version>5.0.1.2884</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
diff --git a/Aaru.Dto b/Aaru.Dto
index 2225d6773..7acfccf9e 160000
--- a/Aaru.Dto
+++ b/Aaru.Dto
@@ -1 +1 @@
-Subproject commit 2225d67735a145012e90798c6fe7ed4675fd6430
+Subproject commit 7acfccf9e0904e537bdf95a892810b0fc0d5b62e
diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj
index 5d55534db..9fcdfcc6f 100644
--- a/Aaru.Filesystems/Aaru.Filesystems.csproj
+++ b/Aaru.Filesystems/Aaru.Filesystems.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.0.2879</Version>
+    <Version>5.0.1.2884</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj
index d28378cb5..eea063546 100644
--- a/Aaru.Filters/Aaru.Filters.csproj
+++ b/Aaru.Filters/Aaru.Filters.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.0.2879</Version>
+    <Version>5.0.1.2884</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
diff --git a/Aaru.Helpers b/Aaru.Helpers
index ad7314e23..6a18222b1 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit ad7314e234b7da1d847a99aeaf68ca65b3901fbe
+Subproject commit 6a18222b1e5b16e9354910ab04d3f9beda2f34e2
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index 12f124e18..f2837b396 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.0.2879</Version>
+    <Version>5.0.1.2884</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj
index 340ab59d9..e4edaf64d 100644
--- a/Aaru.Partitions/Aaru.Partitions.csproj
+++ b/Aaru.Partitions/Aaru.Partitions.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.0.2879</Version>
+    <Version>5.0.1.2884</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj
index e43a08503..ddfce8ecb 100644
--- a/Aaru.Settings/Aaru.Settings.csproj
+++ b/Aaru.Settings/Aaru.Settings.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.0.2879</Version>
+    <Version>5.0.1.2884</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index c6091443a..d542cb289 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -12,7 +12,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.0.2879</Version>
+    <Version>5.0.1.2884</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
diff --git a/CICMMetadata b/CICMMetadata
index 5debf2c35..c3a8be244 160000
--- a/CICMMetadata
+++ b/CICMMetadata
@@ -1 +1 @@
-Subproject commit 5debf2c35979da8d11f82df4c8f31734714f7f4c
+Subproject commit c3a8be24478245e5f9604df12d082917ef1e66f6
diff --git a/Changelog.md b/Changelog.md
index 2b62a429e..6f4764d57 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,6 @@
+# [5.0.1.2884] - 2020-04-23
+- Fixes data loss on certain Compact Disc audio tracks when dumping in Aaru Format with compression enabled.
+
 # [5.0.0.2879] - 2020-03-15
 - First and most importantly, we got a rename. We're now Aaru, part of the Aaru Data Preservation Suite, that encompasses Aaru (previously DiscImageChef), 
 Aaru.Server (previously DiscImageChef.Server), aaruformat (previously dicformat) and aaruremote.
@@ -1139,6 +1142,7 @@ Aaru.Server (previously DiscImageChef.Server), aaruformat (previously dicformat)
 - Master Boot Record (aka MBR).
 - NeXT disklabels.
 
+[5.0.1.2884]: https://github.com/aaru-dps/Aaru/releases/tag/v5.0.1.2884
 [5.0.0.2879]: https://github.com/aaru-dps/Aaru/releases/tag/v5.0.0.2879
 [4.5.1.1692]: https://github.com/aaru-dps/Aaru/releases/tag/v4.5.1.1692
 [4.5.0.1663]: https://github.com/aaru-dps/Aaru/releases/tag/v4.5.0.1663
diff --git a/README.md b/README.md
index 6c9bd56b5..d6f88495d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Aaru Data Preservation Suite v5.0.0.2879
+Aaru Data Preservation Suite v5.0.1.2884
 
 Aaru
 
diff --git a/build.sh b/build.sh
old mode 100755
new mode 100644
diff --git a/pkg/pacman/stable/PKGBUILD b/pkg/pacman/stable/PKGBUILD
index 5e98ab63b..2854d578a 100644
--- a/pkg/pacman/stable/PKGBUILD
+++ b/pkg/pacman/stable/PKGBUILD
@@ -2,14 +2,14 @@
 packager='Natalia Portillo <claunia@claunia.com>'
 _netcoretarget='netcoreapp2.1'
 pkgname='aaru'
-pkgver=5.0.0.2879
+pkgver=5.0.1.2884
 pkgrel=1
 pkgdesc='Disc image management and creation tool for disks, tapes, optical and solid state media'
 arch=('x86_64' 'armv7h' 'aarch64')
 url='http://www.aaru.app'
 license=('GPL')
-source=('aaru-src-5.0.0.2879.tar.xz::local://aaru-src-5.0.0.2879.tar.xz'
-        'aaru-src-5.0.0.2879.tar.xz.asc::local://aaru-src-5.0.0.2879.tar.xz.asc')
+source=('aaru-src-5.0.1.2884.tar.xz::local://aaru-src-5.0.1.2884.tar.xz'
+        'aaru-src-5.0.1.2884.tar.xz.asc::local://aaru-src-5.0.1.2884.tar.xz.asc')
 makedepends=('dotnet-sdk>=2.1.0')
 options=('staticlibs')
 validpgpkeys=('236F1E21B540FC0D40F7AD1751D20488C724CA9F')