From fc0f03ba5aa28e8ffabc7bf29e08c3dba7368d64 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 12 Sep 2021 22:53:19 +0100
Subject: [PATCH] Upgrade dependencies.

---
 Aaru.Archives/Aaru.Archives.csproj           |   7 +-
 Aaru.Checksums                               |   2 +-
 Aaru.CommonTypes                             |   2 +-
 Aaru.Compression/Aaru.Compression.csproj     |  14 +-
 Aaru.Console                                 |   2 +-
 Aaru.Core/Aaru.Core.csproj                   | 216 ++---
 Aaru.Database/Aaru.Database.csproj           |   2 +-
 Aaru.Decoders                                |   2 +-
 Aaru.Devices/Aaru.Devices.csproj             |   2 +-
 Aaru.Dto                                     |   2 +-
 Aaru.Filesystems/Aaru.Filesystems.csproj     | 364 +++----
 Aaru.Filters/Aaru.Filters.csproj             |  40 +-
 Aaru.Gui/Aaru.Gui.csproj                     | 583 ++++++------
 Aaru.Helpers                                 |   2 +-
 Aaru.Images/Aaru.Images.csproj               | 942 +++++++++----------
 Aaru.Partitions/Aaru.Partitions.csproj       |  54 +-
 Aaru.Settings/Aaru.Settings.csproj           |   2 +-
 Aaru.Tests.Devices/Aaru.Tests.Devices.csproj |  95 +-
 Aaru.Tests/Aaru.Tests.csproj                 |   8 +-
 Aaru/Aaru.csproj                             |   7 +-
 20 files changed, 1180 insertions(+), 1168 deletions(-)

diff --git a/Aaru.Archives/Aaru.Archives.csproj b/Aaru.Archives/Aaru.Archives.csproj
index 6ebe52b57..e9a32bf5a 100644
--- a/Aaru.Archives/Aaru.Archives.csproj
+++ b/Aaru.Archives/Aaru.Archives.csproj
@@ -76,8 +76,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SharpCompress" Version="0.24.0" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
+    <PackageReference Include="SharpCompress" Version="0.29.0" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
diff --git a/Aaru.Checksums b/Aaru.Checksums
index 786f6a5b6..1dd0742fb 160000
--- a/Aaru.Checksums
+++ b/Aaru.Checksums
@@ -1 +1 @@
-Subproject commit 786f6a5b6d9969b2ecee90ac0b6333b2f0914e7d
+Subproject commit 1dd0742fb8ce87415498da8dfde75144d4d3d550
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index 2fa72ccb3..2171f184a 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit 2fa72ccb383767a84758951ef7ce5190cfdc4eee
+Subproject commit 2171f184a97c3e511ad4289522e0e380111e7136
diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj
index 2cebd7732..fe8eb4d6d 100644
--- a/Aaru.Compression/Aaru.Compression.csproj
+++ b/Aaru.Compression/Aaru.Compression.csproj
@@ -59,14 +59,14 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="System.Data"/>
-    <Reference Include="System.Xml"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AppleRle.cs"/>
-    <Compile Include="TeleDiskLzh.cs"/>
+    <Compile Include="AppleRle.cs" />
+    <Compile Include="TeleDiskLzh.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\LICENSE.LGPL">
@@ -74,7 +74,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all"/>
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Aaru.Console b/Aaru.Console
index ce2ca83b4..8b12448ec 160000
--- a/Aaru.Console
+++ b/Aaru.Console
@@ -1 +1 @@
-Subproject commit ce2ca83b494a2db3eb9a732c07ce5a4feb5626e4
+Subproject commit 8b12448ecdc2458ca5495ab0c88ed6d6dc2eeb27
diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj
index 57bf2e9c4..5d5058f59 100644
--- a/Aaru.Core/Aaru.Core.csproj
+++ b/Aaru.Core/Aaru.Core.csproj
@@ -54,105 +54,105 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System"/>
-    <Reference Include="System.Xml"/>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Devices\Dumping\CompactDisc\CdiReady.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\Data.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\Dump.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\Error.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\LeadOuts.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\Offset.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\Plextor.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\Pregap.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\Subchannel.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\Tags.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\Tracks.cs"/>
-    <Compile Include="Devices\Dumping\CompactDisc\Trim.cs"/>
-    <Compile Include="Devices\Dumping\Dump.cs"/>
-    <Compile Include="Devices\Dumping\Metadata.cs"/>
-    <Compile Include="Devices\Dumping\MiniDisc.cs"/>
-    <Compile Include="Devices\Dumping\PlayStationPortable\MemoryStick.cs"/>
-    <Compile Include="Devices\Dumping\PlayStationPortable\PlayStationPortable.cs"/>
-    <Compile Include="Devices\Dumping\PlayStationPortable\UMD.cs"/>
-    <Compile Include="Devices\Dumping\Sbc\Data.cs"/>
-    <Compile Include="Devices\Dumping\Sbc\Error.cs"/>
-    <Compile Include="Devices\Dumping\Sbc\Dump.cs"/>
-    <Compile Include="Devices\Dumping\Sbc\Optical.cs"/>
-    <Compile Include="Devices\Dumping\Sbc\Trim.cs"/>
-    <Compile Include="Devices\Info\DeviceInfo.cs"/>
-    <Compile Include="Devices\Info\Plextor.cs"/>
-    <Compile Include="Devices\Info\Properties.cs"/>
-    <Compile Include="Devices\Report\DeviceReport.cs"/>
-    <Compile Include="Devices\Report\GdRomSwapTrick.cs"/>
-    <Compile Include="Devices\Report\Scsi.cs"/>
-    <Compile Include="Devices\Report\MMC.cs"/>
-    <Compile Include="Devices\Report\SSC.cs"/>
-    <Compile Include="Devices\Scanning\MediaScan.cs"/>
-    <Compile Include="Entropy.cs"/>
-    <Compile Include="GetPluginBase.cs"/>
-    <Compile Include="ImageInfo.cs"/>
-    <Compile Include="Logging\ErrorLog.cs"/>
-    <Compile Include="Logging\SubchannelLog.cs"/>
-    <Compile Include="Media\CompactDisc.cs"/>
-    <Compile Include="Media\Detection\MMC.cs"/>
-    <Compile Include="Media\Info\CompactDisc.cs"/>
-    <Compile Include="Media\Info\ScsiInfo.cs"/>
-    <Compile Include="Media\Info\XgdInfo.cs"/>
-    <Compile Include="Options.cs"/>
-    <Compile Include="ImageFormat.cs"/>
-    <Compile Include="Error.cs"/>
-    <Compile Include="PrintScsiModePages.cs"/>
-    <Compile Include="Sidecar\Files.cs"/>
-    <Compile Include="Statistics.cs"/>
-    <Compile Include="Checksum.cs"/>
-    <Compile Include="Logging\IBGLog.cs"/>
-    <Compile Include="Logging\MHDDLog.cs"/>
-    <Compile Include="Devices\Scanning\ATA.cs"/>
-    <Compile Include="Devices\Scanning\SecureDigital.cs"/>
-    <Compile Include="Devices\Scanning\NVMe.cs"/>
-    <Compile Include="Devices\Scanning\SCSI.cs"/>
-    <Compile Include="Devices\Dumping\ATA.cs"/>
-    <Compile Include="Devices\Dumping\NVMe.cs"/>
-    <Compile Include="Devices\Dumping\SCSI.cs"/>
-    <Compile Include="Devices\Dumping\SecureDigital.cs"/>
-    <Compile Include="DataFile.cs"/>
-    <Compile Include="Filesystems.cs"/>
-    <Compile Include="Devices\Scanning\ScanResults.cs"/>
-    <Compile Include="Devices\Report\ATA.cs"/>
-    <Compile Include="Devices\Report\FireWire.cs"/>
-    <Compile Include="Devices\Report\USB.cs"/>
-    <Compile Include="Devices\Report\SecureDigital.cs"/>
-    <Compile Include="Remote.cs"/>
-    <Compile Include="Devices\Report\PCMCIA.cs"/>
-    <Compile Include="Devices\Reader.cs"/>
-    <Compile Include="Devices\ReaderATA.cs"/>
-    <Compile Include="Devices\ReaderSCSI.cs"/>
-    <Compile Include="Devices\Dumping\SSC.cs"/>
-    <Compile Include="Devices\Dumping\MMC.cs"/>
-    <Compile Include="Devices\Dumping\XGD.cs"/>
-    <Compile Include="Devices\Dumping\ResumeSupport.cs"/>
-    <Compile Include="Partitions.cs"/>
-    <Compile Include="Sidecar\Events.cs"/>
-    <Compile Include="Sidecar\Helpers.cs"/>
-    <Compile Include="Sidecar\Sidecar.cs"/>
-    <Compile Include="Sidecar\OpticalDisc.cs"/>
-    <Compile Include="Sidecar\BlockMedia.cs"/>
-    <Compile Include="Sidecar\LinearMedia.cs"/>
-    <Compile Include="Sidecar\AudioMedia.cs"/>
-    <Compile Include="Sidecar\BlockTape.cs"/>
-    <Compile Include="Logging\DumpLog.cs"/>
+    <Compile Include="Devices\Dumping\CompactDisc\CdiReady.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\Data.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\Dump.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\Error.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\LeadOuts.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\Offset.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\Plextor.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\Pregap.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\Subchannel.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\Tags.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\Tracks.cs" />
+    <Compile Include="Devices\Dumping\CompactDisc\Trim.cs" />
+    <Compile Include="Devices\Dumping\Dump.cs" />
+    <Compile Include="Devices\Dumping\Metadata.cs" />
+    <Compile Include="Devices\Dumping\MiniDisc.cs" />
+    <Compile Include="Devices\Dumping\PlayStationPortable\MemoryStick.cs" />
+    <Compile Include="Devices\Dumping\PlayStationPortable\PlayStationPortable.cs" />
+    <Compile Include="Devices\Dumping\PlayStationPortable\UMD.cs" />
+    <Compile Include="Devices\Dumping\Sbc\Data.cs" />
+    <Compile Include="Devices\Dumping\Sbc\Error.cs" />
+    <Compile Include="Devices\Dumping\Sbc\Dump.cs" />
+    <Compile Include="Devices\Dumping\Sbc\Optical.cs" />
+    <Compile Include="Devices\Dumping\Sbc\Trim.cs" />
+    <Compile Include="Devices\Info\DeviceInfo.cs" />
+    <Compile Include="Devices\Info\Plextor.cs" />
+    <Compile Include="Devices\Info\Properties.cs" />
+    <Compile Include="Devices\Report\DeviceReport.cs" />
+    <Compile Include="Devices\Report\GdRomSwapTrick.cs" />
+    <Compile Include="Devices\Report\Scsi.cs" />
+    <Compile Include="Devices\Report\MMC.cs" />
+    <Compile Include="Devices\Report\SSC.cs" />
+    <Compile Include="Devices\Scanning\MediaScan.cs" />
+    <Compile Include="Entropy.cs" />
+    <Compile Include="GetPluginBase.cs" />
+    <Compile Include="ImageInfo.cs" />
+    <Compile Include="Logging\ErrorLog.cs" />
+    <Compile Include="Logging\SubchannelLog.cs" />
+    <Compile Include="Media\CompactDisc.cs" />
+    <Compile Include="Media\Detection\MMC.cs" />
+    <Compile Include="Media\Info\CompactDisc.cs" />
+    <Compile Include="Media\Info\ScsiInfo.cs" />
+    <Compile Include="Media\Info\XgdInfo.cs" />
+    <Compile Include="Options.cs" />
+    <Compile Include="ImageFormat.cs" />
+    <Compile Include="Error.cs" />
+    <Compile Include="PrintScsiModePages.cs" />
+    <Compile Include="Sidecar\Files.cs" />
+    <Compile Include="Statistics.cs" />
+    <Compile Include="Checksum.cs" />
+    <Compile Include="Logging\IBGLog.cs" />
+    <Compile Include="Logging\MHDDLog.cs" />
+    <Compile Include="Devices\Scanning\ATA.cs" />
+    <Compile Include="Devices\Scanning\SecureDigital.cs" />
+    <Compile Include="Devices\Scanning\NVMe.cs" />
+    <Compile Include="Devices\Scanning\SCSI.cs" />
+    <Compile Include="Devices\Dumping\ATA.cs" />
+    <Compile Include="Devices\Dumping\NVMe.cs" />
+    <Compile Include="Devices\Dumping\SCSI.cs" />
+    <Compile Include="Devices\Dumping\SecureDigital.cs" />
+    <Compile Include="DataFile.cs" />
+    <Compile Include="Filesystems.cs" />
+    <Compile Include="Devices\Scanning\ScanResults.cs" />
+    <Compile Include="Devices\Report\ATA.cs" />
+    <Compile Include="Devices\Report\FireWire.cs" />
+    <Compile Include="Devices\Report\USB.cs" />
+    <Compile Include="Devices\Report\SecureDigital.cs" />
+    <Compile Include="Remote.cs" />
+    <Compile Include="Devices\Report\PCMCIA.cs" />
+    <Compile Include="Devices\Reader.cs" />
+    <Compile Include="Devices\ReaderATA.cs" />
+    <Compile Include="Devices\ReaderSCSI.cs" />
+    <Compile Include="Devices\Dumping\SSC.cs" />
+    <Compile Include="Devices\Dumping\MMC.cs" />
+    <Compile Include="Devices\Dumping\XGD.cs" />
+    <Compile Include="Devices\Dumping\ResumeSupport.cs" />
+    <Compile Include="Partitions.cs" />
+    <Compile Include="Sidecar\Events.cs" />
+    <Compile Include="Sidecar\Helpers.cs" />
+    <Compile Include="Sidecar\Sidecar.cs" />
+    <Compile Include="Sidecar\OpticalDisc.cs" />
+    <Compile Include="Sidecar\BlockMedia.cs" />
+    <Compile Include="Sidecar\LinearMedia.cs" />
+    <Compile Include="Sidecar\AudioMedia.cs" />
+    <Compile Include="Sidecar\BlockTape.cs" />
+    <Compile Include="Logging\DumpLog.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Aaru.Archives\Aaru.Archives.csproj"/>
+    <ProjectReference Include="..\Aaru.Archives\Aaru.Archives.csproj" />
     <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
       <Project>{ccaa7afe-c094-4d82-a66d-630de8a3f545}</Project>
       <Name>Aaru.Console</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Aaru.Database\Aaru.Database.csproj"/>
