diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index d5197addd..85eed0cc5 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -1,9 +1,31 @@
 <?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_PLUGINS_DIR$/puppet/lib/stubs" 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=".travis.yml" t="Include" />
+      <e p="Aaru" t="IncludeRecursive">
+        <e p="Aaru.csproj" t="IncludeRecursive" />
+        <e p="Aaru.icns" t="Include" />
         <e p="Commands" t="Include">
           <e p="Configure.cs" t="Include" />
           <e p="Database" t="Include">
@@ -52,6 +74,13 @@
         <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">
@@ -59,18 +88,12 @@
             </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" />
@@ -79,6 +102,7 @@
         <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">
@@ -86,6 +110,8 @@
             </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" />
@@ -93,12 +119,19 @@
         <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" />
@@ -157,13 +190,6 @@
           <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="netcoreapp3.0" 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">
@@ -184,21 +210,32 @@
           <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">
@@ -207,7 +244,6 @@
             </e>
           </e>
         </e>
-        <e p="TeleDiskLzh.cs" t="Include" />
       </e>
       <e p="Aaru.Console" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
@@ -225,7 +261,6 @@
       </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" />
@@ -246,8 +281,8 @@
               <e p="Trim.cs" t="Include" />
             </e>
             <e p="Dump.cs" t="Include" />
-            <e p="Metadata.cs" t="Include" />
             <e p="MMC.cs" t="Include" />
+            <e p="Metadata.cs" t="Include" />
             <e p="NVMe.cs" t="Include" />
             <e p="PlayStationPortable" t="Include">
               <e p="MemoryStick.cs" t="Include" />
@@ -257,11 +292,11 @@
             <e p="ResumeSupport.cs" t="Include" />
             <e p="SBC.cs" t="Include" />
             <e p="SCSI.cs" t="Include" />
-            <e p="SecureDigital.cs" t="Include" />
             <e p="SSC.cs" t="Include" />
+            <e p="SecureDigital.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" />
@@ -275,17 +310,17 @@
             <e p="FireWire.cs" t="Include" />
             <e p="MMC.cs" t="Include" />
             <e p="PCMCIA.cs" t="Include" />
-            <e p="SCSI.cs" t="Include" />
-            <e p="SecureDigital.cs" t="Include" />
             <e p="SSC.cs" t="Include" />
+            <e p="Scsi.cs" t="Include" />
+            <e p="SecureDigital.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="ScanResults.cs" t="Include" />
             <e p="SCSI.cs" t="Include" />
+            <e p="ScanResults.cs" t="Include" />
             <e p="SecureDigital.cs" t="Include" />
           </e>
         </e>
@@ -305,19 +340,12 @@
           <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="netcoreapp3.0" 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" />
@@ -334,72 +362,81 @@
           <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.cs" t="Include" />
           <e p="20181126222301_DeviceReportV2.Designer.cs" t="Include" />
-          <e p="20181127001622_AddDeviceBasicFields.cs" t="Include" />
+          <e p="20181126222301_DeviceReportV2.cs" t="Include" />
           <e p="20181127001622_AddDeviceBasicFields.Designer.cs" t="Include" />
-          <e p="20181127013131_CorrectReportsDbSet.cs" t="Include" />
+          <e p="20181127001622_AddDeviceBasicFields.cs" t="Include" />
           <e p="20181127013131_CorrectReportsDbSet.Designer.cs" t="Include" />
-          <e p="20181221015906_NameValueStatistics.cs" t="Include" />
+          <e p="20181127013131_CorrectReportsDbSet.cs" t="Include" />
           <e p="20181221015906_NameValueStatistics.Designer.cs" t="Include" />
-          <e p="20181221032605_MediaStatistics.cs" t="Include" />
+          <e p="20181221015906_NameValueStatistics.cs" t="Include" />
           <e p="20181221032605_MediaStatistics.Designer.cs" t="Include" />
-          <e p="20181221034941_SeenDevicesStatistics.cs" t="Include" />
+          <e p="20181221032605_MediaStatistics.cs" t="Include" />
           <e p="20181221034941_SeenDevicesStatistics.Designer.cs" t="Include" />
-          <e p="20181221040408_OperatingSystemStatistics.cs" t="Include" />
+          <e p="20181221034941_SeenDevicesStatistics.cs" t="Include" />
           <e p="20181221040408_OperatingSystemStatistics.Designer.cs" t="Include" />