-    <ProjectReference Include="..\Aaru.Decryption\Aaru.Decryption.csproj"/>
-    <ProjectReference Include="..\Aaru.Dto\Aaru.Dto.csproj"/>
+    <ProjectReference Include="..\Aaru.Database\Aaru.Database.csproj" />
+    <ProjectReference Include="..\Aaru.Decryption\Aaru.Decryption.csproj" />
+    <ProjectReference Include="..\Aaru.Dto\Aaru.Dto.csproj" />
     <ProjectReference Include="..\Aaru.Filesystems\Aaru.Filesystems.csproj">
       <Project>{D7016DF2-5A5E-4524-B40D-BA2D59576688}</Project>
       <Name>Aaru.Filesystems</Name>
@@ -195,12 +195,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Logging\"/>
-    <Folder Include="Devices\"/>
-    <Folder Include="Devices\Scanning\"/>
-    <Folder Include="Devices\Dumping\"/>
-    <Folder Include="Devices\Report\"/>
-    <Folder Include="Sidecar\"/>
+    <Folder Include="Logging\" />
+    <Folder Include="Devices\" />
+    <Folder Include="Devices\Scanning\" />
+    <Folder Include="Devices\Dumping\" />
+    <Folder Include="Devices\Report\" />
+    <Folder Include="Sidecar\" />
   </ItemGroup>
   <ItemGroup></ItemGroup>
   <ItemGroup>
@@ -209,22 +209,22 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="4.5.0"/>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all"/>
-    <PackageReference Include="System.Collections" Version="4.3.0"/>
-    <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0"/>
-    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0"/>
-    <PackageReference Include="System.Runtime.Extensions" Version="4.3.1"/>
-    <PackageReference Include="System.Runtime.Handles" Version="4.3.0"/>
-    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0"/>
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
+    <PackageReference Include="System.Collections" Version="4.3.0" />
+    <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
+    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
+    <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
         <Policies>
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp"/>
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" NewLineForMembersInObjectInit="False" NewLineForMembersInAnonymousTypes="False" NewLineForClausesInQuery="False" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp"/>
-          <DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild"/>
+          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" NewLineForMembersInObjectInit="False" NewLineForMembersInAnonymousTypes="False" NewLineForClausesInQuery="False" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
+          <DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild" />
         </Policies>
       </Properties>
     </MonoDevelop>
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index 2e6d5c075..708e1b7d5 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -70,7 +70,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.0-preview.7.21378.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-preview.7.21378.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="2.0.0-preview1-final" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Context.cs" />
diff --git a/Aaru.Decoders b/Aaru.Decoders
index 51c8224fc..824723915 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit 51c8224fce0019183bce1655e2091a3f85501d45
+Subproject commit 824723915283da65b03444b8c5dc28948d35a746
diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj
index 87ab1be2a..faf19f52a 100644
--- a/Aaru.Devices/Aaru.Devices.csproj
+++ b/Aaru.Devices/Aaru.Devices.csproj
@@ -121,7 +121,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Management" Version="6.0.0-preview.7.21377.19" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
diff --git a/Aaru.Dto b/Aaru.Dto
index 53856c274..09a8b3bb5 160000
--- a/Aaru.Dto
+++ b/Aaru.Dto
@@ -1 +1 @@
-Subproject commit 53856c274a5aa7874e30f9415ea2dd93acc26bdf
+Subproject commit 09a8b3bb5d7e79e9720f3b3701b97f978115e620
diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj
index 322a37e29..7a37e0567 100644
--- a/Aaru.Filesystems/Aaru.Filesystems.csproj
+++ b/Aaru.Filesystems/Aaru.Filesystems.csproj
@@ -56,179 +56,179 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System"/>
-    <Reference Include="System.Xml"/>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Claunia.Encoding" Version="1.9.1"/>
-    <PackageReference Include="System.ValueTuple" Version="4.5.0"/>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all"/>
+    <PackageReference Include="Claunia.Encoding" Version="1.9.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AppleCommon\Consts.cs"/>
-    <Compile Include="AppleCommon\Enums.cs"/>
-    <Compile Include="AppleCommon\Info.cs"/>
-    <Compile Include="AppleCommon\Structs.cs"/>
-    <Compile Include="AppleHFS\AppleHFS.cs"/>
-    <Compile Include="AppleHFS\Consts.cs"/>
-    <Compile Include="AppleHFS\Enums.cs"/>
-    <Compile Include="AppleHFS\Info.cs"/>
-    <Compile Include="AppleHFS\Structs.cs"/>
-    <Compile Include="FATX\Consts.cs"/>
-    <Compile Include="FATX\Dir.cs"/>
-    <Compile Include="FATX\FATX.cs"/>
-    <Compile Include="FATX\File.cs"/>
-    <Compile Include="FATX\Info.cs"/>
-    <Compile Include="FATX\Structs.cs"/>
-    <Compile Include="FATX\Super.cs"/>
-    <Compile Include="FAT\BPB.cs"/>
-    <Compile Include="FAT\Consts.cs"/>
-    <Compile Include="FAT\Dir.cs"/>
-    <Compile Include="FAT\FAT.cs"/>
-    <Compile Include="FAT\File.cs"/>
-    <Compile Include="FAT\Info.cs"/>
-    <Compile Include="FAT\Structs.cs"/>
-    <Compile Include="FAT\Super.cs"/>
-    <Compile Include="FAT\Xattr.cs"/>
-    <Compile Include="HPOFS\Consts.cs"/>
-    <Compile Include="HPOFS\HPOFS.cs"/>
-    <Compile Include="HPOFS\Info.cs"/>
-    <Compile Include="HPOFS\Structs.cs"/>
-    <Compile Include="ISO9660\Consts\Internal.cs"/>
-    <Compile Include="ISO9660\Date.cs"/>
-    <Compile Include="ISO9660\Dir.cs"/>
-    <Compile Include="ISO9660\File.cs"/>
-    <Compile Include="ISO9660\Mode2.cs"/>
-    <Compile Include="ISO9660\PathTable.cs"/>
-    <Compile Include="ISO9660\Super.cs"/>
-    <Compile Include="ISO9660\Xattr.cs"/>
-    <Compile Include="Opera\Consts.cs"/>
-    <Compile Include="Opera\Dir.cs"/>
-    <Compile Include="Opera\File.cs"/>
-    <Compile Include="Opera\Info.cs"/>
-    <Compile Include="Opera\Opera.cs"/>
-    <Compile Include="Opera\Structs.cs"/>
-    <Compile Include="Opera\Super.cs"/>
-    <Compile Include="PCFX.cs"/>
-    <Compile Include="AmigaDOS.cs"/>
-    <Compile Include="AppleHFSPlus.cs"/>
-    <Compile Include="BFS.cs"/>
-    <Compile Include="ext2FS.cs"/>
-    <Compile Include="extFS.cs"/>
-    <Compile Include="FFS.cs"/>
-    <Compile Include="HPFS.cs"/>
-    <Compile Include="MinixFS.cs"/>
-    <Compile Include="NTFS.cs"/>
-    <Compile Include="ODS.cs"/>
-    <Compile Include="PCEngine.cs"/>
-    <Compile Include="ProDOS.cs"/>
-    <Compile Include="ReFS.cs"/>
-    <Compile Include="Register.cs"/>
-    <Compile Include="SolarFS.cs"/>
-    <Compile Include="Symbian.cs"/>
-    <Compile Include="SysV.cs"/>
-    <Compile Include="UNIXBFS.cs"/>
-    <Compile Include="Acorn.cs"/>
-    <Compile Include="Nintendo.cs"/>
-    <Compile Include="BTRFS.cs"/>
-    <Compile Include="APFS.cs"/>
-    <Compile Include="LisaFS\LisaFS.cs"/>
-    <Compile Include="LisaFS\Consts.cs"/>
-    <Compile Include="LisaFS\Structs.cs"/>
-    <Compile Include="LisaFS\Info.cs"/>
-    <Compile Include="LisaFS\Super.cs"/>
-    <Compile Include="LisaFS\Xattr.cs"/>
-    <Compile Include="LisaFS\Dir.cs"/>
-    <Compile Include="LisaFS\File.cs"/>
-    <Compile Include="LisaFS\Extent.cs"/>
-    <Compile Include="UCSDPascal\UCSDPascal.cs"/>
-    <Compile Include="UCSDPascal\Consts.cs"/>
-    <Compile Include="UCSDPascal\File.cs"/>
-    <Compile Include="UCSDPascal\Info.cs"/>
-    <Compile Include="UCSDPascal\Structs.cs"/>
-    <Compile Include="UCSDPascal\Super.cs"/>
-    <Compile Include="UCSDPascal\Dir.cs"/>
-    <Compile Include="AppleMFS\AppleMFS.cs"/>
-    <Compile Include="AppleMFS\Consts.cs"/>
-    <Compile Include="AppleMFS\Dir.cs"/>
-    <Compile Include="AppleMFS\File.cs"/>
-    <Compile Include="AppleMFS\Info.cs"/>
-    <Compile Include="AppleMFS\Structs.cs"/>
-    <Compile Include="AppleMFS\Super.cs"/>
-    <Compile Include="AppleMFS\Xattr.cs"/>
-    <Compile Include="exFAT.cs"/>
-    <Compile Include="CPM\Info.cs"/>
-    <Compile Include="CPM\CPM.cs"/>
-    <Compile Include="CPM\Structs.cs"/>
-    <Compile Include="CPM\Definitions.cs"/>
-    <Compile Include="CPM\Dir.cs"/>
-    <Compile Include="CPM\Super.cs"/>
-    <Compile Include="CPM\Consts.cs"/>
-    <Compile Include="CPM\File.cs"/>
-    <Compile Include="CPM\Xattr.cs"/>
-    <Compile Include="QNX4.cs"/>
-    <Compile Include="QNX6.cs"/>
-    <Compile Include="JFS.cs"/>
-    <Compile Include="F2FS.cs"/>
-    <Compile Include="NILFS2.cs"/>
-    <Compile Include="Reiser.cs"/>
-    <Compile Include="Reiser4.cs"/>
-    <Compile Include="XFS.cs"/>
-    <Compile Include="PFS.cs"/>
-    <Compile Include="SFS.cs"/>
-    <Compile Include="VMfs.cs"/>
-    <Compile Include="VxFS.cs"/>
-    <Compile Include="Squash.cs"/>
-    <Compile Include="Cram.cs"/>
-    <Compile Include="CBM.cs"/>
-    <Compile Include="UDF.cs"/>
-    <Compile Include="ECMA67.cs"/>
-    <Compile Include="Xia.cs"/>
-    <Compile Include="ZFS.cs"/>
-    <Compile Include="AppleDOS\Dir.cs"/>
-    <Compile Include="AppleDOS\File.cs"/>
-    <Compile Include="AppleDOS\Info.cs"/>
-    <Compile Include="AppleDOS\AppleDOS.cs"/>
-    <Compile Include="AppleDOS\Structs.cs"/>
-    <Compile Include="AppleDOS\Super.cs"/>
-    <Compile Include="AppleDOS\Xattr.cs"/>
-    <Compile Include="AtheOS.cs"/>
-    <Compile Include="HAMMER.cs"/>
-    <Compile Include="Fossil.cs"/>
-    <Compile Include="EFS.cs"/>
-    <Compile Include="UNICOS.cs"/>
-    <Compile Include="RBF.cs"/>
-    <Compile Include="AODOS.cs"/>
-    <Compile Include="RT11.cs"/>
-    <Compile Include="LIF.cs"/>
-    <Compile Include="Locus.cs"/>
-    <Compile Include="dump.cs"/>
-    <Compile Include="MicroDOS.cs"/>
-    <Compile Include="ISO9660\Info.cs"/>
-    <Compile Include="ISO9660\ISO9660.cs"/>
-    <Compile Include="ISO9660\Structs\ISO.cs"/>
-    <Compile Include="ISO9660\Structs\RRIP.cs"/>
-    <Compile Include="ISO9660\Structs\SUSP.cs"/>
-    <Compile Include="ISO9660\Structs\Amiga.cs"/>
-    <Compile Include="ISO9660\Structs\HighSierra.cs"/>
-    <Compile Include="ISO9660\Structs\Apple.cs"/>
-    <Compile Include="ISO9660\Structs\ElTorito.cs"/>
-    <Compile Include="ISO9660\Structs\XA.cs"/>
-    <Compile Include="ISO9660\Structs\Ziso.cs"/>
-    <Compile Include="ISO9660\Structs\Joliet.cs"/>
-    <Compile Include="ISO9660\Structs\Internal.cs"/>
-    <Compile Include="ISO9660\Consts\ISO.cs"/>
-    <Compile Include="ISO9660\Consts\HighSierra.cs"/>
-    <Compile Include="ISO9660\Consts\XA.cs"/>
-    <Compile Include="ISO9660\Consts\ElTorito.cs"/>
-    <Compile Include="ISO9660\Consts\Apple.cs"/>
-    <Compile Include="ISO9660\Consts\RRIP.cs"/>
-    <Compile Include="ISO9660\Consts\Amiga.cs"/>
-    <Compile Include="ISO9660\Consts\SUSP.cs"/>
-    <Compile Include="ISO9660\Consts\Ziso.cs"/>
-    <Compile Include="ISO9660\Consts\AAIP.cs"/>
-    <Compile Include="ISO9660\Structs\CDi.cs"/>
-    <Compile Include="ISO9660\Consts\CDi.cs"/>
+    <Compile Include="AppleCommon\Consts.cs" />
+    <Compile Include="AppleCommon\Enums.cs" />
+    <Compile Include="AppleCommon\Info.cs" />
+    <Compile Include="AppleCommon\Structs.cs" />
+    <Compile Include="AppleHFS\AppleHFS.cs" />
+    <Compile Include="AppleHFS\Consts.cs" />
+    <Compile Include="AppleHFS\Enums.cs" />
+    <Compile Include="AppleHFS\Info.cs" />
+    <Compile Include="AppleHFS\Structs.cs" />
+    <Compile Include="FATX\Consts.cs" />
+    <Compile Include="FATX\Dir.cs" />
+    <Compile Include="FATX\FATX.cs" />
+    <Compile Include="FATX\File.cs" />
+    <Compile Include="FATX\Info.cs" />
+    <Compile Include="FATX\Structs.cs" />
+    <Compile Include="FATX\Super.cs" />
+    <Compile Include="FAT\BPB.cs" />
+    <Compile Include="FAT\Consts.cs" />
+    <Compile Include="FAT\Dir.cs" />
+    <Compile Include="FAT\FAT.cs" />
+    <Compile Include="FAT\File.cs" />
+    <Compile Include="FAT\Info.cs" />
+    <Compile Include="FAT\Structs.cs" />
+    <Compile Include="FAT\Super.cs" />
+    <Compile Include="FAT\Xattr.cs" />
+    <Compile Include="HPOFS\Consts.cs" />
+    <Compile Include="HPOFS\HPOFS.cs" />
+    <Compile Include="HPOFS\Info.cs" />
+    <Compile Include="HPOFS\Structs.cs" />
+    <Compile Include="ISO9660\Consts\Internal.cs" />
+    <Compile Include="ISO9660\Date.cs" />
+    <Compile Include="ISO9660\Dir.cs" />
+    <Compile Include="ISO9660\File.cs" />
+    <Compile Include="ISO9660\Mode2.cs" />
+    <Compile Include="ISO9660\PathTable.cs" />
+    <Compile Include="ISO9660\Super.cs" />
+    <Compile Include="ISO9660\Xattr.cs" />
+    <Compile Include="Opera\Consts.cs" />
+    <Compile Include="Opera\Dir.cs" />
+    <Compile Include="Opera\File.cs" />
+    <Compile Include="Opera\Info.cs" />
+    <Compile Include="Opera\Opera.cs" />
+    <Compile Include="Opera\Structs.cs" />
+    <Compile Include="Opera\Super.cs" />
+    <Compile Include="PCFX.cs" />
+    <Compile Include="AmigaDOS.cs" />
+    <Compile Include="AppleHFSPlus.cs" />
+    <Compile Include="BFS.cs" />
+    <Compile Include="ext2FS.cs" />
+    <Compile Include="extFS.cs" />
+    <Compile Include="FFS.cs" />
+    <Compile Include="HPFS.cs" />
+    <Compile Include="MinixFS.cs" />
+    <Compile Include="NTFS.cs" />
+    <Compile Include="ODS.cs" />
+    <Compile Include="PCEngine.cs" />
+    <Compile Include="ProDOS.cs" />
+    <Compile Include="ReFS.cs" />
+    <Compile Include="Register.cs" />
+    <Compile Include="SolarFS.cs" />
+    <Compile Include="Symbian.cs" />
+    <Compile Include="SysV.cs" />
+    <Compile Include="UNIXBFS.cs" />
+    <Compile Include="Acorn.cs" />
+    <Compile Include="Nintendo.cs" />
+    <Compile Include="BTRFS.cs" />
+    <Compile Include="APFS.cs" />
+    <Compile Include="LisaFS\LisaFS.cs" />
+    <Compile Include="LisaFS\Consts.cs" />
+    <Compile Include="LisaFS\Structs.cs" />
+    <Compile Include="LisaFS\Info.cs" />
+    <Compile Include="LisaFS\Super.cs" />
+    <Compile Include="LisaFS\Xattr.cs" />
+    <Compile Include="LisaFS\Dir.cs" />
+    <Compile Include="LisaFS\File.cs" />
+    <Compile Include="LisaFS\Extent.cs" />
+    <Compile Include="UCSDPascal\UCSDPascal.cs" />
+    <Compile Include="UCSDPascal\Consts.cs" />
+    <Compile Include="UCSDPascal\File.cs" />
+    <Compile Include="UCSDPascal\Info.cs" />
+    <Compile Include="UCSDPascal\Structs.cs" />
+    <Compile Include="UCSDPascal\Super.cs" />
+    <Compile Include="UCSDPascal\Dir.cs" />
+    <Compile Include="AppleMFS\AppleMFS.cs" />
+    <Compile Include="AppleMFS\Consts.cs" />
+    <Compile Include="AppleMFS\Dir.cs" />
+    <Compile Include="AppleMFS\File.cs" />
+    <Compile Include="AppleMFS\Info.cs" />
+    <Compile Include="AppleMFS\Structs.cs" />
+    <Compile Include="AppleMFS\Super.cs" />
+    <Compile Include="AppleMFS\Xattr.cs" />
+    <Compile Include="exFAT.cs" />
+    <Compile Include="CPM\Info.cs" />
+    <Compile Include="CPM\CPM.cs" />
+    <Compile Include="CPM\Structs.cs" />
+    <Compile Include="CPM\Definitions.cs" />
+    <Compile Include="CPM\Dir.cs" />
+    <Compile Include="CPM\Super.cs" />
+    <Compile Include="CPM\Consts.cs" />
+    <Compile Include="CPM\File.cs" />
+    <Compile Include="CPM\Xattr.cs" />
+    <Compile Include="QNX4.cs" />
+    <Compile Include="QNX6.cs" />
+    <Compile Include="JFS.cs" />
+    <Compile Include="F2FS.cs" />
+    <Compile Include="NILFS2.cs" />
+    <Compile Include="Reiser.cs" />
+    <Compile Include="Reiser4.cs" />
+    <Compile Include="XFS.cs" />
+    <Compile Include="PFS.cs" />
+    <Compile Include="SFS.cs" />
+    <Compile Include="VMfs.cs" />
+    <Compile Include="VxFS.cs" />
+    <Compile Include="Squash.cs" />
+    <Compile Include="Cram.cs" />
+    <Compile Include="CBM.cs" />
+    <Compile Include="UDF.cs" />
+    <Compile Include="ECMA67.cs" />
+    <Compile Include="Xia.cs" />
+    <Compile Include="ZFS.cs" />
+    <Compile Include="AppleDOS\Dir.cs" />
+    <Compile Include="AppleDOS\File.cs" />
+    <Compile Include="AppleDOS\Info.cs" />
+    <Compile Include="AppleDOS\AppleDOS.cs" />
+    <Compile Include="AppleDOS\Structs.cs" />
+    <Compile Include="AppleDOS\Super.cs" />
+    <Compile Include="AppleDOS\Xattr.cs" />
+    <Compile Include="AtheOS.cs" />
+    <Compile Include="HAMMER.cs" />
+    <Compile Include="Fossil.cs" />
+    <Compile Include="EFS.cs" />
+    <Compile Include="UNICOS.cs" />
+    <Compile Include="RBF.cs" />
+    <Compile Include="AODOS.cs" />
+    <Compile Include="RT11.cs" />
+    <Compile Include="LIF.cs" />
+    <Compile Include="Locus.cs" />
+    <Compile Include="dump.cs" />
+    <Compile Include="MicroDOS.cs" />
+    <Compile Include="ISO9660\Info.cs" />
+    <Compile Include="ISO9660\ISO9660.cs" />
+    <Compile Include="ISO9660\Structs\ISO.cs" />
+    <Compile Include="ISO9660\Structs\RRIP.cs" />
+    <Compile Include="ISO9660\Structs\SUSP.cs" />
+    <Compile Include="ISO9660\Structs\Amiga.cs" />
+    <Compile Include="ISO9660\Structs\HighSierra.cs" />
+    <Compile Include="ISO9660\Structs\Apple.cs" />
+    <Compile Include="ISO9660\Structs\ElTorito.cs" />
+    <Compile Include="ISO9660\Structs\XA.cs" />
+    <Compile Include="ISO9660\Structs\Ziso.cs" />
+    <Compile Include="ISO9660\Structs\Joliet.cs" />
+    <Compile Include="ISO9660\Structs\Internal.cs" />
+    <Compile Include="ISO9660\Consts\ISO.cs" />
+    <Compile Include="ISO9660\Consts\HighSierra.cs" />
+    <Compile Include="ISO9660\Consts\XA.cs" />
+    <Compile Include="ISO9660\Consts\ElTorito.cs" />
+    <Compile Include="ISO9660\Consts\Apple.cs" />
+    <Compile Include="ISO9660\Consts\RRIP.cs" />
+    <Compile Include="ISO9660\Consts\Amiga.cs" />
+    <Compile Include="ISO9660\Consts\SUSP.cs" />
+    <Compile Include="ISO9660\Consts\Ziso.cs" />
+    <Compile Include="ISO9660\Consts\AAIP.cs" />
+    <Compile Include="ISO9660\Structs\CDi.cs" />
+    <Compile Include="ISO9660\Consts\CDi.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj">
@@ -261,30 +261,30 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="LisaFS\"/>
-    <Folder Include="UCSDPascal\"/>
-    <Folder Include="AppleMFS\"/>
-    <Folder Include="CPM\"/>
-    <Folder Include="AppleDOS\"/>
-    <Folder Include="ISO9660\"/>
-    <Folder Include="ISO9660\Structs\"/>
-    <Folder Include="ISO9660\Consts\"/>
+    <Folder Include="LisaFS\" />
+    <Folder Include="UCSDPascal\" />
+    <Folder Include="AppleMFS\" />
+    <Folder Include="CPM\" />
+    <Folder Include="AppleDOS\" />
+    <Folder Include="ISO9660\" />
+    <Folder Include="ISO9660\Structs\" />
+    <Folder Include="ISO9660\Consts\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\LICENSE.LGPL">
       <Link>LICENSE.LGPL</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="CPM\cpmdefs.xml"/>
+    <EmbeddedResource Include="CPM\cpmdefs.xml" />
   </ItemGroup>
   <ItemGroup></ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
         <Policies>
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp"/>
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp"/>
-          <DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild"/>
-          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/"/>
+          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
+          <DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild" />
+          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/" />
         </Policies>
       </Properties>
     </MonoDevelop>
diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj
index c6b224865..5778d8bb2 100644
--- a/Aaru.Filters/Aaru.Filters.csproj
+++ b/Aaru.Filters/Aaru.Filters.csproj
@@ -54,22 +54,22 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System"/>
+    <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="OffsetStream.cs"/>
-    <Compile Include="Register.cs"/>
-    <Compile Include="SplitJoinStream.cs"/>
-    <Compile Include="ZZZNoFilter.cs"/>
-    <Compile Include="ForcedSeekStream.cs"/>
-    <Compile Include="GZip.cs"/>
-    <Compile Include="AppleSingle.cs"/>
-    <Compile Include="AppleDouble.cs"/>
-    <Compile Include="MacBinary.cs"/>
-    <Compile Include="BZip2.cs"/>
-    <Compile Include="PCExchange.cs"/>
-    <Compile Include="LZip.cs"/>
-    <Compile Include="XZ.cs"/>
+    <Compile Include="OffsetStream.cs" />
+    <Compile Include="Register.cs" />
+    <Compile Include="SplitJoinStream.cs" />
+    <Compile Include="ZZZNoFilter.cs" />
+    <Compile Include="ForcedSeekStream.cs" />
+    <Compile Include="GZip.cs" />
+    <Compile Include="AppleSingle.cs" />
+    <Compile Include="AppleDouble.cs" />
+    <Compile Include="MacBinary.cs" />
+    <Compile Include="BZip2.cs" />
+    <Compile Include="PCExchange.cs" />
+    <Compile Include="LZip.cs" />
+    <Compile Include="XZ.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\LICENSE.LGPL">
@@ -77,7 +77,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj"/>
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
     <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
       <Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
       <Name>Aaru.Console</Name>
@@ -88,16 +88,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SharpCompress" Version="0.25.1"/>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all"/>
+    <PackageReference Include="SharpCompress" Version="0.29.0" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
         <Policies>
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp"/>
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp"/>
-          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/"/>
+          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
+          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/" />
         </Policies>
       </Properties>
     </MonoDevelop>
diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
index 0369c60dd..c482c1846 100644
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -22,307 +22,310 @@
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.7"/>
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.7"/>
-    <PackageReference Include="Claunia.Encoding" Version="1.9.1"/>
-    <PackageReference Include="MessageBox.Avalonia" Version="1.5.1"/>
-    <PackageReference Include="OxyPlot.Avalonia-alpha-2020-04-15" Version="1.0.0"/>
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21377.19"/>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0"/>
-    <PackageReference Include="Avalonia" Version="0.10.7"/>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.7"/>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.7"/>
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.7" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.7" />
+    <PackageReference Include="Claunia.Encoding" Version="1.9.1" />
+    <PackageReference Include="MessageBox.Avalonia" Version="1.5.1" />
+    <PackageReference Include="OxyPlot.Avalonia-alpha-2020-04-15" Version="1.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21377.19" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Avalonia" Version="0.10.7" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.7" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.7" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj"/>
-    <ProjectReference Include="..\Aaru.Devices\Aaru.Devices.csproj"/>
-    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj"/>
+    <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj" />
+    <ProjectReference Include="..\Aaru.Devices\Aaru.Devices.csproj" />
+    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT1.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT1.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT1Turbo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT1Turbo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT2Turbo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT2Turbo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3Ex.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3Ex.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3Turbo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3Turbo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT4.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT4.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT5.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT5.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AITETurbo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AITETurbo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDRE.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDRE.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDREXL.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDREXL.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDRXL.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDRXL.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CD32.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CD32.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDDA.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDDA.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDEG.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDEG.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDG.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDI.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDIREADY.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDIREADY.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDI.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDMIDI.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDMIDI.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDPLUS.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDPLUS.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDROM2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDROM2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDRW.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDRW.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDTV.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDTV.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDV.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDV.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CompactCassette.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CompactCassette.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT160.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT160.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT320.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT320.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT72.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT72.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS1.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS1.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS3.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS3.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS4.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS4.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DigitalAudioTape.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DigitalAudioTape.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DittoMax.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DittoMax.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Ditto.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Ditto.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIII.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIII.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIIIxt.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIIIxt.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIV.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIV.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeS4.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeS4.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDDownload.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDDownload.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPRDL.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPRDL.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPRW.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPRW.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDRAM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDRAM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDRW.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDRW.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard34.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard34.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard54.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard54.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GDR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GDR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GOD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GOD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRAM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRAM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRDL.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRDL.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRWDL.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRWDL.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRW.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRW.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\JaguarCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\JaguarCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Jaz2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Jaz2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Jaz.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Jaz.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LDROM2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LDROM2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO3.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO3.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO3WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO3WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO4.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO4.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO4WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO4WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO5.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO5.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO5WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO5WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO6.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO6.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO6WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO6WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO7.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO7.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO7WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO7WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LVROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LVROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MDData2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MDData2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MDData.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MDData.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MEGACD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MEGACD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MegaLD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MegaLD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickDuo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickDuo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickMicro.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickMicro.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStick.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickProDuo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickProDuo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickPro.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickPro.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStick.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\miniSD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\miniSD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\NeoGeoCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\NeoGeoCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Nintendo3DSGameCard.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Nintendo3DSGameCard.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Nintendo_64_Logo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Nuon.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Nuon.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PCFX.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PCFX.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PD650.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PD650.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PD650_WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PD650_WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Pippin.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Pippin.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Playdia.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Playdia.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationVitaGameCard.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationVitaGameCard.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PocketZip.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PocketZip.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS1CD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS1CD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS2CD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS2CD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS2DVD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS2DVD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS3BD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS3BD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS3DVD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS3DVD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS4BD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS4BD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SACD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SACD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SAIT1.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SAIT1.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SAIT2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SAIT2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SATURNCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SATURNCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SecureDigital.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SecureDigital.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SmartMedia.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SmartMedia.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SuperCDROM2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SuperCDROM2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SVCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SVCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SwitchGameCard.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SwitchGameCard.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ThreeDO.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ThreeDO.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\VCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\VCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\WOD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\WOD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\WUOD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\WUOD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD3.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD3.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD4.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD4.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ZIP100.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ZIP100.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ZIP250.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ZIP250.svg"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\computer.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-harddisk.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-optical.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-removable-media-usb.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-removable-media.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\inode-directory.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-eject.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-flash-sd-mmc.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-tape.png"/>
+    <EmbeddedResource Include="Assets\Logos\Media\AIT1.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT1.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT1Turbo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT1Turbo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT2Turbo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT2Turbo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3Ex.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3Ex.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3Turbo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3Turbo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT4.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT4.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT5.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT5.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AITETurbo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AITETurbo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDRE.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDRE.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDREXL.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDREXL.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDRXL.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDRXL.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CD32.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CD32.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDDA.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDDA.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDEG.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDEG.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDG.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDI.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDIREADY.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDIREADY.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDI.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDMIDI.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDMIDI.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDPLUS.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDPLUS.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDROM2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDROM2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDRW.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDRW.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDTV.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDTV.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDV.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDV.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CompactCassette.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CompactCassette.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT160.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT160.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT320.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT320.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT72.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT72.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS1.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS1.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS3.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS3.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS4.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS4.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DigitalAudioTape.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DigitalAudioTape.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DittoMax.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DittoMax.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Ditto.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Ditto.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIII.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIII.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIIIxt.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIIIxt.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIV.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIV.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeS4.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeS4.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDDownload.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDDownload.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPRDL.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPRDL.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPRW.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPRW.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDRAM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDRAM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDRW.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDRW.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard34.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard34.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard54.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard54.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\GDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\GDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\GDR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\GDR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\GOD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\GOD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRAM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRAM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRDL.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRDL.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRWDL.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRWDL.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRW.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRW.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\JaguarCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\JaguarCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Jaz2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Jaz2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Jaz.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Jaz.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LDROM2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LDROM2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO3.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO3.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO3WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO3WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO4.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO4.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO4WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO4WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO5.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO5.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO5WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO5WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO6.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO6.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO6WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO6WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO7.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO7.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO7WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO7WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LVROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LVROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MDData2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MDData2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MDData.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MDData.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MEGACD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MEGACD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MegaLD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MegaLD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickDuo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickDuo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickMicro.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickMicro.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStick.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickProDuo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickProDuo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickPro.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickPro.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStick.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\miniSD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\miniSD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\NeoGeoCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\NeoGeoCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Nintendo3DSGameCard.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Nintendo3DSGameCard.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Nintendo_64_Logo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Nuon.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Nuon.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PCFX.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PCFX.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PD650.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PD650.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PD650_WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PD650_WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Pippin.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Pippin.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Playdia.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Playdia.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationVitaGameCard.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationVitaGameCard.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PocketZip.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PocketZip.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS1CD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS1CD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS2CD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS2CD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS2DVD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS2DVD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS3BD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS3BD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS3DVD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS3DVD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS4BD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS4BD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SACD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SACD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SAIT1.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SAIT1.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SAIT2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SAIT2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SATURNCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SATURNCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SecureDigital.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SecureDigital.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SmartMedia.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SmartMedia.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SuperCDROM2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SuperCDROM2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SVCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SVCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SwitchGameCard.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SwitchGameCard.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\ThreeDO.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\ThreeDO.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\VCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\VCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\WOD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\WOD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\WUOD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\WUOD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD3.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD3.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD4.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD4.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\ZIP100.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\ZIP100.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\ZIP250.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\ZIP250.svg" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\computer.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-harddisk.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-optical.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-removable-media-usb.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-removable-media.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\inode-directory.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-eject.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-flash-sd-mmc.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-tape.png" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Assets"/>
-    <Folder Include="Models\"/>
+    <Folder Include="Assets" />
+    <Folder Include="Models\" />
     <Compile Update="**\*.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
     <AvaloniaResource Include="**\*.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
-    <AvaloniaResource Include="Assets\**"/>
+    <AvaloniaResource Include="Assets\**" />
     <AvaloniaResource Update="Views\SplashWindow.xaml">
       <SubType>Designer</SubType>
     </AvaloniaResource>