-          <e p="20181221041242_VersionStatistics.cs" t="Include" />
+          <e p="20181221040408_OperatingSystemStatistics.cs" t="Include" />
           <e p="20181221041242_VersionStatistics.Designer.cs" t="Include" />
-          <e p="20181221125353_AddStatsCounters.cs" t="Include" />
+          <e p="20181221041242_VersionStatistics.cs" t="Include" />
           <e p="20181221125353_AddStatsCounters.Designer.cs" t="Include" />
-          <e p="20181223183913_FixUnsignedFields.cs" t="Include" />
+          <e p="20181221125353_AddStatsCounters.cs" t="Include" />
           <e p="20181223183913_FixUnsignedFields.Designer.cs" t="Include" />
-          <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs" t="Include" />
+          <e p="20181223183913_FixUnsignedFields.cs" t="Include" />
           <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs" t="Include" />
-          <e p="20181224044809_StoreUsbIdsInDatabase.cs" t="Include" />
+          <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs" t="Include" />
           <e p="20181224044809_StoreUsbIdsInDatabase.Designer.cs" t="Include" />
-          <e p="20181224172147_FixUsbIdsAndIndexes.cs" t="Include" />
+          <e p="20181224044809_StoreUsbIdsInDatabase.cs" t="Include" />
           <e p="20181224172147_FixUsbIdsAndIndexes.Designer.cs" t="Include" />
-          <e p="20181225002740_AddCdOffsets.cs" t="Include" />
+          <e p="20181224172147_FixUsbIdsAndIndexes.cs" t="Include" />
           <e p="20181225002740_AddCdOffsets.Designer.cs" t="Include" />
-          <e p="20181225152947_StoreMmcGetConfigurationResponse.cs" t="Include" />
+          <e p="20181225002740_AddCdOffsets.cs" t="Include" />
           <e p="20181225152947_StoreMmcGetConfigurationResponse.Designer.cs" t="Include" />
-          <e p="20181225214500_StoreReadResultsInReportDatabase.cs" t="Include" />
+          <e p="20181225152947_StoreMmcGetConfigurationResponse.cs" t="Include" />
           <e p="20181225214500_StoreReadResultsInReportDatabase.Designer.cs" t="Include" />
-          <e p="20190102061236_AddMultisessionLeadTest.cs" t="Include" />
+          <e p="20181225214500_StoreReadResultsInReportDatabase.cs" t="Include" />
           <e p="20190102061236_AddMultisessionLeadTest.Designer.cs" t="Include" />
-          <e p="20190102230036_AddOptimalReadMultipleCount.cs" t="Include" />
+          <e p="20190102061236_AddMultisessionLeadTest.cs" t="Include" />
           <e p="20190102230036_AddOptimalReadMultipleCount.Designer.cs" t="Include" />
-          <e p="20190108013456_AddChangeableScsiModes.cs" t="Include" />
+          <e p="20190102230036_AddOptimalReadMultipleCount.cs" t="Include" />
           <e p="20190108013456_AddChangeableScsiModes.Designer.cs" t="Include" />
-          <e p="20190525183723_IdForDensityCode.cs" t="Include" />
+          <e p="20190108013456_AddChangeableScsiModes.cs" t="Include" />
           <e p="20190525183723_IdForDensityCode.Designer.cs" t="Include" />
-          <e p="20191103000828_MakeFieldsUnsigned.cs" t="Include" />
+          <e p="20190525183723_IdForDensityCode.cs" t="Include" />
           <e p="20191103000828_MakeFieldsUnsigned.Designer.cs" t="Include" />
-          <e p="20191207175444_SyncWithServerChanges.cs" t="Include" />
+          <e p="20191103000828_MakeFieldsUnsigned.cs" t="Include" />
           <e p="20191207175444_SyncWithServerChanges.Designer.cs" t="Include" />
-          <e p="20191207183522_AddNameCountModel.cs" t="Include" />
+          <e p="20191207175444_SyncWithServerChanges.cs" t="Include" />
           <e p="20191207183522_AddNameCountModel.Designer.cs" t="Include" />
-          <e p="20191207184342_AddRemoteStats.cs" t="Include" />
+          <e p="20191207183522_AddNameCountModel.cs" t="Include" />
           <e p="20191207184342_AddRemoteStats.Designer.cs" t="Include" />