@@ -418,7 +421,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <UpToDateCheckInput Remove="Views\MainWindow.xaml"/>
+    <UpToDateCheckInput Remove="Views\MainWindow.xaml" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\LICENSE">
diff --git a/Aaru.Helpers b/Aaru.Helpers
index c01b2bd3e..15ae1080e 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit c01b2bd3e697c186fec0920a5bd163b29b56f955
+Subproject commit 15ae1080e0d5af2f745e3409adddf4a3c11b11ec
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index 1c36124cd..3fb66809c 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -56,476 +56,476 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System"/>
-    <Reference Include="System.Core"/>
-    <Reference Include="System.Xml"/>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Claunia.Encoding" Version="1.9.1"/>
-    <PackageReference Include="Claunia.RsrcFork" Version="1.1.0"/>
-    <PackageReference Include="DotNetZip" Version="1.13.8"/>
-    <PackageReference Include="plist-cil" Version="2.2.0"/>
-    <PackageReference Include="SharpCompress" Version="0.25.1"/>
-    <PackageReference Include="System.ValueTuple" Version="4.5.0"/>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all"/>
+    <PackageReference Include="Claunia.Encoding" Version="1.9.1" />
+    <PackageReference Include="Claunia.RsrcFork" Version="1.1.0" />
+    <PackageReference Include="DotNetZip" Version="1.15.0" />
+    <PackageReference Include="plist-cil" Version="2.2.0" />
+    <PackageReference Include="SharpCompress" Version="0.29.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AaruFormat\NonClosableStream.cs"/>
-    <Compile Include="Alcohol120\Alcohol120.cs"/>
-    <Compile Include="Alcohol120\Constants.cs"/>
-    <Compile Include="Alcohol120\Enums.cs"/>
-    <Compile Include="Alcohol120\Helpers.cs"/>
-    <Compile Include="Alcohol120\Identify.cs"/>
-    <Compile Include="Alcohol120\Properties.cs"/>
-    <Compile Include="Alcohol120\Read.cs"/>
-    <Compile Include="Alcohol120\Structs.cs"/>
-    <Compile Include="Alcohol120\Verify.cs"/>
-    <Compile Include="Alcohol120\Write.cs"/>
-    <Compile Include="Anex86\Anex86.cs"/>
-    <Compile Include="Anex86\Identify.cs"/>
-    <Compile Include="Anex86\Properties.cs"/>
-    <Compile Include="Anex86\Read.cs"/>
-    <Compile Include="Anex86\Structs.cs"/>
-    <Compile Include="Anex86\Unsupported.cs"/>
-    <Compile Include="Anex86\Write.cs"/>
-    <Compile Include="Apple2MG\Constants.cs"/>
-    <Compile Include="Apple2MG\Enums.cs"/>
-    <Compile Include="Apple2MG\Helpers.cs"/>
-    <Compile Include="Apple2MG\Identify.cs"/>
-    <Compile Include="Apple2MG\Properties.cs"/>
-    <Compile Include="Apple2MG\Read.cs"/>
-    <Compile Include="Apple2MG\Structs.cs"/>
-    <Compile Include="Apple2MG\Unsupported.cs"/>
-    <Compile Include="Apple2MG\Write.cs"/>
-    <Compile Include="AppleDOS\Constants.cs"/>
-    <Compile Include="AppleDOS\Identify.cs"/>
-    <Compile Include="AppleDOS\Properties.cs"/>
-    <Compile Include="AppleDOS\Read.cs"/>
-    <Compile Include="AppleDOS\Unsupported.cs"/>
-    <Compile Include="AppleDOS\Write.cs"/>
-    <Compile Include="AppleNIB\Constants.cs"/>
-    <Compile Include="AppleNIB\Identify.cs"/>
-    <Compile Include="AppleNIB\Properties.cs"/>
-    <Compile Include="AppleNIB\Read.cs"/>
-    <Compile Include="AppleNIB\Unsupported.cs"/>
-    <Compile Include="Apridisk\Compression.cs"/>
-    <Compile Include="Apridisk\Constants.cs"/>
-    <Compile Include="Apridisk\Enums.cs"/>
-    <Compile Include="Apridisk\Helpers.cs"/>
-    <Compile Include="Apridisk\Identify.cs"/>
-    <Compile Include="Apridisk\Properties.cs"/>
-    <Compile Include="Apridisk\Read.cs"/>
-    <Compile Include="Apridisk\Structs.cs"/>
-    <Compile Include="Apridisk\Unsupported.cs"/>
-    <Compile Include="Apridisk\Write.cs"/>
-    <Compile Include="BlindWrite4\Constants.cs"/>
-    <Compile Include="BlindWrite4\Enums.cs"/>
-    <Compile Include="BlindWrite4\Identify.cs"/>
-    <Compile Include="BlindWrite4\Properties.cs"/>
-    <Compile Include="BlindWrite4\Read.cs"/>
-    <Compile Include="BlindWrite4\Structs.cs"/>
-    <Compile Include="BlindWrite4\Verify.cs"/>
-    <Compile Include="BlindWrite5\Constants.cs"/>
-    <Compile Include="BlindWrite5\Enums.cs"/>
-    <Compile Include="BlindWrite5\Helpers.cs"/>
-    <Compile Include="BlindWrite5\Identify.cs"/>
-    <Compile Include="BlindWrite5\Properties.cs"/>
-    <Compile Include="BlindWrite5\Read.cs"/>
-    <Compile Include="BlindWrite5\Structs.cs"/>
-    <Compile Include="BlindWrite5\Verify.cs"/>
-    <Compile Include="BLU\Constants.cs"/>
-    <Compile Include="BLU\Identify.cs"/>
-    <Compile Include="BLU\Properties.cs"/>
-    <Compile Include="BLU\Read.cs"/>
-    <Compile Include="BLU\Unsupported.cs"/>
-    <Compile Include="BLU\Verify.cs"/>
-    <Compile Include="BLU\Write.cs"/>
-    <Compile Include="CDRDAO\Constants.cs"/>
-    <Compile Include="CDRDAO\Helpers.cs"/>
-    <Compile Include="CDRDAO\Identify.cs"/>
-    <Compile Include="CDRDAO\Properties.cs"/>
-    <Compile Include="CDRDAO\Read.cs"/>
-    <Compile Include="CDRDAO\Structs.cs"/>
-    <Compile Include="CDRDAO\Verify.cs"/>
-    <Compile Include="CDRDAO\Write.cs"/>
-    <Compile Include="CDRWin\Constants.cs"/>
-    <Compile Include="CDRWin\Helpers.cs"/>
-    <Compile Include="CDRWin\Identify.cs"/>
-    <Compile Include="CDRWin\Properties.cs"/>
-    <Compile Include="CDRWin\Read.cs"/>
-    <Compile Include="CDRWin\Structs.cs"/>
-    <Compile Include="CDRWin\Verify.cs"/>
-    <Compile Include="CDRWin\Write.cs"/>
-    <Compile Include="CHD\Constants.cs"/>
-    <Compile Include="CHD\Enums.cs"/>
-    <Compile Include="CHD\Helpers.cs"/>
-    <Compile Include="CHD\Identify.cs"/>
-    <Compile Include="CHD\Properties.cs"/>
-    <Compile Include="CHD\Read.cs"/>
-    <Compile Include="CHD\Structs.cs"/>
-    <Compile Include="CHD\Verify.cs"/>
-    <Compile Include="CisCopy\Enums.cs"/>
-    <Compile Include="CisCopy\Identify.cs"/>
-    <Compile Include="CisCopy\Properties.cs"/>
-    <Compile Include="CisCopy\Read.cs"/>
-    <Compile Include="CisCopy\Unsupported.cs"/>
-    <Compile Include="CisCopy\Write.cs"/>
-    <Compile Include="CloneCD\Constants.cs"/>
-    <Compile Include="CloneCD\Helpers.cs"/>
-    <Compile Include="CloneCD\Identify.cs"/>
-    <Compile Include="CloneCD\Properties.cs"/>
-    <Compile Include="CloneCD\Read.cs"/>
-    <Compile Include="CloneCD\Verify.cs"/>
-    <Compile Include="CloneCD\Write.cs"/>
-    <Compile Include="CopyQM\Constants.cs"/>
-    <Compile Include="CopyQM\Identify.cs"/>
-    <Compile Include="CopyQM\Properties.cs"/>
-    <Compile Include="CopyQM\Read.cs"/>
-    <Compile Include="CopyQM\Structs.cs"/>
-    <Compile Include="CopyQM\Unsupported.cs"/>
-    <Compile Include="CopyTape\Constants.cs"/>
-    <Compile Include="CopyTape\CopyTape.cs"/>
-    <Compile Include="CopyTape\Identify.cs"/>
-    <Compile Include="CopyTape\Properties.cs"/>
-    <Compile Include="CopyTape\Read.cs"/>
-    <Compile Include="CopyTape\Unsupported.cs"/>
-    <Compile Include="CopyTape\Write.cs"/>
-    <Compile Include="CPCDSK\Constants.cs"/>
-    <Compile Include="CPCDSK\Helpers.cs"/>
-    <Compile Include="CPCDSK\Identify.cs"/>
-    <Compile Include="CPCDSK\Properties.cs"/>
-    <Compile Include="CPCDSK\Read.cs"/>
-    <Compile Include="CPCDSK\Structs.cs"/>
-    <Compile Include="CPCDSK\Unsupported.cs"/>
-    <Compile Include="D88\Constants.cs"/>
-    <Compile Include="D88\Enums.cs"/>
-    <Compile Include="D88\Identify.cs"/>
-    <Compile Include="D88\Properties.cs"/>
-    <Compile Include="D88\Read.cs"/>
-    <Compile Include="D88\Structs.cs"/>
-    <Compile Include="D88\Unsupported.cs"/>
-    <Compile Include="DART\Constants.cs"/>
-    <Compile Include="DART\Identify.cs"/>
-    <Compile Include="DART\Properties.cs"/>
-    <Compile Include="DART\Read.cs"/>
-    <Compile Include="DART\Structs.cs"/>
-    <Compile Include="DART\Unsupported.cs"/>
-    <Compile Include="DIM\Constants.cs"/>
-    <Compile Include="DIM\Enums.cs"/>
-    <Compile Include="DIM\Identify.cs"/>
-    <Compile Include="DIM\Properties.cs"/>
-    <Compile Include="DIM\Read.cs"/>
-    <Compile Include="DIM\Unsupported.cs"/>
-    <Compile Include="DiscFerret\Constants.cs"/>
-    <Compile Include="DiscFerret\DiscFerret.cs"/>
-    <Compile Include="DiscFerret\Identify.cs"/>
-    <Compile Include="DiscFerret\Properties.cs"/>
-    <Compile Include="DiscFerret\Read.cs"/>
-    <Compile Include="DiscFerret\Structs.cs"/>
-    <Compile Include="DiscFerret\Verify.cs"/>
-    <Compile Include="AaruFormat\CdEcc.cs"/>
-    <Compile Include="AaruFormat\ClauniaSubchannelTransform.cs"/>
-    <Compile Include="AaruFormat\Constants.cs"/>
-    <Compile Include="AaruFormat\AaruFormat.cs"/>
-    <Compile Include="AaruFormat\Enums.cs"/>
-    <Compile Include="AaruFormat\Helpers.cs"/>
-    <Compile Include="AaruFormat\Identify.cs"/>
-    <Compile Include="AaruFormat\Properties.cs"/>
-    <Compile Include="AaruFormat\Read.cs"/>
-    <Compile Include="AaruFormat\Structs.cs"/>
-    <Compile Include="AaruFormat\Tape.cs"/>
-    <Compile Include="AaruFormat\Verify.cs"/>
-    <Compile Include="AaruFormat\Write.cs"/>
-    <Compile Include="DiscJuggler\Helpers.cs"/>
-    <Compile Include="DiscJuggler\Identify.cs"/>
-    <Compile Include="DiscJuggler\Properties.cs"/>
-    <Compile Include="DiscJuggler\Read.cs"/>
-    <Compile Include="DiscJuggler\Verify.cs"/>
-    <Compile Include="DiskCopy42\Constants.cs"/>
-    <Compile Include="DiskCopy42\Helpers.cs"/>
-    <Compile Include="DiskCopy42\Identify.cs"/>
-    <Compile Include="DiskCopy42\Properties.cs"/>
-    <Compile Include="DiskCopy42\Read.cs"/>
-    <Compile Include="DiskCopy42\Structs.cs"/>
-    <Compile Include="DiskCopy42\Unsupported.cs"/>
-    <Compile Include="DiskCopy42\Verify.cs"/>
-    <Compile Include="DiskCopy42\Write.cs"/>
-    <Compile Include="DiskDupe\Constants.cs"/>
-    <Compile Include="DiskDupe\DiskDupe.cs"/>
-    <Compile Include="DiskDupe\Helpers.cs"/>
-    <Compile Include="DiskDupe\Identify.cs"/>
-    <Compile Include="DiskDupe\Properties.cs"/>
-    <Compile Include="DiskDupe\Read.cs"/>
-    <Compile Include="DiskDupe\Structs.cs"/>
-    <Compile Include="DiskDupe\Unsupported.cs"/>
-    <Compile Include="DriDiskCopy\Constants.cs"/>
-    <Compile Include="DriDiskCopy\Enums.cs"/>
-    <Compile Include="DriDiskCopy\Identify.cs"/>
-    <Compile Include="DriDiskCopy\Properties.cs"/>
-    <Compile Include="DriDiskCopy\Read.cs"/>
-    <Compile Include="DriDiskCopy\Structs.cs"/>
-    <Compile Include="DriDiskCopy\Unsupported.cs"/>
-    <Compile Include="DriDiskCopy\Write.cs"/>
-    <Compile Include="GDI\Constants.cs"/>
-    <Compile Include="GDI\Identify.cs"/>
-    <Compile Include="GDI\Properties.cs"/>
-    <Compile Include="GDI\Read.cs"/>
-    <Compile Include="GDI\Structs.cs"/>
-    <Compile Include="GDI\Unsupported.cs"/>
-    <Compile Include="GDI\Verify.cs"/>
-    <Compile Include="HDCopy\HDCopy.cs"/>
-    <Compile Include="HDCopy\Helpers.cs"/>
-    <Compile Include="HDCopy\Identify.cs"/>
-    <Compile Include="HDCopy\Properties.cs"/>
-    <Compile Include="HDCopy\Read.cs"/>
-    <Compile Include="HDCopy\Structs.cs"/>
-    <Compile Include="HDCopy\Unsupported.cs"/>
-    <Compile Include="IMD\Constants.cs"/>
-    <Compile Include="IMD\Enums.cs"/>
-    <Compile Include="IMD\Identify.cs"/>
-    <Compile Include="IMD\Properties.cs"/>
-    <Compile Include="IMD\Read.cs"/>
-    <Compile Include="IMD\Unsupported.cs"/>
-    <Compile Include="KryoFlux\Constants.cs"/>
-    <Compile Include="KryoFlux\Enums.cs"/>
-    <Compile Include="KryoFlux\Identify.cs"/>
-    <Compile Include="KryoFlux\KryoFlux.cs"/>
-    <Compile Include="Apple2MG\Apple2MG.cs"/>
-    <Compile Include="CDRWin\CDRWin.cs"/>
-    <Compile Include="DiskCopy42\DiskCopy42.cs"/>
-    <Compile Include="KryoFlux\Properties.cs"/>
-    <Compile Include="KryoFlux\Read.cs"/>
-    <Compile Include="KryoFlux\Structs.cs"/>
-    <Compile Include="KryoFlux\Verify.cs"/>
-    <Compile Include="MaxiDisk\Enums.cs"/>
-    <Compile Include="MaxiDisk\Identify.cs"/>
-    <Compile Include="MaxiDisk\Properties.cs"/>
-    <Compile Include="MaxiDisk\Read.cs"/>
-    <Compile Include="MaxiDisk\Structs.cs"/>
-    <Compile Include="MaxiDisk\Unsupported.cs"/>
-    <Compile Include="MaxiDisk\Write.cs"/>
-    <Compile Include="NDIF\Constants.cs"/>
-    <Compile Include="NDIF\Identify.cs"/>
-    <Compile Include="NDIF\Properties.cs"/>
-    <Compile Include="NDIF\Read.cs"/>
-    <Compile Include="NDIF\Structs.cs"/>
-    <Compile Include="NDIF\Unsupported.cs"/>
-    <Compile Include="Nero\Constants.cs"/>
-    <Compile Include="Nero\Enums.cs"/>
-    <Compile Include="Nero\Helpers.cs"/>
-    <Compile Include="Nero\Identify.cs"/>
-    <Compile Include="Nero\Nero.cs"/>
-    <Compile Include="Nero\Properties.cs"/>
-    <Compile Include="Nero\Read.cs"/>
-    <Compile Include="Nero\Structs.cs"/>
-    <Compile Include="Nero\Verify.cs"/>
-    <Compile Include="NHDr0\Constants.cs"/>
-    <Compile Include="NHDr0\Identify.cs"/>
-    <Compile Include="NHDr0\Properties.cs"/>
-    <Compile Include="NHDr0\Read.cs"/>
-    <Compile Include="NHDr0\Structs.cs"/>
-    <Compile Include="NHDr0\Unsupported.cs"/>
-    <Compile Include="NHDr0\Write.cs"/>
-    <Compile Include="Parallels\Constants.cs"/>
-    <Compile Include="Parallels\Identify.cs"/>
-    <Compile Include="Parallels\Properties.cs"/>
-    <Compile Include="Parallels\Read.cs"/>
-    <Compile Include="Parallels\Structs.cs"/>
-    <Compile Include="Parallels\Unsupported.cs"/>
-    <Compile Include="Parallels\Write.cs"/>
-    <Compile Include="PartClone\Constants.cs"/>
-    <Compile Include="PartClone\Helpers.cs"/>
-    <Compile Include="PartClone\Identify.cs"/>
-    <Compile Include="PartClone\Properties.cs"/>
-    <Compile Include="PartClone\Read.cs"/>
-    <Compile Include="PartClone\Structs.cs"/>
-    <Compile Include="PartClone\Unsupported.cs"/>
-    <Compile Include="PartClone\Verify.cs"/>
-    <Compile Include="Partimage\Constants.cs"/>
-    <Compile Include="Partimage\Enums.cs"/>
-    <Compile Include="Partimage\Helpers.cs"/>
-    <Compile Include="Partimage\Identify.cs"/>
-    <Compile Include="Partimage\Properties.cs"/>
-    <Compile Include="Partimage\Read.cs"/>
-    <Compile Include="Partimage\Structs.cs"/>
-    <Compile Include="Partimage\Unsupported.cs"/>
-    <Compile Include="Partimage\Verify.cs"/>
-    <Compile Include="QCOW2\Constants.cs"/>
-    <Compile Include="QCOW2\Identify.cs"/>
-    <Compile Include="QCOW2\Properties.cs"/>
-    <Compile Include="QCOW2\Read.cs"/>
-    <Compile Include="QCOW2\Structs.cs"/>
-    <Compile Include="QCOW2\Unsupported.cs"/>
-    <Compile Include="QCOW2\Write.cs"/>
-    <Compile Include="QCOW\Constants.cs"/>
-    <Compile Include="QCOW\Identify.cs"/>
-    <Compile Include="QCOW\Properties.cs"/>
-    <Compile Include="QCOW\Read.cs"/>
-    <Compile Include="QCOW\Structs.cs"/>
-    <Compile Include="QCOW\Unsupported.cs"/>
-    <Compile Include="QCOW\Write.cs"/>
-    <Compile Include="QED\Constants.cs"/>
-    <Compile Include="QED\Helpers.cs"/>
-    <Compile Include="QED\Identify.cs"/>
-    <Compile Include="QED\Properties.cs"/>
-    <Compile Include="QED\Read.cs"/>
-    <Compile Include="QED\Structs.cs"/>
-    <Compile Include="QED\Unsupported.cs"/>
-    <Compile Include="QED\Write.cs"/>
-    <Compile Include="RayDIM\Constants.cs"/>
-    <Compile Include="RayDIM\Enums.cs"/>
-    <Compile Include="RayDIM\Identify.cs"/>
-    <Compile Include="RayDIM\Properties.cs"/>
-    <Compile Include="RayDIM\Read.cs"/>
-    <Compile Include="RayDIM\Structs.cs"/>
-    <Compile Include="RayDIM\Unsupported.cs"/>
-    <Compile Include="RayDIM\Write.cs"/>
-    <Compile Include="Register.cs"/>
-    <Compile Include="RsIde\Constants.cs"/>
-    <Compile Include="RsIde\Enums.cs"/>
-    <Compile Include="RsIde\Helpers.cs"/>
-    <Compile Include="RsIde\Identify.cs"/>
-    <Compile Include="RsIde\Properties.cs"/>
-    <Compile Include="RsIde\Read.cs"/>
-    <Compile Include="RsIde\Structs.cs"/>
-    <Compile Include="RsIde\Unsupported.cs"/>
-    <Compile Include="RsIde\Write.cs"/>
-    <Compile Include="SaveDskF\Constants.cs"/>
-    <Compile Include="SaveDskF\Identify.cs"/>
-    <Compile Include="SaveDskF\Properties.cs"/>
-    <Compile Include="SaveDskF\Read.cs"/>
-    <Compile Include="SaveDskF\Structs.cs"/>
-    <Compile Include="SaveDskF\Unsupported.cs"/>
-    <Compile Include="SaveDskF\Verify.cs"/>
-    <Compile Include="SaveDskF\Write.cs"/>
-    <Compile Include="SuperCardPro\Constants.cs"/>
-    <Compile Include="SuperCardPro\Enums.cs"/>
-    <Compile Include="SuperCardPro\Helpers.cs"/>
-    <Compile Include="SuperCardPro\Identify.cs"/>
-    <Compile Include="SuperCardPro\Properties.cs"/>
-    <Compile Include="SuperCardPro\Read.cs"/>
-    <Compile Include="SuperCardPro\Structs.cs"/>
-    <Compile Include="SuperCardPro\SuperCardPro.cs"/>
-    <Compile Include="SuperCardPro\Verify.cs"/>
-    <Compile Include="T98\Identify.cs"/>
-    <Compile Include="T98\Properties.cs"/>
-    <Compile Include="T98\Read.cs"/>
-    <Compile Include="T98\Unsupported.cs"/>
-    <Compile Include="T98\Write.cs"/>
-    <Compile Include="TeleDisk\Constants.cs"/>
-    <Compile Include="TeleDisk\Helpers.cs"/>
-    <Compile Include="TeleDisk\Identify.cs"/>
-    <Compile Include="TeleDisk\Properties.cs"/>
-    <Compile Include="TeleDisk\Read.cs"/>
-    <Compile Include="TeleDisk\Structs.cs"/>
-    <Compile Include="TeleDisk\TeleDisk.cs"/>
-    <Compile Include="TeleDisk\Unsupported.cs"/>
-    <Compile Include="TeleDisk\Verify.cs"/>
-    <Compile Include="UDIF\Constants.cs"/>
-    <Compile Include="UDIF\Identify.cs"/>
-    <Compile Include="UDIF\Properties.cs"/>
-    <Compile Include="UDIF\Read.cs"/>
-    <Compile Include="UDIF\Structs.cs"/>
-    <Compile Include="UDIF\Unsupported.cs"/>
-    <Compile Include="UDIF\Write.cs"/>
-    <Compile Include="UkvFdi\Constants.cs"/>
-    <Compile Include="UkvFdi\Enums.cs"/>
-    <Compile Include="UkvFdi\Helpers.cs"/>
-    <Compile Include="UkvFdi\Identify.cs"/>
-    <Compile Include="UkvFdi\Properties.cs"/>
-    <Compile Include="UkvFdi\Read.cs"/>
-    <Compile Include="UkvFdi\Structs.cs"/>
-    <Compile Include="UkvFdi\Unsupported.cs"/>
-    <Compile Include="VDI\Constants.cs"/>
-    <Compile Include="VDI\Enums.cs"/>
-    <Compile Include="VDI\Identify.cs"/>
-    <Compile Include="VDI\Properties.cs"/>
-    <Compile Include="VDI\Read.cs"/>
-    <Compile Include="VDI\Structs.cs"/>
-    <Compile Include="VDI\Unsupported.cs"/>
-    <Compile Include="VDI\Write.cs"/>
-    <Compile Include="VHDX\Constants.cs"/>
-    <Compile Include="VHDX\Helpers.cs"/>
-    <Compile Include="VHDX\Identify.cs"/>
-    <Compile Include="VHDX\Properties.cs"/>
-    <Compile Include="VHDX\Read.cs"/>
-    <Compile Include="VHDX\Structs.cs"/>
-    <Compile Include="VHDX\Unsupported.cs"/>
-    <Compile Include="VHD\Constants.cs"/>
-    <Compile Include="VHD\Helpers.cs"/>
-    <Compile Include="VHD\Identify.cs"/>
-    <Compile Include="VHD\Properties.cs"/>
-    <Compile Include="VHD\Read.cs"/>
-    <Compile Include="VHD\Structs.cs"/>
-    <Compile Include="VHD\Unsupported.cs"/>
-    <Compile Include="VHD\VHD.cs"/>
-    <Compile Include="VHD\Write.cs"/>
-    <Compile Include="Virtual98\Constants.cs"/>
-    <Compile Include="Virtual98\Identify.cs"/>
-    <Compile Include="Virtual98\Properties.cs"/>
-    <Compile Include="Virtual98\Read.cs"/>
-    <Compile Include="Virtual98\Structs.cs"/>
-    <Compile Include="Virtual98\Unsupported.cs"/>
-    <Compile Include="Virtual98\Write.cs"/>
-    <Compile Include="VMware\Constants.cs"/>
-    <Compile Include="VMware\Identify.cs"/>
-    <Compile Include="VMware\Properties.cs"/>
-    <Compile Include="VMware\Read.cs"/>
-    <Compile Include="VMware\Structs.cs"/>
-    <Compile Include="VMware\Unsupported.cs"/>
-    <Compile Include="VMware\Write.cs"/>
-    <Compile Include="WCDiskImage\Identify.cs"/>
-    <Compile Include="WCDiskImage\Properties.cs"/>
-    <Compile Include="WCDiskImage\Read.cs"/>
-    <Compile Include="WCDiskImage\Structs.cs"/>
-    <Compile Include="WCDiskImage\Unsupported.cs"/>
-    <Compile Include="WCDiskImage\WCDiskImage.cs"/>
-    <Compile Include="ZZZRawImage\Constants.cs"/>
-    <Compile Include="ZZZRawImage\Helpers.cs"/>
-    <Compile Include="ZZZRawImage\Identify.cs"/>
-    <Compile Include="ZZZRawImage\Properties.cs"/>
-    <Compile Include="ZZZRawImage\Read.cs"/>
-    <Compile Include="ZZZRawImage\Verify.cs"/>
-    <Compile Include="ZZZRawImage\Write.cs"/>
-    <Compile Include="ZZZRawImage\ZZZRawImage.cs"/>
-    <Compile Include="CDRDAO\CDRDAO.cs"/>
-    <Compile Include="GDI\GDI.cs"/>
-    <Compile Include="BLU\BLU.cs"/>
-    <Compile Include="CopyQM\CopyQM.cs"/>
-    <Compile Include="BlindWrite4\BlindWrite4.cs"/>
-    <Compile Include="BlindWrite5\BlindWrite5.cs"/>
-    <Compile Include="DIM\DIM.cs"/>
-    <Compile Include="CPCDSK\CPCDSK.cs"/>
-    <Compile Include="QCOW\QCOW.cs"/>
-    <Compile Include="QED\QED.cs"/>
-    <Compile Include="QCOW2\QCOW2.cs"/>
-    <Compile Include="Parallels\Parallels.cs"/>
-    <Compile Include="VDI\VDI.cs"/>
-    <Compile Include="VHDX\VHDX.cs"/>
-    <Compile Include="VMware\VMware.cs"/>
-    <Compile Include="UDIF\UDIF.cs"/>
-    <Compile Include="NDIF\NDIF.cs"/>
-    <Compile Include="DART\DART.cs"/>
-    <Compile Include="CHD\CHD.cs"/>
-    <Compile Include="AppleNIB\AppleNIB.cs"/>
-    <Compile Include="CloneCD\CloneCD.cs"/>
-    <Compile Include="DiscJuggler\DiscJuggler.cs"/>
-    <Compile Include="SaveDskF\SaveDskF.cs"/>
-    <Compile Include="AppleDOS\AppleDOS.cs"/>
-    <Compile Include="D88\D88.cs"/>
-    <Compile Include="T98\T98.cs"/>
-    <Compile Include="NHDr0\NHDr0.cs"/>
-    <Compile Include="Virtual98\Virtual98.cs"/>
-    <Compile Include="IMD\IMD.cs"/>
-    <Compile Include="CisCopy\CisCopy.cs"/>
-    <Compile Include="DriDiskCopy\DriDiskCopy.cs"/>
-    <Compile Include="RsIde\RsIde.cs"/>
-    <Compile Include="UkvFdi\UkvFdi.cs"/>
-    <Compile Include="PartClone\PartClone.cs"/>
-    <Compile Include="Partimage\Partimage.cs"/>
-    <Compile Include="Apridisk\Apridisk.cs"/>
-    <Compile Include="MaxiDisk\MaxiDisk.cs"/>
-    <Compile Include="RayDIM\RayDIM.cs"/>
+    <Compile Include="AaruFormat\NonClosableStream.cs" />
+    <Compile Include="Alcohol120\Alcohol120.cs" />
+    <Compile Include="Alcohol120\Constants.cs" />
+    <Compile Include="Alcohol120\Enums.cs" />
+    <Compile Include="Alcohol120\Helpers.cs" />
+    <Compile Include="Alcohol120\Identify.cs" />
+    <Compile Include="Alcohol120\Properties.cs" />
+    <Compile Include="Alcohol120\Read.cs" />
+    <Compile Include="Alcohol120\Structs.cs" />
+    <Compile Include="Alcohol120\Verify.cs" />
+    <Compile Include="Alcohol120\Write.cs" />
+    <Compile Include="Anex86\Anex86.cs" />
+    <Compile Include="Anex86\Identify.cs" />
+    <Compile Include="Anex86\Properties.cs" />
+    <Compile Include="Anex86\Read.cs" />
+    <Compile Include="Anex86\Structs.cs" />
+    <Compile Include="Anex86\Unsupported.cs" />
+    <Compile Include="Anex86\Write.cs" />
+    <Compile Include="Apple2MG\Constants.cs" />
+    <Compile Include="Apple2MG\Enums.cs" />
+    <Compile Include="Apple2MG\Helpers.cs" />
+    <Compile Include="Apple2MG\Identify.cs" />
+    <Compile Include="Apple2MG\Properties.cs" />
+    <Compile Include="Apple2MG\Read.cs" />
+    <Compile Include="Apple2MG\Structs.cs" />
+    <Compile Include="Apple2MG\Unsupported.cs" />
+    <Compile Include="Apple2MG\Write.cs" />
+    <Compile Include="AppleDOS\Constants.cs" />
+    <Compile Include="AppleDOS\Identify.cs" />
+    <Compile Include="AppleDOS\Properties.cs" />
+    <Compile Include="AppleDOS\Read.cs" />
+    <Compile Include="AppleDOS\Unsupported.cs" />
+    <Compile Include="AppleDOS\Write.cs" />
+    <Compile Include="AppleNIB\Constants.cs" />
+    <Compile Include="AppleNIB\Identify.cs" />
+    <Compile Include="AppleNIB\Properties.cs" />
+    <Compile Include="AppleNIB\Read.cs" />
+    <Compile Include="AppleNIB\Unsupported.cs" />
+    <Compile Include="Apridisk\Compression.cs" />
+    <Compile Include="Apridisk\Constants.cs" />
+    <Compile Include="Apridisk\Enums.cs" />
+    <Compile Include="Apridisk\Helpers.cs" />
+    <Compile Include="Apridisk\Identify.cs" />
+    <Compile Include="Apridisk\Properties.cs" />
+    <Compile Include="Apridisk\Read.cs" />
+    <Compile Include="Apridisk\Structs.cs" />
+    <Compile Include="Apridisk\Unsupported.cs" />
+    <Compile Include="Apridisk\Write.cs" />
+    <Compile Include="BlindWrite4\Constants.cs" />
+    <Compile Include="BlindWrite4\Enums.cs" />
+    <Compile Include="BlindWrite4\Identify.cs" />
+    <Compile Include="BlindWrite4\Properties.cs" />
+    <Compile Include="BlindWrite4\Read.cs" />
+    <Compile Include="BlindWrite4\Structs.cs" />
+    <Compile Include="BlindWrite4\Verify.cs" />
+    <Compile Include="BlindWrite5\Constants.cs" />
+    <Compile Include="BlindWrite5\Enums.cs" />
+    <Compile Include="BlindWrite5\Helpers.cs" />
+    <Compile Include="BlindWrite5\Identify.cs" />
+    <Compile Include="BlindWrite5\Properties.cs" />
+    <Compile Include="BlindWrite5\Read.cs" />
+    <Compile Include="BlindWrite5\Structs.cs" />
+    <Compile Include="BlindWrite5\Verify.cs" />
+    <Compile Include="BLU\Constants.cs" />
+    <Compile Include="BLU\Identify.cs" />
+    <Compile Include="BLU\Properties.cs" />
+    <Compile Include="BLU\Read.cs" />
+    <Compile Include="BLU\Unsupported.cs" />
+    <Compile Include="BLU\Verify.cs" />
+    <Compile Include="BLU\Write.cs" />
+    <Compile Include="CDRDAO\Constants.cs" />
+    <Compile Include="CDRDAO\Helpers.cs" />
+    <Compile Include="CDRDAO\Identify.cs" />
+    <Compile Include="CDRDAO\Properties.cs" />
+    <Compile Include="CDRDAO\Read.cs" />
+    <Compile Include="CDRDAO\Structs.cs" />
+    <Compile Include="CDRDAO\Verify.cs" />
+    <Compile Include="CDRDAO\Write.cs" />
+    <Compile Include="CDRWin\Constants.cs" />
+    <Compile Include="CDRWin\Helpers.cs" />
+    <Compile Include="CDRWin\Identify.cs" />
+    <Compile Include="CDRWin\Properties.cs" />
+    <Compile Include="CDRWin\Read.cs" />
+    <Compile Include="CDRWin\Structs.cs" />
+    <Compile Include="CDRWin\Verify.cs" />
+    <Compile Include="CDRWin\Write.cs" />
+    <Compile Include="CHD\Constants.cs" />
+    <Compile Include="CHD\Enums.cs" />
+    <Compile Include="CHD\Helpers.cs" />
+    <Compile Include="CHD\Identify.cs" />
+    <Compile Include="CHD\Properties.cs" />
+    <Compile Include="CHD\Read.cs" />
+    <Compile Include="CHD\Structs.cs" />
+    <Compile Include="CHD\Verify.cs" />
+    <Compile Include="CisCopy\Enums.cs" />
+    <Compile Include="CisCopy\Identify.cs" />
+    <Compile Include="CisCopy\Properties.cs" />
+    <Compile Include="CisCopy\Read.cs" />
+    <Compile Include="CisCopy\Unsupported.cs" />
+    <Compile Include="CisCopy\Write.cs" />
+    <Compile Include="CloneCD\Constants.cs" />
+    <Compile Include="CloneCD\Helpers.cs" />
+    <Compile Include="CloneCD\Identify.cs" />
+    <Compile Include="CloneCD\Properties.cs" />
+    <Compile Include="CloneCD\Read.cs" />
+    <Compile Include="CloneCD\Verify.cs" />
+    <Compile Include="CloneCD\Write.cs" />
+    <Compile Include="CopyQM\Constants.cs" />
+    <Compile Include="CopyQM\Identify.cs" />
+    <Compile Include="CopyQM\Properties.cs" />
+    <Compile Include="CopyQM\Read.cs" />
+    <Compile Include="CopyQM\Structs.cs" />
+    <Compile Include="CopyQM\Unsupported.cs" />
+    <Compile Include="CopyTape\Constants.cs" />
+    <Compile Include="CopyTape\CopyTape.cs" />
+    <Compile Include="CopyTape\Identify.cs" />
+    <Compile Include="CopyTape\Properties.cs" />
+    <Compile Include="CopyTape\Read.cs" />
+    <Compile Include="CopyTape\Unsupported.cs" />
+    <Compile Include="CopyTape\Write.cs" />
+    <Compile Include="CPCDSK\Constants.cs" />
+    <Compile Include="CPCDSK\Helpers.cs" />
+    <Compile Include="CPCDSK\Identify.cs" />
+    <Compile Include="CPCDSK\Properties.cs" />
+    <Compile Include="CPCDSK\Read.cs" />
+    <Compile Include="CPCDSK\Structs.cs" />
+    <Compile Include="CPCDSK\Unsupported.cs" />
+    <Compile Include="D88\Constants.cs" />
+    <Compile Include="D88\Enums.cs" />
+    <Compile Include="D88\Identify.cs" />
+    <Compile Include="D88\Properties.cs" />
+    <Compile Include="D88\Read.cs" />
+    <Compile Include="D88\Structs.cs" />
+    <Compile Include="D88\Unsupported.cs" />
+    <Compile Include="DART\Constants.cs" />
+    <Compile Include="DART\Identify.cs" />
+    <Compile Include="DART\Properties.cs" />
+    <Compile Include="DART\Read.cs" />
+    <Compile Include="DART\Structs.cs" />
+    <Compile Include="DART\Unsupported.cs" />
+    <Compile Include="DIM\Constants.cs" />
+    <Compile Include="DIM\Enums.cs" />
+    <Compile Include="DIM\Identify.cs" />
+    <Compile Include="DIM\Properties.cs" />
+    <Compile Include="DIM\Read.cs" />
+    <Compile Include="DIM\Unsupported.cs" />
+    <Compile Include="DiscFerret\Constants.cs" />
+    <Compile Include="DiscFerret\DiscFerret.cs" />
+    <Compile Include="DiscFerret\Identify.cs" />
+    <Compile Include="DiscFerret\Properties.cs" />
+    <Compile Include="DiscFerret\Read.cs" />
+    <Compile Include="DiscFerret\Structs.cs" />
+    <Compile Include="DiscFerret\Verify.cs" />
+    <Compile Include="AaruFormat\CdEcc.cs" />
+    <Compile Include="AaruFormat\ClauniaSubchannelTransform.cs" />
+    <Compile Include="AaruFormat\Constants.cs" />
+    <Compile Include="AaruFormat\AaruFormat.cs" />
+    <Compile Include="AaruFormat\Enums.cs" />
+    <Compile Include="AaruFormat\Helpers.cs" />
+    <Compile Include="AaruFormat\Identify.cs" />
+    <Compile Include="AaruFormat\Properties.cs" />
+    <Compile Include="AaruFormat\Read.cs" />
+    <Compile Include="AaruFormat\Structs.cs" />
+    <Compile Include="AaruFormat\Tape.cs" />
+    <Compile Include="AaruFormat\Verify.cs" />
+    <Compile Include="AaruFormat\Write.cs" />
+    <Compile Include="DiscJuggler\Helpers.cs" />
+    <Compile Include="DiscJuggler\Identify.cs" />
+    <Compile Include="DiscJuggler\Properties.cs" />
+    <Compile Include="DiscJuggler\Read.cs" />
+    <Compile Include="DiscJuggler\Verify.cs" />
+    <Compile Include="DiskCopy42\Constants.cs" />
+    <Compile Include="DiskCopy42\Helpers.cs" />
+    <Compile Include="DiskCopy42\Identify.cs" />
+    <Compile Include="DiskCopy42\Properties.cs" />
+    <Compile Include="DiskCopy42\Read.cs" />
+    <Compile Include="DiskCopy42\Structs.cs" />
+    <Compile Include="DiskCopy42\Unsupported.cs" />
+    <Compile Include="DiskCopy42\Verify.cs" />
+    <Compile Include="DiskCopy42\Write.cs" />
+    <Compile Include="DiskDupe\Constants.cs" />
+    <Compile Include="DiskDupe\DiskDupe.cs" />
+    <Compile Include="DiskDupe\Helpers.cs" />
+    <Compile Include="DiskDupe\Identify.cs" />
+    <Compile Include="DiskDupe\Properties.cs" />
+    <Compile Include="DiskDupe\Read.cs" />
+    <Compile Include="DiskDupe\Structs.cs" />
+    <Compile Include="DiskDupe\Unsupported.cs" />
+    <Compile Include="DriDiskCopy\Constants.cs" />
+    <Compile Include="DriDiskCopy\Enums.cs" />
+    <Compile Include="DriDiskCopy\Identify.cs" />
+    <Compile Include="DriDiskCopy\Properties.cs" />
+    <Compile Include="DriDiskCopy\Read.cs" />
+    <Compile Include="DriDiskCopy\Structs.cs" />
+    <Compile Include="DriDiskCopy\Unsupported.cs" />
+    <Compile Include="DriDiskCopy\Write.cs" />
+    <Compile Include="GDI\Constants.cs" />
+    <Compile Include="GDI\Identify.cs" />
+    <Compile Include="GDI\Properties.cs" />
+    <Compile Include="GDI\Read.cs" />
+    <Compile Include="GDI\Structs.cs" />
+    <Compile Include="GDI\Unsupported.cs" />
+    <Compile Include="GDI\Verify.cs" />
+    <Compile Include="HDCopy\HDCopy.cs" />
+    <Compile Include="HDCopy\Helpers.cs" />
+    <Compile Include="HDCopy\Identify.cs" />
+    <Compile Include="HDCopy\Properties.cs" />
+    <Compile Include="HDCopy\Read.cs" />
+    <Compile Include="HDCopy\Structs.cs" />
+    <Compile Include="HDCopy\Unsupported.cs" />
+    <Compile Include="IMD\Constants.cs" />
+    <Compile Include="IMD\Enums.cs" />
+    <Compile Include="IMD\Identify.cs" />
+    <Compile Include="IMD\Properties.cs" />
+    <Compile Include="IMD\Read.cs" />
+    <Compile Include="IMD\Unsupported.cs" />
+    <Compile Include="KryoFlux\Constants.cs" />
+    <Compile Include="KryoFlux\Enums.cs" />
+    <Compile Include="KryoFlux\Identify.cs" />
+    <Compile Include="KryoFlux\KryoFlux.cs" />
+    <Compile Include="Apple2MG\Apple2MG.cs" />
+    <Compile Include="CDRWin\CDRWin.cs" />
+    <Compile Include="DiskCopy42\DiskCopy42.cs" />
+    <Compile Include="KryoFlux\Properties.cs" />
+    <Compile Include="KryoFlux\Read.cs" />
+    <Compile Include="KryoFlux\Structs.cs" />
+    <Compile Include="KryoFlux\Verify.cs" />
+    <Compile Include="MaxiDisk\Enums.cs" />
+    <Compile Include="MaxiDisk\Identify.cs" />
+    <Compile Include="MaxiDisk\Properties.cs" />
+    <Compile Include="MaxiDisk\Read.cs" />
+    <Compile Include="MaxiDisk\Structs.cs" />
+    <Compile Include="MaxiDisk\Unsupported.cs" />
+    <Compile Include="MaxiDisk\Write.cs" />
+    <Compile Include="NDIF\Constants.cs" />
+    <Compile Include="NDIF\Identify.cs" />
+    <Compile Include="NDIF\Properties.cs" />
+    <Compile Include="NDIF\Read.cs" />
+    <Compile Include="NDIF\Structs.cs" />
+    <Compile Include="NDIF\Unsupported.cs" />
+    <Compile Include="Nero\Constants.cs" />
+    <Compile Include="Nero\Enums.cs" />
+    <Compile Include="Nero\Helpers.cs" />
+    <Compile Include="Nero\Identify.cs" />
+    <Compile Include="Nero\Nero.cs" />
+    <Compile Include="Nero\Properties.cs" />
+    <Compile Include="Nero\Read.cs" />
+    <Compile Include="Nero\Structs.cs" />
+    <Compile Include="Nero\Verify.cs" />
+    <Compile Include="NHDr0\Constants.cs" />
+    <Compile Include="NHDr0\Identify.cs" />
+    <Compile Include="NHDr0\Properties.cs" />
+    <Compile Include="NHDr0\Read.cs" />
+    <Compile Include="NHDr0\Structs.cs" />
+    <Compile Include="NHDr0\Unsupported.cs" />
+    <Compile Include="NHDr0\Write.cs" />
+    <Compile Include="Parallels\Constants.cs" />
+    <Compile Include="Parallels\Identify.cs" />
+    <Compile Include="Parallels\Properties.cs" />
+    <Compile Include="Parallels\Read.cs" />
+    <Compile Include="Parallels\Structs.cs" />
+    <Compile Include="Parallels\Unsupported.cs" />
+    <Compile Include="Parallels\Write.cs" />
+    <Compile Include="PartClone\Constants.cs" />
+    <Compile Include="PartClone\Helpers.cs" />
+    <Compile Include="PartClone\Identify.cs" />
+    <Compile Include="PartClone\Properties.cs" />
+    <Compile Include="PartClone\Read.cs" />
+    <Compile Include="PartClone\Structs.cs" />
+    <Compile Include="PartClone\Unsupported.cs" />
+    <Compile Include="PartClone\Verify.cs" />
+    <Compile Include="Partimage\Constants.cs" />
+    <Compile Include="Partimage\Enums.cs" />
+    <Compile Include="Partimage\Helpers.cs" />
+    <Compile Include="Partimage\Identify.cs" />
+    <Compile Include="Partimage\Properties.cs" />
+    <Compile Include="Partimage\Read.cs" />
+    <Compile Include="Partimage\Structs.cs" />
+    <Compile Include="Partimage\Unsupported.cs" />
+    <Compile Include="Partimage\Verify.cs" />
+    <Compile Include="QCOW2\Constants.cs" />
+    <Compile Include="QCOW2\Identify.cs" />
+    <Compile Include="QCOW2\Properties.cs" />
+    <Compile Include="QCOW2\Read.cs" />
+    <Compile Include="QCOW2\Structs.cs" />
+    <Compile Include="QCOW2\Unsupported.cs" />
+    <Compile Include="QCOW2\Write.cs" />
+    <Compile Include="QCOW\Constants.cs" />
+    <Compile Include="QCOW\Identify.cs" />
+    <Compile Include="QCOW\Properties.cs" />
+    <Compile Include="QCOW\Read.cs" />
+    <Compile Include="QCOW\Structs.cs" />
+    <Compile Include="QCOW\Unsupported.cs" />
+    <Compile Include="QCOW\Write.cs" />
+    <Compile Include="QED\Constants.cs" />
+    <Compile Include="QED\Helpers.cs" />
+    <Compile Include="QED\Identify.cs" />
+    <Compile Include="QED\Properties.cs" />
+    <Compile Include="QED\Read.cs" />
+    <Compile Include="QED\Structs.cs" />
+    <Compile Include="QED\Unsupported.cs" />
+    <Compile Include="QED\Write.cs" />
+    <Compile Include="RayDIM\Constants.cs" />
+    <Compile Include="RayDIM\Enums.cs" />
+    <Compile Include="RayDIM\Identify.cs" />
+    <Compile Include="RayDIM\Properties.cs" />
+    <Compile Include="RayDIM\Read.cs" />
+    <Compile Include="RayDIM\Structs.cs" />
+    <Compile Include="RayDIM\Unsupported.cs" />
+    <Compile Include="RayDIM\Write.cs" />
+    <Compile Include="Register.cs" />
+    <Compile Include="RsIde\Constants.cs" />
+    <Compile Include="RsIde\Enums.cs" />
+    <Compile Include="RsIde\Helpers.cs" />
+    <Compile Include="RsIde\Identify.cs" />
+    <Compile Include="RsIde\Properties.cs" />
+    <Compile Include="RsIde\Read.cs" />
+    <Compile Include="RsIde\Structs.cs" />
+    <Compile Include="RsIde\Unsupported.cs" />
+    <Compile Include="RsIde\Write.cs" />
+    <Compile Include="SaveDskF\Constants.cs" />
+    <Compile Include="SaveDskF\Identify.cs" />
+    <Compile Include="SaveDskF\Properties.cs" />
+    <Compile Include="SaveDskF\Read.cs" />
+    <Compile Include="SaveDskF\Structs.cs" />
+    <Compile Include="SaveDskF\Unsupported.cs" />
+    <Compile Include="SaveDskF\Verify.cs" />
+    <Compile Include="SaveDskF\Write.cs" />
+    <Compile Include="SuperCardPro\Constants.cs" />
+    <Compile Include="SuperCardPro\Enums.cs" />
+    <Compile Include="SuperCardPro\Helpers.cs" />
+    <Compile Include="SuperCardPro\Identify.cs" />
+    <Compile Include="SuperCardPro\Properties.cs" />
+    <Compile Include="SuperCardPro\Read.cs" />
+    <Compile Include="SuperCardPro\Structs.cs" />
+    <Compile Include="SuperCardPro\SuperCardPro.cs" />
+    <Compile Include="SuperCardPro\Verify.cs" />
+    <Compile Include="T98\Identify.cs" />
+    <Compile Include="T98\Properties.cs" />
+    <Compile Include="T98\Read.cs" />
+    <Compile Include="T98\Unsupported.cs" />
+    <Compile Include="T98\Write.cs" />
+    <Compile Include="TeleDisk\Constants.cs" />
+    <Compile Include="TeleDisk\Helpers.cs" />
+    <Compile Include="TeleDisk\Identify.cs" />
+    <Compile Include="TeleDisk\Properties.cs" />
+    <Compile Include="TeleDisk\Read.cs" />
+    <Compile Include="TeleDisk\Structs.cs" />
+    <Compile Include="TeleDisk\TeleDisk.cs" />
+    <Compile Include="TeleDisk\Unsupported.cs" />
+    <Compile Include="TeleDisk\Verify.cs" />
+    <Compile Include="UDIF\Constants.cs" />
+    <Compile Include="UDIF\Identify.cs" />
+    <Compile Include="UDIF\Properties.cs" />
+    <Compile Include="UDIF\Read.cs" />
+    <Compile Include="UDIF\Structs.cs" />
+    <Compile Include="UDIF\Unsupported.cs" />
+    <Compile Include="UDIF\Write.cs" />
+    <Compile Include="UkvFdi\Constants.cs" />
+    <Compile Include="UkvFdi\Enums.cs" />
+    <Compile Include="UkvFdi\Helpers.cs" />
+    <Compile Include="UkvFdi\Identify.cs" />
+    <Compile Include="UkvFdi\Properties.cs" />
+    <Compile Include="UkvFdi\Read.cs" />
+    <Compile Include="UkvFdi\Structs.cs" />
+    <Compile Include="UkvFdi\Unsupported.cs" />
+    <Compile Include="VDI\Constants.cs" />
+    <Compile Include="VDI\Enums.cs" />
+    <Compile Include="VDI\Identify.cs" />
+    <Compile Include="VDI\Properties.cs" />
+    <Compile Include="VDI\Read.cs" />
+    <Compile Include="VDI\Structs.cs" />
+    <Compile Include="VDI\Unsupported.cs" />
+    <Compile Include="VDI\Write.cs" />
+    <Compile Include="VHDX\Constants.cs" />
+    <Compile Include="VHDX\Helpers.cs" />
+    <Compile Include="VHDX\Identify.cs" />
+    <Compile Include="VHDX\Properties.cs" />
+    <Compile Include="VHDX\Read.cs" />
+    <Compile Include="VHDX\Structs.cs" />
+    <Compile Include="VHDX\Unsupported.cs" />
+    <Compile Include="VHD\Constants.cs" />
+    <Compile Include="VHD\Helpers.cs" />
+    <Compile Include="VHD\Identify.cs" />
+    <Compile Include="VHD\Properties.cs" />
+    <Compile Include="VHD\Read.cs" />
+    <Compile Include="VHD\Structs.cs" />
+    <Compile Include="VHD\Unsupported.cs" />
+    <Compile Include="VHD\VHD.cs" />
+    <Compile Include="VHD\Write.cs" />
+    <Compile Include="Virtual98\Constants.cs" />
+    <Compile Include="Virtual98\Identify.cs" />
+    <Compile Include="Virtual98\Properties.cs" />
+    <Compile Include="Virtual98\Read.cs" />
+    <Compile Include="Virtual98\Structs.cs" />
+    <Compile Include="Virtual98\Unsupported.cs" />
+    <Compile Include="Virtual98\Write.cs" />
+    <Compile Include="VMware\Constants.cs" />
+    <Compile Include="VMware\Identify.cs" />
+    <Compile Include="VMware\Properties.cs" />
+    <Compile Include="VMware\Read.cs" />
+    <Compile Include="VMware\Structs.cs" />
+    <Compile Include="VMware\Unsupported.cs" />
+    <Compile Include="VMware\Write.cs" />
+    <Compile Include="WCDiskImage\Identify.cs" />
+    <Compile Include="WCDiskImage\Properties.cs" />
+    <Compile Include="WCDiskImage\Read.cs" />
+    <Compile Include="WCDiskImage\Structs.cs" />
+    <Compile Include="WCDiskImage\Unsupported.cs" />
+    <Compile Include="WCDiskImage\WCDiskImage.cs" />
+    <Compile Include="ZZZRawImage\Constants.cs" />
+    <Compile Include="ZZZRawImage\Helpers.cs" />
+    <Compile Include="ZZZRawImage\Identify.cs" />
+    <Compile Include="ZZZRawImage\Properties.cs" />
+    <Compile Include="ZZZRawImage\Read.cs" />
+    <Compile Include="ZZZRawImage\Verify.cs" />
+    <Compile Include="ZZZRawImage\Write.cs" />
+    <Compile Include="ZZZRawImage\ZZZRawImage.cs" />
+    <Compile Include="CDRDAO\CDRDAO.cs" />
+    <Compile Include="GDI\GDI.cs" />
+    <Compile Include="BLU\BLU.cs" />
+    <Compile Include="CopyQM\CopyQM.cs" />
+    <Compile Include="BlindWrite4\BlindWrite4.cs" />
+    <Compile Include="BlindWrite5\BlindWrite5.cs" />
+    <Compile Include="DIM\DIM.cs" />
+    <Compile Include="CPCDSK\CPCDSK.cs" />
+    <Compile Include="QCOW\QCOW.cs" />
+    <Compile Include="QED\QED.cs" />
+    <Compile Include="QCOW2\QCOW2.cs" />
+    <Compile Include="Parallels\Parallels.cs" />
+    <Compile Include="VDI\VDI.cs" />
+    <Compile Include="VHDX\VHDX.cs" />
+    <Compile Include="VMware\VMware.cs" />
+    <Compile Include="UDIF\UDIF.cs" />
+    <Compile Include="NDIF\NDIF.cs" />
+    <Compile Include="DART\DART.cs" />
+    <Compile Include="CHD\CHD.cs" />
+    <Compile Include="AppleNIB\AppleNIB.cs" />
+    <Compile Include="CloneCD\CloneCD.cs" />
+    <Compile Include="DiscJuggler\DiscJuggler.cs" />
+    <Compile Include="SaveDskF\SaveDskF.cs" />
+    <Compile Include="AppleDOS\AppleDOS.cs" />
+    <Compile Include="D88\D88.cs" />
+    <Compile Include="T98\T98.cs" />
+    <Compile Include="NHDr0\NHDr0.cs" />
+    <Compile Include="Virtual98\Virtual98.cs" />
+    <Compile Include="IMD\IMD.cs" />
+    <Compile Include="CisCopy\CisCopy.cs" />
+    <Compile Include="DriDiskCopy\DriDiskCopy.cs" />
+    <Compile Include="RsIde\RsIde.cs" />
+    <Compile Include="UkvFdi\UkvFdi.cs" />
+    <Compile Include="PartClone\PartClone.cs" />
+    <Compile Include="Partimage\Partimage.cs" />
+    <Compile Include="Apridisk\Apridisk.cs" />
+    <Compile Include="MaxiDisk\MaxiDisk.cs" />
+    <Compile Include="RayDIM\RayDIM.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
@@ -556,8 +556,8 @@
       <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\CUETools.Codecs.csproj"/>