+          <e p="20191207184342_AddRemoteStats.cs" t="Include" />
           <e p="AaruContextModelSnapshot.cs" t="Include" />
         </e>
         <e p="Models" t="Include">
@@ -424,6 +461,7 @@
           <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">
@@ -435,12 +473,11 @@
       <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="bin" t="ExcludeRecursive" />
+        <e p="Aaru.Decoders.csproj" t="IncludeRecursive" />
         <e p="Blu-ray" t="Include">
           <e p="BCA.cs" t="Include" />
           <e p="Cartridge.cs" t="Include" />
@@ -462,9 +499,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" />
@@ -494,13 +531,6 @@
           <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="netcoreapp3.0" 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" />
@@ -564,11 +594,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>
@@ -588,21 +618,30 @@
           <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">
@@ -659,13 +698,6 @@
           <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="netcoreapp3.0" 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" />
@@ -678,28 +710,41 @@
           <e p="Extern.cs" t="Include" />
           <e p="ListDevices.cs" t="Include" />
           <e p="Structs.cs" t="Include" />
-          <e p="USB.cs" t="Include" />
+          <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">
@@ -707,16 +752,13 @@
             </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" />
@@ -752,13 +794,11 @@
         </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="Consts.cs" t="Include" />
           <e p="CPM.cs" t="Include" />
-          <e p="cpmdefs.xml" t="Include" />
+          <e p="Consts.cs" t="Include" />
           <e p="Definitions.cs" t="Include" />
           <e p="Dir.cs" t="Include" />
           <e p="File.cs" t="Include" />
@@ -766,14 +806,11 @@
           <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" />
@@ -808,8 +845,8 @@
             <e p="CDi.cs" t="Include" />
             <e p="ElTorito.cs" t="Include" />
             <e p="HighSierra.cs" t="Include" />
-            <e p="Internal.cs" t="Include" />
             <e p="ISO.cs" t="Include" />
+            <e p="Internal.cs" t="Include" />
             <e p="RRIP.cs" t="Include" />
             <e p="SUSP.cs" t="Include" />
             <e p="XA.cs" t="Include" />
@@ -818,8 +855,8 @@
           <e p="Date.cs" t="Include" />
           <e p="Dir.cs" t="Include" />
           <e p="File.cs" t="Include" />
-          <e p="Info.cs" t="Include" />
           <e p="ISO9660.cs" t="Include" />
+          <e p="Info.cs" t="Include" />
           <e p="Mode2.cs" t="Include" />
           <e p="PathTable.cs" t="Include" />
           <e p="Structs" t="Include">
@@ -828,8 +865,8 @@
             <e p="CDi.cs" t="Include" />
             <e p="ElTorito.cs" t="Include" />
             <e p="HighSierra.cs" t="Include" />
-            <e p="Internal.cs" t="Include" />
             <e p="ISO.cs" t="Include" />
+            <e p="Internal.cs" t="Include" />
             <e p="Joliet.cs" t="Include" />
             <e p="RRIP.cs" t="Include" />
             <e p="SUSP.cs" t="Include" />
@@ -856,15 +893,8 @@
         <e p="MicroDOS.cs" t="Include" />
         <e p="MinixFS.cs" t="Include" />
         <e p="NILFS2.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="netcoreapp3.0" t="Include">
-              <e p="Aaru.Filesystems.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
+        <e p="Nintendo.cs" t="Include" />
         <e p="ODS.cs" t="Include" />
         <e p="Opera" t="Include">
           <e p="Consts.cs" t="Include" />
@@ -882,11 +912,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" />
@@ -910,6 +940,9 @@
         <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" />
@@ -917,24 +950,36 @@
         <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">
@@ -942,11 +987,6 @@
             </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
 =======
@@ -955,7 +995,6 @@
         <e p="App.xaml" t="Include" />
         <e p="App.xaml.cs" t="Include" />
         <e p="Assets" t="Include">
-          <e p="aaru-logo.png" t="Include" />
           <e p="Icons" t="Include">
             <e p="oxygen" t="Include">
               <e p="32x32" t="Include">
@@ -1049,12 +1088,6 @@
               <e p="DDS3.svg" t="Include" />
               <e p="DDS4.png" t="Include" />
               <e p="DDS4.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="DLTtapeIII.png" t="Include" />
               <e p="DLTtapeIII.svg" t="Include" />
               <e p="DLTtapeIIIxt.png" t="Include" />