+    <ProjectReference Include="..\cuetools.net\CUETools.Codecs.Flake\CUETools.Codecs.Flake.csproj" />
+    <ProjectReference Include="..\cuetools.net\CUETools.Codecs\CUETools.Codecs.csproj" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\LICENSE.LGPL">
@@ -568,9 +568,9 @@
     <MonoDevelop>
       <Properties>
         <Policies>
-          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/"/>
-          <TextStylePolicy FileWidth="120" TabWidth="4" TabsToSpaces="False" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Unix" scope="text/x-csharp"/>
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" NewLineForMembersInObjectInit="False" NewLineForMembersInAnonymousTypes="False" NewLineForClausesInQuery="False" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp"/>
+          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/" />
+          <TextStylePolicy FileWidth="120" TabWidth="4" TabsToSpaces="False" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Unix" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" NewLineForMembersInObjectInit="False" NewLineForMembersInAnonymousTypes="False" NewLineForClausesInQuery="False" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
         </Policies>
       </Properties>
     </MonoDevelop>
diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj
index 4fb623807..cf7e76d46 100644
--- a/Aaru.Partitions/Aaru.Partitions.csproj
+++ b/Aaru.Partitions/Aaru.Partitions.csproj
@@ -56,31 +56,31 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System"/>
+    <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AppleMap.cs"/>
-    <Compile Include="Atari.cs"/>
-    <Compile Include="MBR.cs"/>
-    <Compile Include="NeXT.cs"/>
-    <Compile Include="RDB.cs"/>
-    <Compile Include="Register.cs"/>
-    <Compile Include="Sun.cs"/>
-    <Compile Include="GPT.cs"/>
-    <Compile Include="RioKarma.cs"/>
-    <Compile Include="BSD.cs"/>
-    <Compile Include="PC98.cs"/>
-    <Compile Include="DEC.cs"/>
-    <Compile Include="SGI.cs"/>
-    <Compile Include="Acorn.cs"/>
-    <Compile Include="DragonFlyBSD.cs"/>
-    <Compile Include="VTOC.cs"/>
-    <Compile Include="Human68k.cs"/>
-    <Compile Include="Xbox.cs"/>
-    <Compile Include="UNIX.cs"/>
-    <Compile Include="XENIX.cs"/>
-    <Compile Include="Plan9.cs"/>
-    <Compile Include="Apricot.cs"/>
+    <Compile Include="AppleMap.cs" />
+    <Compile Include="Atari.cs" />
+    <Compile Include="MBR.cs" />
+    <Compile Include="NeXT.cs" />
+    <Compile Include="RDB.cs" />
+    <Compile Include="Register.cs" />
+    <Compile Include="Sun.cs" />
+    <Compile Include="GPT.cs" />
+    <Compile Include="RioKarma.cs" />
+    <Compile Include="BSD.cs" />
+    <Compile Include="PC98.cs" />
+    <Compile Include="DEC.cs" />
+    <Compile Include="SGI.cs" />
+    <Compile Include="Acorn.cs" />
+    <Compile Include="DragonFlyBSD.cs" />
+    <Compile Include="VTOC.cs" />
+    <Compile Include="Human68k.cs" />
+    <Compile Include="Xbox.cs" />
+    <Compile Include="UNIX.cs" />
+    <Compile Include="XENIX.cs" />
+    <Compile Include="Plan9.cs" />
+    <Compile Include="Apricot.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj">
@@ -110,15 +110,15 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all"/>
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
         <Policies>