@@ -1079,6 +1112,12 @@
               <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" />
@@ -1161,8 +1200,6 @@
               <e p="MemoryStickProDuo.svg" t="Include" />
               <e p="MilCD.png" t="Include" />
               <e p="MilCD.svg" t="Include" />
-              <e p="miniSD.png" t="Include" />
-              <e p="miniSD.svg" t="Include" />
               <e p="NeoGeoCD.png" t="Include" />
               <e p="NeoGeoCD.svg" t="Include" />
               <e p="Nintendo3DSGameCard.png" t="Include" />
@@ -1178,18 +1215,6 @@
               <e p="PD650.svg" t="Include" />
               <e p="PD650_WORM.png" t="Include" />
               <e p="PD650_WORM.svg" t="Include" />
-              <e p="Pippin.png" t="Include" />
-              <e p="Pippin.svg" t="Include" />
-              <e p="Playdia.png" t="Include" />
-              <e p="Playdia.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="PocketZip.png" t="Include" />
-              <e p="PocketZip.svg" t="Include" />
               <e p="PS1CD.png" t="Include" />
               <e p="PS1CD.svg" t="Include" />
               <e p="PS2CD.png" t="Include" />
@@ -1202,6 +1227,18 @@
               <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" />
@@ -1210,14 +1247,14 @@
               <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="SVCD.png" t="Include" />
-              <e p="SVCD.svg" t="Include" />
               <e p="SwitchGameCard.png" t="Include" />
               <e p="SwitchGameCard.svg" t="Include" />
               <e p="ThreeDO.png" t="Include" />
@@ -1240,10 +1277,12 @@
               <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="bin" t="ExcludeRecursive" />
         <e p="ConsoleHandler.cs" t="Include" />
         <e p="Controls" t="Include">
           <e p="BlockMap.cs" t="Include" />
@@ -1253,8 +1292,8 @@
           <e p="AssemblyModel.cs" t="Include" />
           <e p="ChecksumModel.cs" t="Include" />
           <e p="DeviceModel.cs" t="Include" />
-          <e p="DevicesRootModel.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" />
@@ -1277,16 +1316,6 @@
           <e p="SubdirectoryModel.cs" t="Include" />
           <e p="TrackEntropyModel.cs" t="Include" />
         </e>
-        <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 p="Avalonia" t="Include">
-                <e p="resources" t="Include" />
-              </e>
-            </e>
-          </e>
-        </e>
         <e p="ResourceHandler.cs" t="Include" />
         <e p="ViewLocator.cs" t="Include" />
         <e p="ViewModels" t="Include">
@@ -1409,6 +1438,14 @@
             <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">
@@ -1418,7 +1455,6 @@
         <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" />
@@ -1426,6 +1462,10 @@
         <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">
@@ -1433,9 +1473,6 @@
             </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" />
@@ -1518,7 +1555,16 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
+        <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="BlindWrite4" t="Include">
           <e p="BlindWrite4.cs" t="Include" />
           <e p="Constants.cs" t="Include" />
@@ -1540,16 +1586,6 @@
           <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" />
@@ -1583,6 +1619,16 @@
           <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" />
@@ -1620,16 +1666,6 @@
           <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" />
@@ -1720,8 +1756,8 @@
         <e p="IMD" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
           <e p="IMD.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" />
@@ -1755,17 +1791,6 @@
           <e p="Structs.cs" t="Include" />
           <e p="Unsupported.cs" t="Include" />
         </e>
-        <e p="Nero" t="Include">
-          <e p="Constants.cs" t="Include" />
-          <e p="Enums.cs" t="Include" />
-          <e p="Helpers.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Nero.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <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" />
@@ -1776,12 +1801,16 @@
           <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="netcoreapp3.0" t="Include">
-              <e p="Aaru.Images.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
+        <e p="Nero" t="Include">
+          <e p="Constants.cs" t="Include" />
+          <e p="Enums.cs" t="Include" />
+          <e p="Helpers.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Nero.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Verify.cs" t="Include" />
         </e>
         <e p="Parallels" t="Include">
           <e p="Constants.cs" t="Include" />
@@ -1965,16 +1994,6 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="VHDX.cs" t="Include" />
         </e>
-        <e p="Virtual98" 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="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" />
@@ -1985,6 +2004,16 @@
           <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" />
+          <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="Virtual98.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" />
@@ -2003,17 +2032,27 @@
           <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" />
@@ -2021,7 +2060,6 @@
         <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" />
@@ -2029,13 +2067,6 @@
         <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="netcoreapp3.0" 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" />
@@ -2045,6 +2076,7 @@
         <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" />
@@ -2058,9 +2090,22 @@
 =======
         <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">
@@ -2069,14 +2114,19 @@
             </e>
           </e>
         </e>
-        <e p="Settings.cs" t="Include" />
       </e>
       <e p="Aaru.sln" t="IncludeFlat" />
-      <e p="Changelog.md" t="Include" />
-      <e p="CICMMetadata\dotnet\cicm.cs" t="Include" />
+      <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="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="AudioBuffer.cs" t="Include" />
         <e p="AudioDecoderSettings.cs" t="Include" />
         <e p="AudioEncoderSettings.cs" t="Include" />
@@ -2085,12 +2135,6 @@
         <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" />
@@ -2101,6 +2145,12 @@
         <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" />
@@ -2109,21 +2159,14 @@
         <e p="IAudioFilter.cs" t="Include" />
         <e p="IAudioSource.cs" t="Include" />
         <e p="IWavePlayer.cs" t="Include" />
-        <e p="License.txt" t="Include" />
         <e p="LPC.cs" t="Include" />
+        <e p="License.txt" 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="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">
@@ -2138,13 +2181,20 @@
           <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="ChannelMode.cs" t="Include" />
         <e p="COPYING" t="Include" />
-        <e p="CUETools.Codecs.FLAKE.csproj" t="IncludeRecursive" />
+        <e p="CUETools.Codecs.Flake.csproj" t="IncludeRecursive" />
+        <e p="ChannelMode.cs" t="Include" />
         <e p="DecoderSettings.cs" t="Include" />
         <e p="EncoderSettings.cs" t="Include" />
         <e p="FlacFrame.cs" t="Include" />
@@ -2152,13 +2202,6 @@
         <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="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">
@@ -2172,8 +2215,16 @@
         <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" />
@@ -2181,6 +2232,10 @@
       <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" />
@@ -2207,7 +2262,6 @@
           <e p="MagnitudeAxis.cs" t="Include" />
           <e p="TimeSpanAxis.cs" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
         <e p="CanvasRenderContext.cs" t="Include" />
         <e p="Converters" t="Include">
           <e p="OxyColorConverter.cs" t="Include" />
@@ -2218,25 +2272,15 @@
         </e>
         <e p="MoreColors.cs" t="Include" />
         <e p="NamespaceDoc.cs" t="Include" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netstandard2.0" t="Include">
-              <e p="Avalonia" t="Include">
-                <e p="resources" t="Include" />
-              </e>
-              <e p="OxyPlot.Avalonia.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
         <e p="OxyPlot.Avalonia.csproj" t="IncludeRecursive" />
         <e p="OxyPlot.Avalonia.csproj.DotSettings" t="Include" />
         <e p="OxyPlotModule.cs" t="Include" />
-        <e p="Plot.cs" t="Include" />
         <e p="Plot.Properties.cs" t="Include" />
-        <e p="PlotBase.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">
@@ -2278,11 +2322,17 @@
           <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>
\ No newline at end of file
+</project>
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index 8f8ace0f1..3291295cb 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -536,7 +536,7 @@
       <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
       <Name>Aaru.Filters</Name>
     </ProjectReference>
-    <ProjectReference Include="..\cuetools.net\CUETools.Codecs.FLAKE\CUETools.Codecs.FLAKE.csproj" />
+    <ProjectReference Include="..\cuetools.net\CUETools.Codecs.Flake\CUETools.Codecs.FLAKE.csproj" />
     <ProjectReference Include="..\cuetools.net\CUETools.Codecs\CUETools.Codecs.csproj" />
   </ItemGroup>
   <ItemGroup>
@@ -576,4 +576,4 @@
         <!-- Add the Facades directory.  Not sure how else to do this. Necessary at least for .NET 4.5 -->
         <AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
     </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
diff --git a/cuetools.net b/cuetools.net
index ddc034583..0f90e85c6 160000
--- a/cuetools.net
+++ b/cuetools.net
@@ -1 +1 @@
-Subproject commit ddc034583861ccc2ce8a5b1c19c0d73b0883c517
+Subproject commit 0f90e85c6d393ab7ebc213779edf06d6027d2982