-          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/"/>
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp"/>
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp"/>
+          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/" />
+          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
         </Policies>
       </Properties>
     </MonoDevelop>
diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj
index 8dfc7fa28..5ff817855 100644
--- a/Aaru.Settings/Aaru.Settings.csproj
+++ b/Aaru.Settings/Aaru.Settings.csproj
@@ -74,7 +74,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
     <PackageReference Include="plist-cil" Version="2.2.0" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
diff --git a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
index 3a990c0f0..c0491ac13 100644
--- a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
+++ b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
@@ -46,47 +46,47 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System"/>
+    <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs"/>
-    <Compile Include="Device.cs"/>
-    <Compile Include="Command.cs"/>
-    <Compile Include="SCSI.cs"/>
-    <Compile Include="ATA.cs"/>
-    <Compile Include="NVMe.cs"/>
-    <Compile Include="SCSI_MMC\GdRom.cs"/>
-    <Compile Include="SCSI_MMC\LeadOutTrap.cs"/>
-    <Compile Include="SCSI_MMC\MediaTek.cs"/>
-    <Compile Include="SCSI_MMC\SCSI_MMC.cs"/>
-    <Compile Include="SecureDigital.cs"/>
-    <Compile Include="SCSI\Adaptec.cs"/>
-    <Compile Include="SCSI\ArchiveCorp.cs"/>
-    <Compile Include="SCSI\Certance.cs"/>
-    <Compile Include="SCSI\Fujitsu.cs"/>
-    <Compile Include="SCSI\HL-DT-ST.cs"/>
-    <Compile Include="SCSI\HP.cs"/>
-    <Compile Include="SCSI\Kreon.cs"/>
-    <Compile Include="SCSI\MMC.cs"/>
-    <Compile Include="SCSI\NEC.cs"/>
-    <Compile Include="SCSI\Pioneer.cs"/>
-    <Compile Include="SCSI\Plasmon.cs"/>
-    <Compile Include="SCSI\Plextor.cs"/>
-    <Compile Include="SCSI\SBC.cs"/>
-    <Compile Include="SCSI\SMC.cs"/>
-    <Compile Include="SCSI\SPC.cs"/>
-    <Compile Include="SCSI\SSC.cs"/>
-    <Compile Include="SCSI\SyQuest.cs"/>
-    <Compile Include="ATA\Ata28.cs"/>
-    <Compile Include="ATA\Ata48.cs"/>
-    <Compile Include="ATA\AtaCHS.cs"/>
-    <Compile Include="ATA\Atapi.cs"/>
-    <Compile Include="ATA\Cfa.cs"/>
-    <Compile Include="ATA\MCPT.cs"/>
-    <Compile Include="ATA\Smart.cs"/>
-    <Compile Include="SecureDigital\SecureDigital.cs"/>
-    <Compile Include="SecureDigital\MultiMediaCard.cs"/>
-    <Compile Include="DecodeATARegisters.cs"/>
+    <Compile Include="Main.cs" />
+    <Compile Include="Device.cs" />
+    <Compile Include="Command.cs" />
+    <Compile Include="SCSI.cs" />
+    <Compile Include="ATA.cs" />
+    <Compile Include="NVMe.cs" />
+    <Compile Include="SCSI_MMC\GdRom.cs" />
+    <Compile Include="SCSI_MMC\LeadOutTrap.cs" />
+    <Compile Include="SCSI_MMC\MediaTek.cs" />
+    <Compile Include="SCSI_MMC\SCSI_MMC.cs" />
+    <Compile Include="SecureDigital.cs" />
+    <Compile Include="SCSI\Adaptec.cs" />
+    <Compile Include="SCSI\ArchiveCorp.cs" />
+    <Compile Include="SCSI\Certance.cs" />
+    <Compile Include="SCSI\Fujitsu.cs" />
+    <Compile Include="SCSI\HL-DT-ST.cs" />
+    <Compile Include="SCSI\HP.cs" />
+    <Compile Include="SCSI\Kreon.cs" />
+    <Compile Include="SCSI\MMC.cs" />
+    <Compile Include="SCSI\NEC.cs" />
+    <Compile Include="SCSI\Pioneer.cs" />
+    <Compile Include="SCSI\Plasmon.cs" />
+    <Compile Include="SCSI\Plextor.cs" />
+    <Compile Include="SCSI\SBC.cs" />
+    <Compile Include="SCSI\SMC.cs" />
+    <Compile Include="SCSI\SPC.cs" />
+    <Compile Include="SCSI\SSC.cs" />
+    <Compile Include="SCSI\SyQuest.cs" />
+    <Compile Include="ATA\Ata28.cs" />
+    <Compile Include="ATA\Ata48.cs" />
+    <Compile Include="ATA\AtaCHS.cs" />
+    <Compile Include="ATA\Atapi.cs" />
+    <Compile Include="ATA\Cfa.cs" />
+    <Compile Include="ATA\MCPT.cs" />
+    <Compile Include="ATA\Smart.cs" />
+    <Compile Include="SecureDigital\SecureDigital.cs" />
+    <Compile Include="SecureDigital\MultiMediaCard.cs" />
+    <Compile Include="DecodeATARegisters.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
@@ -107,20 +107,23 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="SCSI\"/>
-    <Folder Include="ATA\"/>
-    <Folder Include="SecureDigital\"/>
+    <Folder Include="SCSI\" />
+    <Folder Include="ATA\" />
+    <Folder Include="SecureDigital\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0"/>
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
         <Policies>
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp"/>
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" NewLineForMembersInObjectInit="False" NewLineForMembersInAnonymousTypes="False" NewLineForClausesInQuery="False" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp"/>
-          <DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild"/>
+          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" NewLineForMembersInObjectInit="False" NewLineForMembersInAnonymousTypes="False" NewLineForClausesInQuery="False" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
+          <DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild" />
         </Policies>
       </Properties>
     </MonoDevelop>
diff --git a/Aaru.Tests/Aaru.Tests.csproj b/Aaru.Tests/Aaru.Tests.csproj
index 8cba931ca..3f32ec281 100644
--- a/Aaru.Tests/Aaru.Tests.csproj
+++ b/Aaru.Tests/Aaru.Tests.csproj
@@ -12,10 +12,10 @@
 
   <ItemGroup>
     <PackageReference Include="Claunia.Encoding" Version="1.9.1" />
-    <PackageReference Include="FluentAssertions" Version="6.0.0-alpha0001" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="FluentAssertions" Version="6.1.0" />
+    <PackageReference Include="nunit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21377.19" />
   </ItemGroup>
 
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index da7504d84..18639a03b 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -264,11 +264,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-preview.7.21378.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20104.2" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21377.19" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />