From cf2537f3794ea81906eacaa2f2e9387d0676a456 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Thu, 16 Apr 2020 19:28:39 +0100
Subject: [PATCH] Migrate media dump window from Eto.Forms to Avalonia.

---
 .idea/.idea.Aaru/.idea/contentModel.xml   | 492 ++++++------
 Aaru.Gui/Forms/frmDump.xeto               | 111 ---
 Aaru.Gui/Forms/frmDump.xeto.cs            | 684 -----------------
 Aaru.Gui/ViewModels/MediaDumpViewModel.cs | 870 ++++++++++++++++++++++
 Aaru.Gui/ViewModels/MediaInfoViewModel.cs |  34 +-
 Aaru.Gui/Views/MediaDumpWindow.xaml       |  94 +++
 Aaru.Gui/Views/MediaDumpWindow.xaml.cs    |  27 +
 7 files changed, 1260 insertions(+), 1052 deletions(-)
 delete mode 100644 Aaru.Gui/Forms/frmDump.xeto
 delete mode 100644 Aaru.Gui/Forms/frmDump.xeto.cs
 create mode 100644 Aaru.Gui/ViewModels/MediaDumpViewModel.cs
 create mode 100644 Aaru.Gui/Views/MediaDumpWindow.xaml
 create mode 100644 Aaru.Gui/Views/MediaDumpWindow.xaml.cs

diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 9a7a69f85..0fe6ecc5a 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ContentModelStore">
-    <e p="C:\Users\claunia\.Rider2019.3\system\extResources" t="IncludeRecursive" />
-    <e p="C:\Users\claunia\.Rider2019.3\system\resharper-host\Local\Transient\ReSharperHost\v193\SolutionCaches\_Aaru.795230756.00" t="ExcludeRecursive" />
-    <e p="C:\Users\claunia\AppData\Local\JetBrains\Toolbox\apps\Rider\ch-0\193.6494.48.plugins\puppet\lib\stubs" t="IncludeRecursive" />
-    <e p="C:\Users\claunia\Development\Aaru\Aaru" t="IncludeFlat">
-      <e p=".git\info\exclude" t="IncludeRecursive" />
-      <e p=".git\modules\Aaru.Checksums\info\exclude" t="IncludeRecursive" />
-      <e p=".git\modules\Aaru.CommonTypes\info\exclude" t="IncludeRecursive" />
-      <e p=".git\modules\Aaru.Console\info\exclude" t="IncludeRecursive" />
-      <e p=".git\modules\Aaru.Decoders\info\exclude" t="IncludeRecursive" />
-      <e p=".git\modules\Aaru.Dto\info\exclude" t="IncludeRecursive" />
-      <e p=".git\modules\Aaru.Helpers\info\exclude" t="IncludeRecursive" />
-      <e p=".git\modules\CICMMetadata\info\exclude" t="IncludeRecursive" />
-      <e p=".git\modules\cuetoolsnet\info\exclude" t="IncludeRecursive" />
-      <e p=".github\CODE_OF_CONDUCT.md" t="Include" />
-      <e p=".github\ISSUE_TEMPLATE.md" t="Include" />
-      <e p=".github\PULL_REQUEST_TEMPLATE.md" t="Include" />
+    <e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
+    <e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
+    <e p="$APPLICATION_CONFIG_DIR$/scratches" t="IncludeRecursive" />
+    <e p="$USER_HOME$/.Rider2019.3/system/extResources" t="IncludeRecursive" />
+    <e p="$USER_HOME$/.Rider2019.3/system/resharper-host/local/Transient/ReSharperHost/v193/SolutionCaches/_Aaru.232757112.00" t="ExcludeRecursive" />
+    <e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
+    <e p="$PROJECT_DIR$" t="IncludeFlat">
+      <e p=".git/info/exclude" t="IncludeRecursive" />
+      <e p=".git/modules/Aaru.Checksums/info/exclude" t="IncludeRecursive" />
+      <e p=".git/modules/Aaru.CommonTypes/info/exclude" t="IncludeRecursive" />
+      <e p=".git/modules/Aaru.Console/info/exclude" t="IncludeRecursive" />
+      <e p=".git/modules/Aaru.Decoders/info/exclude" t="IncludeRecursive" />
+      <e p=".git/modules/Aaru.Dto/info/exclude" t="IncludeRecursive" />
+      <e p=".git/modules/Aaru.Helpers/info/exclude" t="IncludeRecursive" />
+      <e p=".git/modules/CICMMetadata/info/exclude" t="IncludeRecursive" />
+      <e p=".git/modules/cuetoolsnet/info/exclude" t="IncludeRecursive" />
+      <e p=".github/CODE_OF_CONDUCT.md" t="Include" />
+      <e p=".github/ISSUE_TEMPLATE.md" t="Include" />
+      <e p=".github/PULL_REQUEST_TEMPLATE.md" t="Include" />
       <e p=".travis.yml" t="Include" />
       <e p="Aaru" t="IncludeRecursive">
         <e p="Aaru.csproj" t="IncludeRecursive" />
-        <e p="aaruformat.xml" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="Commands" t="Include">
           <e p="Configure.cs" t="Include" />
           <e p="Database" t="Include">
@@ -70,6 +71,13 @@
         <e p="Info.plist" t="Include" />
         <e p="MacIcon.icns" t="Include" />
         <e p="Main.cs" t="Include" />
+        <e p="Progress.cs" t="Include" />
+        <e p="Properties" t="Include">
+          <e p="launchSettings.json" t="Include" />
+        </e>
+        <e p="Settings.StyleCop" t="Include" />
+        <e p="aaruformat.xml" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp3.0" t="Include">
@@ -80,18 +88,12 @@
             </e>
           </e>
         </e>
-        <e p="Progress.cs" t="Include" />
-        <e p="Properties" t="Include">
-          <e p="launchSettings.json" t="Include" />
-        </e>
-        <e p="Settings.StyleCop" t="Include" />
       </e>
       <e p="Aaru.Checksums" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
         <e p="Aaru.Checksums.csproj" t="IncludeRecursive" />
         <e p="Adler32Context.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="CDChecksums.cs" t="Include" />
         <e p="CRC16CCITTContext.cs" t="Include" />
         <e p="CRC16Context.cs" t="Include" />
@@ -100,13 +102,6 @@
         <e p="CRC64Context.cs" t="Include" />
         <e p="FletcherContext.cs" t="Include" />
         <e p="MD5Context.cs" t="Include" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Checksums.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
         <e p="ReedSolomon.cs" t="Include" />
         <e p="Register.cs" t="Include" />
         <e p="SHA1Context.cs" t="Include" />
@@ -114,12 +109,19 @@
         <e p="SHA384Context.cs" t="Include" />
         <e p="SHA512Context.cs" t="Include" />
         <e p="SpamSumContext.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Checksums.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.CommonTypes" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
         <e p="Aaru.CommonTypes.csproj" t="IncludeRecursive" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="Enums" t="Include">
           <e p="DeviceType.cs" t="Include" />
           <e p="ErrorNumber.cs" t="Include" />
@@ -178,13 +180,6 @@
           <e p="Statistics.cs" t="Include" />
           <e p="Version.cs" t="Include" />
         </e>
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
         <e p="Partition.cs" t="Include" />
         <e p="PluginBase.cs" t="Include" />
         <e p="Structs" t="Include">
@@ -205,10 +200,19 @@
           <e p="TapeFile.cs" t="Include" />
           <e p="TapePartition.cs" t="Include" />
         </e>
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Compression" t="IncludeRecursive">
         <e p="Aaru.Compression.csproj" t="IncludeRecursive" />
         <e p="AppleRle.cs" t="Include" />
+        <e p="TeleDiskLzh.cs" t="Include" />
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
@@ -217,7 +221,6 @@
             </e>
           </e>
         </e>
-        <e p="TeleDiskLzh.cs" t="Include" />
       </e>
       <e p="Aaru.Console" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
@@ -235,7 +238,6 @@
       </e>
       <e p="Aaru.Core" t="IncludeRecursive">
         <e p="Aaru.Core.csproj" t="IncludeRecursive" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="Checksum.cs" t="Include" />
         <e p="DataFile.cs" t="Include" />
         <e p="Delegates.cs" t="Include" />
@@ -256,8 +258,8 @@
               <e p="Trim.cs" t="Include" />
             </e>
             <e p="Dump.cs" t="Include" />
-            <e p="Metadata.cs" t="Include" />
             <e p="MMC.cs" t="Include" />
+            <e p="Metadata.cs" t="Include" />
             <e p="NVMe.cs" t="Include" />
             <e p="PlayStationPortable" t="Include">
               <e p="MemoryStick.cs" t="Include" />
@@ -267,11 +269,11 @@
             <e p="ResumeSupport.cs" t="Include" />
             <e p="SBC.cs" t="Include" />
             <e p="SCSI.cs" t="Include" />
-            <e p="SecureDigital.cs" t="Include" />
             <e p="SSC.cs" t="Include" />
+            <e p="SecureDigital.cs" t="Include" />
             <e p="XGD.cs" t="Include" />
           </e>
-          <e p="info" t="Include">
+          <e p="Info" t="Include">
             <e p="DeviceInfo.cs" t="Include" />
             <e p="Plextor.cs" t="Include" />
             <e p="Properties.cs" t="Include" />
@@ -285,17 +287,17 @@
             <e p="FireWire.cs" t="Include" />
             <e p="MMC.cs" t="Include" />
             <e p="PCMCIA.cs" t="Include" />
-            <e p="SCSI.cs" t="Include" />
-            <e p="SecureDigital.cs" t="Include" />
             <e p="SSC.cs" t="Include" />
+            <e p="Scsi.cs" t="Include" />
+            <e p="SecureDigital.cs" t="Include" />
             <e p="USB.cs" t="Include" />
           </e>
           <e p="Scanning" t="Include">
             <e p="ATA.cs" t="Include" />
             <e p="MediaScan.cs" t="Include" />
             <e p="NVMe.cs" t="Include" />
-            <e p="ScanResults.cs" t="Include" />
             <e p="SCSI.cs" t="Include" />
+            <e p="ScanResults.cs" t="Include" />
             <e p="SecureDigital.cs" t="Include" />
           </e>
         </e>
@@ -315,19 +317,12 @@
           <e p="Detection" t="Include">
             <e p="MMC.cs" t="Include" />
           </e>
-          <e p="info" t="Include">
+          <e p="Info" t="Include">
             <e p="CompactDisc.cs" t="Include" />
             <e p="ScsiInfo.cs" t="Include" />
             <e p="XgdInfo.cs" t="Include" />
           </e>
         </e>
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Core.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
         <e p="Options.cs" t="Include" />
         <e p="Partitions.cs" t="Include" />
         <e p="PrintScsiModePages.cs" t="Include" />
@@ -344,61 +339,68 @@
           <e p="Sidecar.cs" t="Include" />
         </e>
         <e p="Statistics.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Core.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Database" t="IncludeRecursive">
         <e p="Aaru.Database.csproj" t="IncludeRecursive" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="Context.cs" t="Include" />
         <e p="ContextFactory.cs" t="Include" />
         <e p="Migrations" t="Include">
-          <e p="20181126222301_DeviceReportV2.cs" t="Include" />
           <e p="20181126222301_DeviceReportV2.Designer.cs" t="Include" />
-          <e p="20181127001622_AddDeviceBasicFields.cs" t="Include" />
+          <e p="20181126222301_DeviceReportV2.cs" t="Include" />
           <e p="20181127001622_AddDeviceBasicFields.Designer.cs" t="Include" />
-          <e p="20181127013131_CorrectReportsDbSet.cs" t="Include" />
+          <e p="20181127001622_AddDeviceBasicFields.cs" t="Include" />
           <e p="20181127013131_CorrectReportsDbSet.Designer.cs" t="Include" />
-          <e p="20181221015906_NameValueStatistics.cs" t="Include" />
+          <e p="20181127013131_CorrectReportsDbSet.cs" t="Include" />
           <e p="20181221015906_NameValueStatistics.Designer.cs" t="Include" />
-          <e p="20181221032605_MediaStatistics.cs" t="Include" />
+          <e p="20181221015906_NameValueStatistics.cs" t="Include" />
           <e p="20181221032605_MediaStatistics.Designer.cs" t="Include" />
-          <e p="20181221034941_SeenDevicesStatistics.cs" t="Include" />
+          <e p="20181221032605_MediaStatistics.cs" t="Include" />
           <e p="20181221034941_SeenDevicesStatistics.Designer.cs" t="Include" />
-          <e p="20181221040408_OperatingSystemStatistics.cs" t="Include" />
+          <e p="20181221034941_SeenDevicesStatistics.cs" t="Include" />
           <e p="20181221040408_OperatingSystemStatistics.Designer.cs" t="Include" />
-          <e p="20181221041242_VersionStatistics.cs" t="Include" />
+          <e p="20181221040408_OperatingSystemStatistics.cs" t="Include" />
           <e p="20181221041242_VersionStatistics.Designer.cs" t="Include" />
-          <e p="20181221125353_AddStatsCounters.cs" t="Include" />
+          <e p="20181221041242_VersionStatistics.cs" t="Include" />
           <e p="20181221125353_AddStatsCounters.Designer.cs" t="Include" />
-          <e p="20181223183913_FixUnsignedFields.cs" t="Include" />
+          <e p="20181221125353_AddStatsCounters.cs" t="Include" />
           <e p="20181223183913_FixUnsignedFields.Designer.cs" t="Include" />
-          <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs" t="Include" />
+          <e p="20181223183913_FixUnsignedFields.cs" t="Include" />
           <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs" t="Include" />
-          <e p="20181224044809_StoreUsbIdsInDatabase.cs" t="Include" />
+          <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs" t="Include" />
           <e p="20181224044809_StoreUsbIdsInDatabase.Designer.cs" t="Include" />
-          <e p="20181224172147_FixUsbIdsAndIndexes.cs" t="Include" />
+          <e p="20181224044809_StoreUsbIdsInDatabase.cs" t="Include" />
           <e p="20181224172147_FixUsbIdsAndIndexes.Designer.cs" t="Include" />
-          <e p="20181225002740_AddCdOffsets.cs" t="Include" />
+          <e p="20181224172147_FixUsbIdsAndIndexes.cs" t="Include" />
           <e p="20181225002740_AddCdOffsets.Designer.cs" t="Include" />
-          <e p="20181225152947_StoreMmcGetConfigurationResponse.cs" t="Include" />
+          <e p="20181225002740_AddCdOffsets.cs" t="Include" />
           <e p="20181225152947_StoreMmcGetConfigurationResponse.Designer.cs" t="Include" />
-          <e p="20181225214500_StoreReadResultsInReportDatabase.cs" t="Include" />
+          <e p="20181225152947_StoreMmcGetConfigurationResponse.cs" t="Include" />
           <e p="20181225214500_StoreReadResultsInReportDatabase.Designer.cs" t="Include" />
-          <e p="20190102061236_AddMultisessionLeadTest.cs" t="Include" />
+          <e p="20181225214500_StoreReadResultsInReportDatabase.cs" t="Include" />
           <e p="20190102061236_AddMultisessionLeadTest.Designer.cs" t="Include" />
-          <e p="20190102230036_AddOptimalReadMultipleCount.cs" t="Include" />
+          <e p="20190102061236_AddMultisessionLeadTest.cs" t="Include" />
           <e p="20190102230036_AddOptimalReadMultipleCount.Designer.cs" t="Include" />
-          <e p="20190108013456_AddChangeableScsiModes.cs" t="Include" />
+          <e p="20190102230036_AddOptimalReadMultipleCount.cs" t="Include" />
           <e p="20190108013456_AddChangeableScsiModes.Designer.cs" t="Include" />
-          <e p="20190525183723_IdForDensityCode.cs" t="Include" />
+          <e p="20190108013456_AddChangeableScsiModes.cs" t="Include" />
           <e p="20190525183723_IdForDensityCode.Designer.cs" t="Include" />
-          <e p="20191103000828_MakeFieldsUnsigned.cs" t="Include" />
+          <e p="20190525183723_IdForDensityCode.cs" t="Include" />
           <e p="20191103000828_MakeFieldsUnsigned.Designer.cs" t="Include" />
-          <e p="20191207175444_SyncWithServerChanges.cs" t="Include" />
+          <e p="20191103000828_MakeFieldsUnsigned.cs" t="Include" />
           <e p="20191207175444_SyncWithServerChanges.Designer.cs" t="Include" />
-          <e p="20191207183522_AddNameCountModel.cs" t="Include" />
+          <e p="20191207175444_SyncWithServerChanges.cs" t="Include" />
           <e p="20191207183522_AddNameCountModel.Designer.cs" t="Include" />
-          <e p="20191207184342_AddRemoteStats.cs" t="Include" />
+          <e p="20191207183522_AddNameCountModel.cs" t="Include" />
           <e p="20191207184342_AddRemoteStats.Designer.cs" t="Include" />
+          <e p="20191207184342_AddRemoteStats.cs" t="Include" />
           <e p="AaruContextModelSnapshot.cs" t="Include" />
         </e>
         <e p="Models" t="Include">
@@ -423,6 +425,7 @@
           <e p="UsbVendor.cs" t="Include" />
           <e p="Version.cs" t="Include" />
         </e>
+        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp3.0" t="Include">
@@ -434,12 +437,11 @@
       <e p="Aaru.Decoders" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
-        <e p="Aaru.Decoders.csproj" t="IncludeRecursive" />
         <e p="ATA" t="Include">
           <e p="Identify.cs" t="Include" />
           <e p="Registers.cs" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
+        <e p="Aaru.Decoders.csproj" t="IncludeRecursive" />
         <e p="Blu-ray" t="Include">
           <e p="BCA.cs" t="Include" />
           <e p="Cartridge.cs" t="Include" />
@@ -461,9 +463,9 @@
           <e p="AACS.cs" t="Include" />
           <e p="ADIP.cs" t="Include" />
           <e p="BCA.cs" t="Include" />
-          <e p="Cartridge.cs" t="Include" />
           <e p="CPRM.cs" t="Include" />
           <e p="CSS&amp;CPRM.cs" t="Include" />
+          <e p="Cartridge.cs" t="Include" />
           <e p="DDS.cs" t="Include" />
           <e p="DMI.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -493,13 +495,6 @@
           <e p="OCR.cs" t="Include" />
           <e p="VendorString.cs" t="Include" />
         </e>
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
         <e p="PCMCIA" t="Include">
           <e p="CIS.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -563,11 +558,11 @@
             <e p="Mode6.cs" t="Include" />
             <e p="Structs.cs" t="Include" />
           </e>
-          <e p="Sense.cs" t="Include" />
           <e p="SSC" t="Include">
             <e p="BlockLimits.cs" t="Include" />
             <e p="DensitySupport.cs" t="Include" />
           </e>
+          <e p="Sense.cs" t="Include" />
           <e p="Types.cs" t="Include" />
           <e p="VendorString.cs" t="Include" />
         </e>
@@ -587,10 +582,17 @@
           <e p="DMI.cs" t="Include" />
           <e p="SS.cs" t="Include" />
         </e>
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Devices" t="IncludeRecursive">
         <e p="Aaru.Devices.csproj" t="IncludeRecursive" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="Command.cs" t="Include" />
         <e p="Device" t="Include">
           <e p="AtaCommands" t="Include">
@@ -647,13 +649,6 @@
           <e p="ListDevices.cs" t="Include" />
           <e p="Structs.cs" t="Include" />
         </e>
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Devices.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
         <e p="Remote" t="Include">
           <e p="Consts.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -666,17 +661,28 @@
           <e p="Extern.cs" t="Include" />
           <e p="ListDevices.cs" t="Include" />
           <e p="Structs.cs" t="Include" />
-          <e p="USB.cs" t="Include" />
+          <e p="Usb.cs" t="Include" />
           <e p="UsbFunctions.cs" t="Include" />
         </e>
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Devices.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Dto" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
         <e p="Aaru.Dto.csproj" t="IncludeRecursive" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="CdOffsetDto.cs" t="Include" />
         <e p="DeviceDto.cs" t="Include" />
+        <e p="SyncDto.cs" t="Include" />
+        <e p="UsbProductDto.cs" t="Include" />
+        <e p="UsbVendorDto.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp3.0" t="Include">
@@ -684,16 +690,13 @@
             </e>
           </e>
         </e>
-        <e p="SyncDto.cs" t="Include" />
-        <e p="UsbProductDto.cs" t="Include" />
-        <e p="UsbVendorDto.cs" t="Include" />
       </e>
       <e p="Aaru.Filesystems" t="IncludeRecursive">
+        <e p="AODOS.cs" t="Include" />
+        <e p="APFS.cs" t="Include" />
         <e p="Aaru.Filesystems.csproj" t="IncludeRecursive" />
         <e p="Acorn.cs" t="Include" />
         <e p="AmigaDOS.cs" t="Include" />
-        <e p="AODOS.cs" t="Include" />
-        <e p="APFS.cs" t="Include" />
         <e p="AppleCommon" t="Include">
           <e p="Consts.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -729,13 +732,11 @@
         </e>
         <e p="AtheOS.cs" t="Include" />
         <e p="BFS.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="BTRFS.cs" t="Include" />
         <e p="CBM.cs" t="Include" />
         <e p="CPM" t="Include">
-          <e p="Consts.cs" t="Include" />
           <e p="CPM.cs" t="Include" />
-          <e p="cpmdefs.xml" t="Include" />
+          <e p="Consts.cs" t="Include" />
           <e p="Definitions.cs" t="Include" />
           <e p="Dir.cs" t="Include" />
           <e p="File.cs" t="Include" />
@@ -743,14 +744,11 @@
           <e p="Structs.cs" t="Include" />
           <e p="Super.cs" t="Include" />
           <e p="Xattr.cs" t="Include" />
+          <e p="cpmdefs.xml" t="Include" />
         </e>
         <e p="Cram.cs" t="Include" />
-        <e p="Dump.cs" t="Include" />
         <e p="ECMA67.cs" t="Include" />
         <e p="EFS.cs" t="Include" />
-        <e p="exFAT.cs" t="Include" />
-        <e p="ext2FS.cs" t="Include" />
-        <e p="extFS.cs" t="Include" />
         <e p="F2FS.cs" t="Include" />
         <e p="FAT" t="Include">
           <e p="BPB.cs" t="Include" />
@@ -790,8 +788,8 @@
             <e p="CDi.cs" t="Include" />
             <e p="ElTorito.cs" t="Include" />
             <e p="HighSierra.cs" t="Include" />
-            <e p="Internal.cs" t="Include" />
             <e p="ISO.cs" t="Include" />
+            <e p="Internal.cs" t="Include" />
             <e p="RRIP.cs" t="Include" />
             <e p="SUSP.cs" t="Include" />
             <e p="XA.cs" t="Include" />
@@ -800,8 +798,8 @@
           <e p="Date.cs" t="Include" />
           <e p="Dir.cs" t="Include" />
           <e p="File.cs" t="Include" />
-          <e p="Info.cs" t="Include" />
           <e p="ISO9660.cs" t="Include" />
+          <e p="Info.cs" t="Include" />
           <e p="Mode2.cs" t="Include" />
           <e p="PathTable.cs" t="Include" />
           <e p="Structs" t="Include">
@@ -810,8 +808,8 @@
             <e p="CDi.cs" t="Include" />
             <e p="ElTorito.cs" t="Include" />
             <e p="HighSierra.cs" t="Include" />
-            <e p="Internal.cs" t="Include" />
             <e p="ISO.cs" t="Include" />
+            <e p="Internal.cs" t="Include" />
             <e p="Joliet.cs" t="Include" />
             <e p="RRIP.cs" t="Include" />
             <e p="SUSP.cs" t="Include" />
@@ -838,15 +836,8 @@
         <e p="MicroDOS.cs" t="Include" />
         <e p="MinixFS.cs" t="Include" />
         <e p="NILFS2.cs" t="Include" />
-        <e p="Nintendo.cs" t="Include" />
         <e p="NTFS.cs" t="Include" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Filesystems.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
+        <e p="Nintendo.cs" t="Include" />
         <e p="ODS.cs" t="Include" />
         <e p="Opera" t="Include">
           <e p="Consts.cs" t="Include" />
@@ -864,11 +855,11 @@
         <e p="QNX4.cs" t="Include" />
         <e p="QNX6.cs" t="Include" />
         <e p="RBF.cs" t="Include" />
+        <e p="RT11.cs" t="Include" />
         <e p="ReFS.cs" t="Include" />
         <e p="Register.cs" t="Include" />
         <e p="Reiser.cs" t="Include" />
         <e p="Reiser4.cs" t="Include" />
-        <e p="RT11.cs" t="Include" />
         <e p="SFS.cs" t="Include" />
         <e p="SolarFS.cs" t="Include" />
         <e p="Squash.cs" t="Include" />
@@ -891,17 +882,34 @@
         <e p="XFS.cs" t="Include" />
         <e p="Xia.cs" t="Include" />
         <e p="ZFS.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="dump.cs" t="Include" />
+        <e p="exFAT.cs" t="Include" />
+        <e p="ext2FS.cs" t="Include" />
+        <e p="extFS.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Filesystems.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Filters" t="IncludeRecursive">
         <e p="Aaru.Filters.csproj" t="IncludeRecursive" />
         <e p="AppleDouble.cs" t="Include" />
         <e p="AppleSingle.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="BZip2.cs" t="Include" />
         <e p="ForcedSeekStream.cs" t="Include" />
         <e p="GZip.cs" t="Include" />
         <e p="LZip.cs" t="Include" />
         <e p="MacBinary.cs" t="Include" />
+        <e p="OffsetStream.cs" t="Include" />
+        <e p="PCExchange.cs" t="Include" />
+        <e p="Register.cs" t="Include" />
+        <e p="XZ.cs" t="Include" />
+        <e p="ZZZNoFilter.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp3.0" t="Include">
@@ -909,18 +917,12 @@
             </e>
           </e>
         </e>
-        <e p="OffsetStream.cs" t="Include" />
-        <e p="PCExchange.cs" t="Include" />
-        <e p="Register.cs" t="Include" />
-        <e p="XZ.cs" t="Include" />
-        <e p="ZZZNoFilter.cs" t="Include" />
       </e>
       <e p="Aaru.Gui" t="IncludeRecursive">
         <e p="Aaru.Gui.csproj" t="IncludeRecursive" />
         <e p="App.xaml" t="Include" />
         <e p="App.xaml.cs" t="Include" />
         <e p="Assets" t="Include">
-          <e p="aaru-logo.png" t="Include" />
           <e p="Icons" t="Include">
             <e p="oxygen" t="Include">
               <e p="32x32" t="Include">
@@ -1014,12 +1016,6 @@
               <e p="DDS3.svg" t="Include" />
               <e p="DDS4.png" t="Include" />
               <e p="DDS4.svg" t="Include" />
-              <e p="DigitalAudioTape.png" t="Include" />
-              <e p="DigitalAudioTape.svg" t="Include" />
-              <e p="Ditto.png" t="Include" />
-              <e p="Ditto.svg" t="Include" />
-              <e p="DittoMax.png" t="Include" />
-              <e p="DittoMax.svg" t="Include" />
               <e p="DLTtapeIII.png" t="Include" />
               <e p="DLTtapeIII.svg" t="Include" />
               <e p="DLTtapeIIIxt.png" t="Include" />
@@ -1044,6 +1040,12 @@
               <e p="DVDROM.svg" t="Include" />
               <e p="DVDRW.png" t="Include" />
               <e p="DVDRW.svg" t="Include" />
+              <e p="DigitalAudioTape.png" t="Include" />
+              <e p="DigitalAudioTape.svg" t="Include" />
+              <e p="Ditto.png" t="Include" />
+              <e p="Ditto.svg" t="Include" />
+              <e p="DittoMax.png" t="Include" />
+              <e p="DittoMax.svg" t="Include" />
               <e p="ExpressCard34.png" t="Include" />
               <e p="ExpressCard34.svg" t="Include" />
               <e p="ExpressCard54.png" t="Include" />
@@ -1126,8 +1128,6 @@
               <e p="MemoryStickProDuo.svg" t="Include" />
               <e p="MilCD.png" t="Include" />
               <e p="MilCD.svg" t="Include" />
-              <e p="miniSD.png" t="Include" />
-              <e p="miniSD.svg" t="Include" />
               <e p="NeoGeoCD.png" t="Include" />
               <e p="NeoGeoCD.svg" t="Include" />
               <e p="Nintendo3DSGameCard.png" t="Include" />
@@ -1143,18 +1143,6 @@
               <e p="PD650.svg" t="Include" />
               <e p="PD650_WORM.png" t="Include" />
               <e p="PD650_WORM.svg" t="Include" />
-              <e p="Pippin.png" t="Include" />
-              <e p="Pippin.svg" t="Include" />
-              <e p="Playdia.png" t="Include" />
-              <e p="Playdia.svg" t="Include" />
-              <e p="PlayStationMemoryCard.png" t="Include" />
-              <e p="PlayStationMemoryCard.svg" t="Include" />
-              <e p="PlayStationMemoryCard2.png" t="Include" />
-              <e p="PlayStationMemoryCard2.svg" t="Include" />
-              <e p="PlayStationVitaGameCard.png" t="Include" />
-              <e p="PlayStationVitaGameCard.svg" t="Include" />
-              <e p="PocketZip.png" t="Include" />
-              <e p="PocketZip.svg" t="Include" />
               <e p="PS1CD.png" t="Include" />
               <e p="PS1CD.svg" t="Include" />
               <e p="PS2CD.png" t="Include" />
@@ -1167,6 +1155,18 @@
               <e p="PS3DVD.svg" t="Include" />
               <e p="PS4BD.png" t="Include" />
               <e p="PS4BD.svg" t="Include" />
+              <e p="Pippin.png" t="Include" />
+              <e p="Pippin.svg" t="Include" />
+              <e p="PlayStationMemoryCard.png" t="Include" />
+              <e p="PlayStationMemoryCard.svg" t="Include" />
+              <e p="PlayStationMemoryCard2.png" t="Include" />
+              <e p="PlayStationMemoryCard2.svg" t="Include" />
+              <e p="PlayStationVitaGameCard.png" t="Include" />
+              <e p="PlayStationVitaGameCard.svg" t="Include" />
+              <e p="Playdia.png" t="Include" />
+              <e p="Playdia.svg" t="Include" />
+              <e p="PocketZip.png" t="Include" />
+              <e p="PocketZip.svg" t="Include" />
               <e p="SACD.png" t="Include" />
               <e p="SACD.svg" t="Include" />
               <e p="SAIT1.png" t="Include" />
@@ -1175,14 +1175,14 @@
               <e p="SAIT2.svg" t="Include" />
               <e p="SATURNCD.png" t="Include" />
               <e p="SATURNCD.svg" t="Include" />
+              <e p="SVCD.png" t="Include" />
+              <e p="SVCD.svg" t="Include" />
               <e p="SecureDigital.png" t="Include" />
               <e p="SecureDigital.svg" t="Include" />
               <e p="SmartMedia.png" t="Include" />
               <e p="SmartMedia.svg" t="Include" />
               <e p="SuperCDROM2.png" t="Include" />
               <e p="SuperCDROM2.svg" t="Include" />
-              <e p="SVCD.png" t="Include" />
-              <e p="SVCD.svg" t="Include" />
               <e p="SwitchGameCard.png" t="Include" />
               <e p="SwitchGameCard.svg" t="Include" />
               <e p="ThreeDO.png" t="Include" />
@@ -1205,10 +1205,12 @@
               <e p="ZIP100.svg" t="Include" />
               <e p="ZIP250.png" t="Include" />
               <e p="ZIP250.svg" t="Include" />
+              <e p="miniSD.png" t="Include" />
+              <e p="miniSD.svg" t="Include" />
             </e>
           </e>
+          <e p="aaru-logo.png" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
         <e p="ConsoleHandler.cs" t="Include" />
         <e p="Controls" t="Include">
           <e p="BlockMap.cs" t="Include" />
@@ -1216,16 +1218,12 @@
           <e p="LineChart.cs" t="Include" />
           <e p="SvgImageView.cs" t="Include" />
         </e>
-        <e p="Forms" t="Include">
-          <e p="frmDump.xeto" t="Include" />
-          <e p="frmDump.xeto.cs" t="Include" />
-        </e>
         <e p="Models" t="Include">
           <e p="AssemblyModel.cs" t="Include" />
           <e p="ChecksumModel.cs" t="Include" />
           <e p="DeviceModel.cs" t="Include" />
-          <e p="DevicesRootModel.cs" t="Include" />
           <e p="DeviceStatsModel.cs" t="Include" />
+          <e p="DevicesRootModel.cs" t="Include" />
           <e p="DumpHardwareModel.cs" t="Include" />
           <e p="EncodingModel.cs" t="Include" />
           <e p="FileModel.cs" t="Include" />
@@ -1248,16 +1246,6 @@
           <e p="SubdirectoryModel.cs" t="Include" />
           <e p="TrackEntropyModel.cs" t="Include" />
         </e>
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Gui.AssemblyInfo.cs" t="Include" />
-              <e p="Avalonia" t="Include">
-                <e p="resources" t="Include" />
-              </e>
-            </e>
-          </e>
-        </e>
         <e p="Panels" t="Include">
           <e p="DeviceInfoPanel.xaml" t="Include" />
           <e p="DeviceInfoPanel.xaml.cs" t="Include" />
@@ -1314,6 +1302,7 @@
           <e p="ImageVerifyViewModel.cs" t="Include" />
           <e p="LicenseDialogViewModel.cs" t="Include" />
           <e p="MainWindowViewModel.cs" t="Include" />
+          <e p="MediaDumpViewModel.cs" t="Include" />
           <e p="MediaInfoViewModel.cs" t="Include" />
           <e p="MediaScanViewModel.cs" t="Include" />
           <e p="PartitionViewModel.cs" t="Include" />
@@ -1352,6 +1341,8 @@
           <e p="LicenseDialog.xaml.cs" t="Include" />
           <e p="MainWindow.xaml" t="Include" />
           <e p="MainWindow.xaml.cs" t="Include" />
+          <e p="MediaDumpWindow.xaml" t="Include" />
+          <e p="MediaDumpWindow.xaml.cs" t="Include" />
           <e p="MediaScanWindow.xaml" t="Include" />
           <e p="MediaScanWindow.xaml.cs" t="Include" />
           <e p="PluginsDialog.xaml" t="Include" />
@@ -1365,6 +1356,17 @@
           <e p="ViewSectorWindow.xaml" t="Include" />
           <e p="ViewSectorWindow.xaml.cs" t="Include" />
         </e>
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Gui.AssemblyInfo.cs" t="Include" />
+              <e p="Avalonia" t="Include">
+                <e p="resources" t="Include" />
+              </e>
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Helpers" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
@@ -1373,7 +1375,6 @@
         <e p="ArrayFill.cs" t="Include" />
         <e p="ArrayIsEmpty.cs" t="Include" />
         <e p="BigEndianBitConverter.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="BitEndian.cs" t="Include" />
         <e p="CHS.cs" t="Include" />
         <e p="CompareBytes.cs" t="Include" />
@@ -1381,6 +1382,10 @@
         <e p="DateHandlers.cs" t="Include" />
         <e p="Marshal.cs" t="Include" />
         <e p="MarshallingPropertiesAttribute.cs" t="Include" />
+        <e p="PrintHex.cs" t="Include" />
+        <e p="StringHandlers.cs" t="Include" />
+        <e p="Swapping.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp3.0" t="Include">
@@ -1388,9 +1393,6 @@
             </e>
           </e>
         </e>
-        <e p="PrintHex.cs" t="Include" />
-        <e p="StringHandlers.cs" t="Include" />
-        <e p="Swapping.cs" t="Include" />
       </e>
       <e p="Aaru.Images" t="IncludeRecursive">
         <e p="Aaru.Images.csproj" t="IncludeRecursive" />
@@ -1473,7 +1475,16 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
+        <e p="BLU" t="Include">
+          <e p="BLU.cs" t="Include" />
+          <e p="Constants.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+          <e p="Verify.cs" t="Include" />
+          <e p="Write.cs" t="Include" />
+        </e>
         <e p="BlindWrite4" t="Include">
           <e p="BlindWrite4.cs" t="Include" />
           <e p="Constants.cs" t="Include" />
@@ -1495,16 +1506,6 @@
           <e p="Structs.cs" t="Include" />
           <e p="Verify.cs" t="Include" />
         </e>
-        <e p="BLU" t="Include">
-          <e p="BLU.cs" t="Include" />
-          <e p="Constants.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-          <e p="Verify.cs" t="Include" />
-          <e p="Write.cs" t="Include" />
-        </e>
         <e p="CDRDAO" t="Include">
           <e p="CDRDAO.cs" t="Include" />
           <e p="Constants.cs" t="Include" />
@@ -1538,6 +1539,16 @@
           <e p="Structs.cs" t="Include" />
           <e p="Verify.cs" t="Include" />
         </e>
+        <e p="CPCDSK" t="Include">
+          <e p="CPCDSK.cs" t="Include" />
+          <e p="Constants.cs" t="Include" />
+          <e p="Helpers.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+        </e>
         <e p="CisCopy" t="Include">
           <e p="CisCopy.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -1575,16 +1586,6 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
-        <e p="CPCDSK" t="Include">
-          <e p="Constants.cs" t="Include" />
-          <e p="CPCDSK.cs" t="Include" />
-          <e p="Helpers.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Structs.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-        </e>
         <e p="D88" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="D88.cs" t="Include" />
@@ -1675,8 +1676,8 @@
         <e p="IMD" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
           <e p="IMD.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
           <e p="Properties.cs" t="Include" />
           <e p="Read.cs" t="Include" />
           <e p="Unsupported.cs" t="Include" />
@@ -1710,17 +1711,6 @@
           <e p="Structs.cs" t="Include" />
           <e p="Unsupported.cs" t="Include" />
         </e>
-        <e p="Nero" t="Include">
-          <e p="Constants.cs" t="Include" />
-          <e p="Enums.cs" t="Include" />
-          <e p="Helpers.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Nero.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Structs.cs" t="Include" />
-          <e p="Verify.cs" t="Include" />
-        </e>
         <e p="NHDr0" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Identify.cs" t="Include" />
@@ -1731,12 +1721,16 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Images.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
+        <e p="Nero" t="Include">
+          <e p="Constants.cs" t="Include" />
+          <e p="Enums.cs" t="Include" />
+          <e p="Helpers.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Nero.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Verify.cs" t="Include" />
         </e>
         <e p="Parallels" t="Include">
           <e p="Constants.cs" t="Include" />
@@ -1920,16 +1914,6 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="VHDX.cs" t="Include" />
         </e>
-        <e p="Virtual98" t="Include">
-          <e p="Constants.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Structs.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-          <e p="Virtual98.cs" t="Include" />
-          <e p="Write.cs" t="Include" />
-        </e>
         <e p="VMware" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Identify.cs" t="Include" />
@@ -1940,6 +1924,16 @@
           <e p="VMware.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
+        <e p="Virtual98" t="Include">
+          <e p="Constants.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+          <e p="Virtual98.cs" t="Include" />
+          <e p="Write.cs" t="Include" />
+        </e>
         <e p="WCDiskImage" t="Include">
           <e p="Identify.cs" t="Include" />
           <e p="Properties.cs" t="Include" />
@@ -1958,6 +1952,14 @@
           <e p="Write.cs" t="Include" />
           <e p="ZZZRawImage.cs" t="Include" />
         </e>
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Images.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Partitions" t="IncludeRecursive">
         <e p="Aaru.Partitions.csproj" t="IncludeRecursive" />
@@ -1965,7 +1967,6 @@
         <e p="AppleMap.cs" t="Include" />
         <e p="Apricot.cs" t="Include" />
         <e p="Atari.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="BSD.cs" t="Include" />
         <e p="DEC.cs" t="Include" />
         <e p="DragonFlyBSD.cs" t="Include" />
@@ -1973,13 +1974,6 @@
         <e p="Human68k.cs" t="Include" />
         <e p="MBR.cs" t="Include" />
         <e p="NeXT.cs" t="Include" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
-              <e p="Aaru.Partitions.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
         <e p="PC98.cs" t="Include" />
         <e p="Plan9.cs" t="Include" />
         <e p="RDB.cs" t="Include" />
@@ -1989,11 +1983,20 @@
         <e p="Sun.cs" t="Include" />
         <e p="UNIX.cs" t="Include" />
         <e p="VTOC.cs" t="Include" />
-        <e p="Xbox.cs" t="Include" />
         <e p="XENIX.cs" t="Include" />
+        <e p="Xbox.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Partitions.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
       </e>
       <e p="Aaru.Settings" t="IncludeRecursive">
         <e p="Aaru.Settings.csproj" t="IncludeRecursive" />
+        <e p="Settings.cs" t="Include" />
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
@@ -2002,13 +2005,19 @@
             </e>
           </e>
         </e>
-        <e p="Settings.cs" t="Include" />
       </e>
       <e p="Aaru.sln" t="IncludeFlat" />
-      <e p="Changelog.md" t="Include" />
-      <e p="CICMMetadata\dotnet\cicm.cs" t="Include" />
+      <e p="CICMMetadata/dotnet/cicm.cs" t="Include" />
       <e p="CONTRIBUTING.md" t="Include" />
-      <e p="cuetoolsnet\CUETools.Codecs" t="Include">
+      <e p="Changelog.md" t="Include" />
+      <e p="LICENSE" t="Include" />
+      <e p="LICENSE.LGPL" t="Include" />
+      <e p="LICENSE.MIT" t="Include" />
+      <e p="NEEDED.md" t="Include" />
+      <e p="NEEDINFO.md" t="Include" />
+      <e p="README.md" t="Include" />
+      <e p="TODO.md" t="Include" />
+      <e p="cuetoolsnet/CUETools.Codecs" t="Include">
         <e p="AudioBuffer.cs" t="Include" />
         <e p="AudioDecoderClass.cs" t="Include" />
         <e p="AudioEncoderClass.cs" t="Include" />
@@ -2042,8 +2051,8 @@
         <e p="LpcContext.cs" t="Include" />
         <e p="NullStream.cs" t="Include" />
         <e p="PlaybackState.cs" t="Include" />
-        <e p="SilenceGenerator.cs" t="Include" />
         <e p="SRDescriptionAttribute.cs" t="Include" />
+        <e p="SilenceGenerator.cs" t="Include" />
         <e p="UserDefinedEncoderSettings.cs" t="Include" />
         <e p="UserDefinedReader.cs" t="Include" />
         <e p="UserDefinedWriter.cs" t="Include" />
@@ -2051,7 +2060,7 @@
         <e p="WAVWriter.cs" t="Include" />
         <e p="WAVWriterSettings.cs" t="Include" />
       </e>
-      <e p="cuetoolsnet\CUETools.Codecs.FLAKE" t="Include">
+      <e p="cuetoolsnet/CUETools.Codecs.FLAKE" t="Include">
         <e p="ChannelMode.cs" t="Include" />
         <e p="FlacFrame.cs" t="Include" />
         <e p="FlacSubframe.cs" t="Include" />
@@ -2074,14 +2083,7 @@
         <e p="WindowFunction.cs" t="Include" />
         <e p="WindowMethod.cs" t="Include" />
       </e>
-      <e p="LICENSE" t="Include" />
-      <e p="LICENSE.LGPL" t="Include" />
-      <e p="LICENSE.MIT" t="Include" />
-      <e p="NEEDED.md" t="Include" />
-      <e p="NEEDINFO.md" t="Include" />
       <e p="packages" t="ExcludeRecursive" />
-      <e p="README.md" t="Include" />
-      <e p="TODO.md" t="Include" />
     </e>
   </component>
 </project>
\ No newline at end of file
diff --git a/Aaru.Gui/Forms/frmDump.xeto b/Aaru.Gui/Forms/frmDump.xeto
deleted file mode 100644
index fdce69a77..000000000
--- a/Aaru.Gui/Forms/frmDump.xeto
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-// /***************************************************************************
-// The Disc Image Chef
-// ============================================================================
-//
-// Filename       : frmDump.xeto
-// Author(s)      : Natalia Portillo <claunia@claunia.com>
-//
-// Component      : Media dump window.
-//
-// ==[ Description ] ==========================================================
-//
-//     Defines the structure for the media dump GUI window.
-//
-// ==[ License ] ==============================================================
-//
-//     This program is free software: you can redistribute it and/or modify
-//     it under the terms of the GNU General public License as
-//     published by the Free Software Foundation, either version 3 of the
-//     License, or (at your option) any later version.
-//
-//     This program is distributed in the hope that it will be useful,
-//     but WITHOUT ANY WARRANTY; without even the implied warranty of
-//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//     GNU General public License for more details.
-//
-//     You should have received a copy of the GNU General public License
-//     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// ============================================================================
-// Copyright © 2011-2020 Natalia Portillo
-// ****************************************************************************/
--->
-<Form xmlns="http://schema.picoe.ca/eto.forms" Title="Aaru" ClientSize="600, 450" Padding="10">
-    <StackLayout Orientation="Vertical" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
-        <StackLayout Orientation="Vertical" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
-                     ID="stkOptions">
-            <Label Text="Output format"/>
-            <ComboBox ID="cmbFormat" ReadOnly="True" SelectedIndexChanged="OnCmbFormatSelectedIndexChanged"/>
-            <StackLayout Orientation="Horizontal" HorizontalContentAlignment="Stretch"
-                         VerticalContentAlignment="Stretch">
-                <StackLayoutItem Expand="True">
-                    <TextBox ID="txtDestination" ReadOnly="True"/>
-                </StackLayoutItem>
-                <Button ID="btnDestination" Text="Choose..." Click="OnBtnDestinationClick" Enabled="False"/>
-            </StackLayout>
-            <CheckBox ID="chkStopOnError" Text="Stop media dump on first error"/>
-            <CheckBox ID="chkForce" Text="Continue dumping whatever happens"/>
-            <StackLayout Orientation="Horizontal" HorizontalContentAlignment="Stretch"
-                         VerticalContentAlignment="Stretch">
-                <NumericStepper ID="stpRetries" MinValue="0"/>
-                <Label Text="Retry passes"/>
-            </StackLayout>
-            <CheckBox ID="chkPersistent" Text="Try to recover partial or incorrect data"/>
-            <CheckBox ID="chkResume" Text="Create/use resume mapfile" CheckedChanged="OnChkResumeCheckedChanged"/>
-            <CheckBox ID="chkTrack1Pregap" Text="Try to read track 1 pregap"/>
-            <StackLayout Orientation="Horizontal" HorizontalContentAlignment="Stretch"
-                         VerticalContentAlignment="Stretch">
-                <NumericStepper ID="stpSkipped" MinValue="1"/>
-                <Label Text="Skipped sectors on error"/>
-            </StackLayout>
-            <CheckBox ID="chkSidecar" Text="Create CICM XML metadata sidecar"
-                      CheckedChanged="OnChkSidecarCheckedChanged"/>
-            <CheckBox ID="chkTrim" Text="Trim errors from skipped sectors"/>
-            <CheckBox ID="chkExistingMetadata" Text="Take metadata from existing CICM XML sidecar"
-                      CheckedChanged="OnChkExistingMetadataCheckedChanged"/>
-            <Label ID="lblEncoding" Text="Encoding to use on metadata sidecar creation"/>
-            <ComboBox ID="cmbEncoding" ReadOnly="True"/>
-            <GroupBox ID="grpOptions" Text="Options" Visible="False"/>
-        </StackLayout>
-        <StackLayout Orientation="Vertical" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
-                     ID="stkProgress" Visible="False">
-            <StackLayoutItem HorizontalAlignment="Left" Expand="True">
-                <StackLayout Orientation="Horizontal">
-                    <Label ID="lblDestinationLabel">Writing image to:</Label>
-                    <Label ID="lblDestination"/>
-                </StackLayout>
-            </StackLayoutItem>
-            <StackLayoutItem Expand="True">
-                <GroupBox Text="Log">
-                    <TextArea ID="txtLog" ReadOnly="True"/>
-                </GroupBox>
-            </StackLayoutItem>
-            <StackLayout Orientation="Vertical" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
-                         ID="stkProgress1" Visible="False">
-                <StackLayoutItem HorizontalAlignment="Center" Expand="True">
-                    <Label ID="lblProgress"/>
-                </StackLayoutItem>
-                <StackLayoutItem HorizontalAlignment="Center" Expand="True">
-                    <ProgressBar ID="prgProgress"/>
-                </StackLayoutItem>
-            </StackLayout>
-            <StackLayout Orientation="Vertical" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
-                         ID="stkProgress2" Visible="False">
-                <StackLayoutItem HorizontalAlignment="Center" Expand="True">
-                    <Label ID="lblProgress2"/>
-                </StackLayoutItem>
-                <StackLayoutItem HorizontalAlignment="Center" Expand="True">
-                    <ProgressBar ID="prgProgress2"/>
-                </StackLayoutItem>
-            </StackLayout>
-        </StackLayout>
-        <StackLayoutItem HorizontalAlignment="Right" Expand="True">
-            <StackLayout Orientation="Horizontal" HorizontalContentAlignment="Right" VerticalContentAlignment="Bottom">
-                <Button ID="btnStart" Text="Start" Click="OnBtnDumpClick"/>
-                <Button ID="btnClose" Text="Close" Click="OnBtnCloseClick"/>
-                <Button ID="btnStop" Text="Stop" Visible="False" Click="OnBtnStopClick"/>
-            </StackLayout>
-        </StackLayoutItem>
-    </StackLayout>
-</Form>
\ No newline at end of file
diff --git a/Aaru.Gui/Forms/frmDump.xeto.cs b/Aaru.Gui/Forms/frmDump.xeto.cs
deleted file mode 100644
index 128c6d88c..000000000
--- a/Aaru.Gui/Forms/frmDump.xeto.cs
+++ /dev/null
@@ -1,684 +0,0 @@
-// /***************************************************************************
-// Aaru Data Preservation Suite
-// ----------------------------------------------------------------------------
-//
-// Filename       : frmDump.xeto.cs
-// Author(s)      : Natalia Portillo <claunia@claunia.com>
-//
-// Component      : Media dump window.
-//
-// --[ Description ] ----------------------------------------------------------
-//
-//     Implements the media dump GUI window.
-//
-// --[ License ] --------------------------------------------------------------
-//
-//     This program is free software: you can redistribute it and/or modify
-//     it under the terms of the GNU General public License as
-//     published by the Free Software Foundation, either version 3 of the
-//     License, or (at your option) any later version.
-//
-//     This program is distributed in the hope that it will be useful,
-//     but WITHOUT ANY WARRANTY; without even the implied warranty of
-//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//     GNU General public License for more details.
-//
-//     You should have received a copy of the GNU General public License
-//     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// ----------------------------------------------------------------------------
-// Copyright © 2011-2020 Natalia Portillo
-// ****************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Xml.Serialization;
-using Aaru.CommonTypes;
-using Aaru.CommonTypes.Enums;
-using Aaru.CommonTypes.Interfaces;
-using Aaru.CommonTypes.Metadata;
-using Aaru.Core;
-using Aaru.Core.Devices.Dumping;
-using Aaru.Core.Logging;
-using Aaru.Core.Media.Info;
-using Aaru.Devices;
-using Eto.Forms;
-using Eto.Serialization.Xaml;
-using Schemas;
-using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
-using MediaType = Aaru.CommonTypes.MediaType;
-
-// ReSharper disable UnusedMember.Local
-
-namespace Aaru.Gui.Forms
-{
-    public class frmDump : Form
-    {
-        readonly string  _devicePath;
-        Device           _dev;
-        Dump             _dumper;
-        string           _outputPrefix;
-        Resume           _resume;
-        CICMMetadataType _sidecar;
-
-        public frmDump(string devicePath, DeviceInfo deviceInfo, ScsiInfo scsiInfo = null)
-        {
-            MediaType mediaType;
-            XamlReader.Load(this);
-
-            // Defaults
-            chkStopOnError.Checked      = false;
-            chkForce.Checked            = false;
-            chkPersistent.Checked       = true;
-            chkResume.Checked           = true;
-            chkTrack1Pregap.Checked     = false;
-            chkSidecar.Checked          = true;
-            chkTrim.Checked             = true;
-            chkExistingMetadata.Checked = false;
-            stpRetries.Value            = 5;
-            stpSkipped.Value            = 512;
-
-            if(scsiInfo != null)
-                mediaType = scsiInfo.MediaType;
-            else
-                switch(deviceInfo.Type)
-                {
-                    case DeviceType.SecureDigital:
-                        mediaType = MediaType.SecureDigital;
-
-                        break;
-                    case DeviceType.MMC:
-                        mediaType = MediaType.MMC;
-
-                        break;
-                    default:
-                        if(deviceInfo.IsPcmcia)
-                            mediaType = MediaType.PCCardTypeII;
-                        else if(deviceInfo.IsCompactFlash)
-                            mediaType = MediaType.CompactFlash;
-                        else
-                            mediaType = MediaType.GENERIC_HDD;
-
-                        break;
-                }
-
-            ObservableCollection<IWritableImage> lstPlugins = new ObservableCollection<IWritableImage>();
-            PluginBase                           plugins    = GetPluginBase.Instance;
-
-            foreach(IWritableImage plugin in
-                plugins.WritableImages.Values.Where(p => p.SupportedMediaTypes.Contains(mediaType)))
-                lstPlugins.Add(plugin);
-
-            cmbFormat.ItemTextBinding = Binding.Property((IWritableImage p) => p.Name);
-            cmbFormat.ItemKeyBinding  = Binding.Property((IWritableImage p) => p.Id.ToString());
-            cmbFormat.DataStore       = lstPlugins;
-
-            List<CommonEncodingInfo> encodings = Encoding.GetEncodings().Select(info => new CommonEncodingInfo
-            {
-                Name = info.Name, DisplayName = info.GetEncoding().EncodingName
-            }).ToList();
-
-            encodings.AddRange(Claunia.Encoding.Encoding.GetEncodings().Select(info => new CommonEncodingInfo
-            {
-                Name = info.Name, DisplayName = info.DisplayName
-            }));
-
-            ObservableCollection<CommonEncodingInfo> lstEncodings = new ObservableCollection<CommonEncodingInfo>();
-
-            foreach(CommonEncodingInfo info in encodings.OrderBy(t => t.DisplayName))
-                lstEncodings.Add(info);
-
-            cmbEncoding.ItemTextBinding = Binding.Property((CommonEncodingInfo p) => p.DisplayName);
-            cmbEncoding.ItemKeyBinding  = Binding.Property((CommonEncodingInfo p) => p.Name);
-            cmbEncoding.DataStore       = lstEncodings;
-
-            switch(mediaType)
-            {
-                case MediaType.CD:
-                case MediaType.CDDA:
-                case MediaType.CDG:
-                case MediaType.CDEG:
-                case MediaType.CDI:
-                case MediaType.CDROM:
-                case MediaType.CDROMXA:
-                case MediaType.CDPLUS:
-                case MediaType.CDMO:
-                case MediaType.CDR:
-                case MediaType.CDRW:
-                case MediaType.CDMRW:
-                case MediaType.VCD:
-                case MediaType.SVCD:
-                case MediaType.PCD:
-                case MediaType.DDCD:
-                case MediaType.DDCDR:
-                case MediaType.DDCDRW:
-                case MediaType.DTSCD:
-                case MediaType.CDMIDI:
-                case MediaType.CDV:
-                case MediaType.CDIREADY:
-                case MediaType.FMTOWNS:
-                case MediaType.PS1CD:
-                case MediaType.PS2CD:
-                case MediaType.MEGACD:
-                case MediaType.SATURNCD:
-                case MediaType.GDROM:
-                case MediaType.GDR:
-                case MediaType.MilCD:
-                case MediaType.SuperCDROM2:
-                case MediaType.JaguarCD:
-                case MediaType.ThreeDO:
-                case MediaType.PCFX:
-                case MediaType.NeoGeoCD:
-                case MediaType.CDTV:
-                case MediaType.CD32:
-                case MediaType.Playdia:
-                case MediaType.Pippin:
-                case MediaType.VideoNow:
-                case MediaType.VideoNowColor:
-                case MediaType.VideoNowXp:
-                    chkTrack1Pregap.Visible = true;
-
-                    break;
-                default:
-                    chkTrack1Pregap.Visible = false;
-
-                    break;
-            }
-
-            _devicePath = devicePath;
-        }
-
-        void OnCmbFormatSelectedIndexChanged(object sender, EventArgs e)
-        {
-            txtDestination.Text = "";
-
-            if(!(cmbFormat.SelectedValue is IWritableImage plugin))
-            {
-                grpOptions.Visible     = false;
-                btnDestination.Enabled = false;
-
-                return;
-            }
-
-            btnDestination.Enabled = true;
-
-            if(!plugin.SupportedOptions.Any())
-            {
-                grpOptions.Content = null;
-                grpOptions.Visible = false;
-
-                return;
-            }
-
-            grpOptions.Visible = true;
-
-            var stkOptions = new StackLayout
-            {
-                Orientation = Orientation.Vertical
-            };
-
-            foreach((string name, Type type, string description, object @default) option in plugin.SupportedOptions)
-                switch(option.type.ToString())
-                {
-                    case "System.Boolean":
-                        var optBoolean = new CheckBox();
-                        optBoolean.ID      = "opt" + option.name;
-                        optBoolean.Text    = option.description;
-                        optBoolean.Checked = (bool)option.@default;
-                        stkOptions.Items.Add(optBoolean);
-
-                        break;
-                    case "System.SByte":
-                    case "System.Int16":
-                    case "System.Int32":
-                    case "System.Int64":
-                        var stkNumber = new StackLayout();
-                        stkNumber.Orientation = Orientation.Horizontal;
-                        var optNumber = new NumericStepper();
-                        optNumber.ID    = "opt" + option.name;
-                        optNumber.Value = Convert.ToDouble(option.@default);
-                        stkNumber.Items.Add(optNumber);
-                        var lblNumber = new Label();
-                        lblNumber.Text = option.description;
-                        stkNumber.Items.Add(lblNumber);
-                        stkOptions.Items.Add(stkNumber);
-
-                        break;
-                    case "System.Byte":
-                    case "System.UInt16":
-                    case "System.UInt32":
-                    case "System.UInt64":
-                        var stkUnsigned = new StackLayout();
-                        stkUnsigned.Orientation = Orientation.Horizontal;
-                        var optUnsigned = new NumericStepper();
-                        optUnsigned.ID       = "opt" + option.name;
-                        optUnsigned.MinValue = 0;
-                        optUnsigned.Value    = Convert.ToDouble(option.@default);
-                        stkUnsigned.Items.Add(optUnsigned);
-                        var lblUnsigned = new Label();
-                        lblUnsigned.Text = option.description;
-                        stkUnsigned.Items.Add(lblUnsigned);
-                        stkOptions.Items.Add(stkUnsigned);
-
-                        break;
-                    case "System.Single":
-                    case "System.Double":
-                        var stkFloat = new StackLayout();
-                        stkFloat.Orientation = Orientation.Horizontal;
-                        var optFloat = new NumericStepper();
-                        optFloat.ID            = "opt" + option.name;
-                        optFloat.DecimalPlaces = 2;
-                        optFloat.Value         = Convert.ToDouble(option.@default);
-                        stkFloat.Items.Add(optFloat);
-                        var lblFloat = new Label();
-                        lblFloat.Text = option.description;
-                        stkFloat.Items.Add(lblFloat);
-                        stkOptions.Items.Add(stkFloat);
-
-                        break;
-                    case "System.Guid":
-                        // TODO
-                        break;
-                    case "System.String":
-                        var stkString = new StackLayout();
-                        stkString.Orientation = Orientation.Horizontal;
-                        var lblString = new Label();
-                        lblString.Text = option.description;
-                        stkString.Items.Add(lblString);
-                        var optString = new TextBox();
-                        optString.ID   = "opt" + option.name;
-                        optString.Text = (string)option.@default;
-                        stkString.Items.Add(optString);
-                        stkOptions.Items.Add(stkString);
-
-                        break;
-                }
-
-            grpOptions.Content = stkOptions;
-        }
-
-        void OnBtnDestinationClick(object sender, EventArgs e)
-        {
-            if(!(cmbFormat.SelectedValue is IWritableImage plugin))
-                return;
-
-            var dlgDestination = new SaveFileDialog
-            {
-                Title = "Choose destination file"
-            };
-
-            dlgDestination.Filters.Add(new FileFilter(plugin.Name, plugin.KnownExtensions.ToArray()));
-
-            DialogResult result = dlgDestination.ShowDialog(this);
-
-            if(result != DialogResult.Ok)
-            {
-                txtDestination.Text = "";
-                _outputPrefix       = null;
-
-                return;
-            }
-
-            if(string.IsNullOrEmpty(Path.GetExtension(dlgDestination.FileName)))
-                dlgDestination.FileName += plugin.KnownExtensions.First();
-
-            txtDestination.Text = dlgDestination.FileName;
-
-            _outputPrefix = Path.Combine(Path.GetDirectoryName(dlgDestination.FileName),
-                                         Path.GetFileNameWithoutExtension(dlgDestination.FileName));
-
-            chkResume.Checked = true;
-        }
-
-        void OnChkSidecarCheckedChanged(object sender, EventArgs e)
-        {
-            cmbEncoding.Visible = chkSidecar.Checked.Value;
-            lblEncoding.Visible = chkSidecar.Checked.Value;
-        }
-
-        void OnChkExistingMetadataCheckedChanged(object sender, EventArgs e)
-        {
-            if(chkExistingMetadata.Checked == false)
-            {
-                _sidecar = null;
-
-                return;
-            }
-
-            var dlgMetadata = new OpenFileDialog
-            {
-                Title = "Choose existing metadata sidecar", CheckFileExists = true
-            };
-
-            dlgMetadata.Filters.Add(new FileFilter("CICM XML metadata", ".xml"));
-
-            DialogResult result = dlgMetadata.ShowDialog(this);
-
-            if(result != DialogResult.Ok)
-            {
-                chkExistingMetadata.Checked = false;
-
-                return;
-            }
-
-            var sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
-
-            try
-            {
-                var sr = new StreamReader(dlgMetadata.FileName);
-                _sidecar = (CICMMetadataType)sidecarXs.Deserialize(sr);
-                sr.Close();
-            }
-            catch
-            {
-                Eto.Forms.MessageBox.Show("Incorrect metadata sidecar file...", MessageBoxType.Error);
-                chkExistingMetadata.Checked = false;
-            }
-        }
-
-        void OnChkResumeCheckedChanged(object sender, EventArgs e)
-        {
-            if(chkResume.Checked == false)
-                return;
-
-            if(_outputPrefix != null)
-                CheckResumeFile();
-        }
-
-        void CheckResumeFile()
-        {
-            _resume = null;
-            var xs = new XmlSerializer(typeof(Resume));
-
-            try
-            {
-                var sr = new StreamReader(_outputPrefix + ".resume.xml");
-                _resume = (Resume)xs.Deserialize(sr);
-                sr.Close();
-            }
-            catch
-            {
-                Eto.Forms.MessageBox.Show("Incorrect resume file, cannot use it...", MessageBoxType.Error);
-                chkResume.Checked = false;
-
-                return;
-            }
-
-            if(_resume           == null              ||
-               _resume.NextBlock <= _resume.LastBlock ||
-               (_resume.BadBlocks.Count != 0 && !_resume.Tape))
-                return;
-
-            Eto.Forms.MessageBox.Show("Media already dumped correctly, please choose another destination...",
-                                      MessageBoxType.Warning);
-
-            chkResume.Checked = false;
-        }
-
-        void OnBtnCloseClick(object sender, EventArgs e) => Close();
-
-        void OnBtnStopClick(object sender, EventArgs e)
-        {
-            btnStop.Enabled = false;
-            _dumper.Abort();
-        }
-
-        void OnBtnDumpClick(object sender, EventArgs e)
-        {
-            txtLog.Text            = "";
-            btnClose.Visible       = false;
-            btnStart.Visible       = false;
-            btnStop.Visible        = true;
-            btnStop.Enabled        = true;
-            stkProgress.Visible    = true;
-            btnDestination.Visible = false;
-            stkOptions.Visible     = false;
-
-            UpdateStatus("Opening device...");
-
-            try
-            {
-                _dev = new Device(_devicePath);
-
-                if(_dev.IsRemote)
-                    Statistics.AddRemote(_dev.RemoteApplication, _dev.RemoteVersion, _dev.RemoteOperatingSystem,
-                                         _dev.RemoteOperatingSystemVersion, _dev.RemoteArchitecture);
-
-                if(_dev.Error)
-                {
-                    StoppingErrorMessage($"Error {_dev.LastError} opening device.");
-
-                    return;
-                }
-            }
-            catch(Exception exception)
-            {
-                StoppingErrorMessage($"Exception {exception.Message} opening device.");
-
-                return;
-            }
-
-            Statistics.AddDevice(_dev);
-            Statistics.AddCommand("dump-media");
-
-            if(!(cmbFormat.SelectedValue is IWritableImage outputFormat))
-            {
-                StoppingErrorMessage("Cannot open output plugin.");
-
-                return;
-            }
-
-            Encoding encoding = null;
-
-            if(cmbEncoding.SelectedValue is CommonEncodingInfo encodingInfo)
-                try
-                {
-                    encoding = Claunia.Encoding.Encoding.GetEncoding(encodingInfo.Name);
-                }
-                catch(ArgumentException)
-                {
-                    StoppingErrorMessage("Specified encoding is not supported.");
-
-                    return;
-                }
-
-            Dictionary<string, string> parsedOptions = new Dictionary<string, string>();
-
-            if(grpOptions.Content is StackLayout stkFormatOptions)
-                foreach(Control option in stkFormatOptions.Children)
-                {
-                    string value;
-
-                    switch(option)
-                    {
-                        case CheckBox optBoolean:
-                            value = optBoolean.Checked?.ToString();
-
-                            break;
-                        case NumericStepper optNumber:
-                            value = optNumber.Value.ToString(CultureInfo.CurrentCulture);
-
-                            break;
-                        case TextBox optString:
-                            value = optString.Text;
-
-                            break;
-                        default: continue;
-                    }
-
-                    string key = option.ID.Substring(3);
-
-                    parsedOptions.Add(key, value);
-                }
-
-            var dumpLog = new DumpLog(_outputPrefix + ".log", _dev, false);
-
-            dumpLog.WriteLine("Output image format: {0}.", outputFormat.Name);
-
-            _dumper = new Dump(chkResume.Checked == true, _dev, _devicePath, outputFormat,
-                               (ushort)stpRetries.Value,
-                               chkForce.Checked       == true, false, chkPersistent.Checked == true,
-                               chkStopOnError.Checked == true, _resume, dumpLog, encoding, _outputPrefix,
-                               txtDestination.Text, parsedOptions, _sidecar, (uint)stpSkipped.Value,
-                               chkExistingMetadata.Checked == false, chkTrim.Checked == false,
-                               chkTrack1Pregap.Checked     == true, true, false, DumpSubchannel.Any, 0, false);
-
-            new Thread(DoWork).Start();
-        }
-
-        void DoWork()
-        {
-            _dumper.UpdateStatus         += UpdateStatus;
-            _dumper.ErrorMessage         += ErrorMessage;
-            _dumper.StoppingErrorMessage += StoppingErrorMessage;
-            _dumper.PulseProgress        += PulseProgress;
-            _dumper.InitProgress         += InitProgress;
-            _dumper.UpdateProgress       += UpdateProgress;
-            _dumper.EndProgress          += EndProgress;
-            _dumper.InitProgress2        += InitProgress2;
-            _dumper.UpdateProgress2      += UpdateProgress2;
-            _dumper.EndProgress2         += EndProgress2;
-
-            _dumper.Start();
-
-            _dev.Close();
-
-            WorkFinished();
-        }
-
-        void WorkFinished() => Application.Instance.Invoke(() =>
-        {
-            btnClose.Visible     = true;
-            btnStop.Visible      = false;
-            stkProgress1.Visible = false;
-            stkProgress2.Visible = false;
-        });
-
-        void EndProgress2() => Application.Instance.Invoke(() =>
-        {
-            stkProgress2.Visible = false;
-        });
-
-        void UpdateProgress2(string text, long current, long maximum) => Application.Instance.Invoke(() =>
-        {
-            lblProgress2.Text          = text;
-            prgProgress2.Indeterminate = false;
-            prgProgress2.MinValue      = 0;
-
-            if(maximum > int.MaxValue)
-            {
-                prgProgress2.MaxValue = (int)(maximum / int.MaxValue);
-                prgProgress2.Value    = (int)(current / int.MaxValue);
-            }
-            else
-            {
-                prgProgress2.MaxValue = (int)maximum;
-                prgProgress2.Value    = (int)current;
-            }
-        });
-
-        void InitProgress2() => Application.Instance.Invoke(() =>
-        {
-            stkProgress2.Visible = true;
-        });
-
-        void EndProgress() => Application.Instance.Invoke(() =>
-        {
-            stkProgress1.Visible = false;
-        });
-
-        void UpdateProgress(string text, long current, long maximum) => Application.Instance.Invoke(() =>
-        {
-            lblProgress.Text          = text;
-            prgProgress.Indeterminate = false;
-            prgProgress.MinValue      = 0;
-
-            if(maximum > int.MaxValue)
-            {
-                prgProgress.MaxValue = (int)(maximum / int.MaxValue);
-                prgProgress.Value    = (int)(current / int.MaxValue);
-            }
-            else
-            {
-                prgProgress.MaxValue = (int)maximum;
-                prgProgress.Value    = (int)current;
-            }
-        });
-
-        void InitProgress() => Application.Instance.Invoke(() =>
-        {
-            stkProgress1.Visible = true;
-        });
-
-        void PulseProgress(string text) => Application.Instance.Invoke(() =>
-        {
-            lblProgress.Text          = text;
-            prgProgress.Indeterminate = true;
-        });
-
-        void StoppingErrorMessage(string text) => Application.Instance.Invoke(() =>
-        {
-            ErrorMessage(text);
-            Eto.Forms.MessageBox.Show(text, MessageBoxType.Error);
-            WorkFinished();
-        });
-
-        void ErrorMessage(string text) => Application.Instance.Invoke(() =>
-        {
-            txtLog.Append(text + Environment.NewLine, true);
-        });
-
-        void UpdateStatus(string text) => Application.Instance.Invoke(() =>
-        {
-            txtLog.Append(text + Environment.NewLine, true);
-        });
-
-        class CommonEncodingInfo
-        {
-            public string Name        { get; set; }
-            public string DisplayName { get; set; }
-        }
-
-        #region XAML IDs
-        // ReSharper disable InconsistentNaming
-        ComboBox       cmbFormat;
-        TextBox        txtDestination;
-        Button         btnDestination;
-        CheckBox       chkStopOnError;
-        CheckBox       chkForce;
-        CheckBox       chkPersistent;
-        CheckBox       chkResume;
-        CheckBox       chkTrack1Pregap;
-        CheckBox       chkSidecar;
-        CheckBox       chkTrim;
-        CheckBox       chkExistingMetadata;
-        ComboBox       cmbEncoding;
-        GroupBox       grpOptions;
-        NumericStepper stpRetries;
-        NumericStepper stpSkipped;
-        Label          lblEncoding;
-        Button         btnClose;
-        Button         btnStart;
-        Button         btnStop;
-        StackLayout    stkProgress;
-        Label          lblDestinationLabel;
-        Label          lblDestination;
-        TextArea       txtLog;
-        StackLayout    stkProgress1;
-        Label          lblProgress;
-        ProgressBar    prgProgress;
-        StackLayout    stkProgress2;
-        Label          lblProgress2;
-        ProgressBar    prgProgress2;
-        StackLayout    stkOptions;
-
-        // ReSharper restore InconsistentNaming
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/MediaDumpViewModel.cs b/Aaru.Gui/ViewModels/MediaDumpViewModel.cs
new file mode 100644
index 000000000..0ef52fab3
--- /dev/null
+++ b/Aaru.Gui/ViewModels/MediaDumpViewModel.cs
@@ -0,0 +1,870 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Reactive;
+using System.Text;
+using System.Threading;
+using System.Xml.Serialization;
+using Aaru.CommonTypes;
+using Aaru.CommonTypes.Enums;
+using Aaru.CommonTypes.Interfaces;
+using Aaru.CommonTypes.Metadata;
+using Aaru.Core;
+using Aaru.Core.Devices.Dumping;
+using Aaru.Core.Logging;
+using Aaru.Core.Media.Info;
+using Aaru.Devices;
+using Aaru.Gui.Models;
+using Avalonia.Controls;
+using Avalonia.Threading;
+using DynamicData;
+using MessageBox.Avalonia;
+using MessageBox.Avalonia.Enums;
+using ReactiveUI;
+using Schemas;
+using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
+using MediaType = Aaru.CommonTypes.MediaType;
+
+namespace Aaru.Gui.ViewModels
+{
+    public class MediaDumpViewModel : ViewModelBase
+    {
+        readonly string  _devicePath;
+        readonly Window  _view;
+        bool             _closeVisible;
+        string           _destination;
+        bool             _destinationEnabled;
+        Device           _dev;
+        Dump             _dumper;
+        string           _encodingEnabled;
+        bool             _encodingVisible;
+        bool             _existingMetadata;
+        bool             _force;
+        string           _formatReadOnly;
+        string           _log;
+        bool             _optionsVisible;
+        string           _outputPrefix;
+        bool             _persistent;
+        bool             _progress1Visible;
+        bool             _progress2Indeterminate;
+        double           _progress2MaxValue;
+        string           _progress2Text;
+        double           _progress2Value;
+        bool             _progress2Visible;
+        bool             _progressIndeterminate;
+        double           _progressMaxValue;
+        string           _progressText;
+        double           _progressValue;
+        bool             _progressVisible;
+        Resume           _resume;
+        double           _retries;
+        EncodingModel    _selectedEncoding;
+        ImagePluginModel _selectedPlugin;
+        CICMMetadataType _sidecar;
+        double           _skipped;
+        bool             _startVisible;
+        bool             _stopEnabled;
+        bool             _stopOnError;
+        bool             _stopVisible;
+        bool             _track1Pregap;
+        bool             _track1PregapVisible;
+        bool             _trim;
+        bool             _useResume;
+        bool             _useSidecar;
+
+        public MediaDumpViewModel(string devicePath, DeviceInfo deviceInfo, Window view, ScsiInfo scsiInfo = null)
+        {
+            _view              = view;
+            DestinationEnabled = true;
+            StartVisible       = true;
+            CloseVisible       = true;
+            OptionsVisible     = true;
+            StartCommand       = ReactiveCommand.Create(ExecuteStartCommand);
+            CloseCommand       = ReactiveCommand.Create(ExecuteCloseCommand);
+            StopCommand        = ReactiveCommand.Create(ExecuteStopCommand);
+            DestinationCommand = ReactiveCommand.Create(ExecuteDestinationCommand);
+            PluginsList        = new ObservableCollection<ImagePluginModel>();
+            Encodings          = new ObservableCollection<EncodingModel>();
+
+            // Defaults
+            StopOnError      = false;
+            Force            = false;
+            Persistent       = true;
+            Resume           = true;
+            Track1Pregap     = false;
+            Sidecar          = true;
+            Trim             = true;
+            ExistingMetadata = false;
+            Retries          = 5;
+            Skipped          = 512;
+
+            MediaType mediaType;
+
+            if(scsiInfo != null)
+                mediaType = scsiInfo.MediaType;
+            else
+                switch(deviceInfo.Type)
+                {
+                    case DeviceType.SecureDigital:
+                        mediaType = MediaType.SecureDigital;
+
+                        break;
+                    case DeviceType.MMC:
+                        mediaType = MediaType.MMC;
+
+                        break;
+                    default:
+                        if(deviceInfo.IsPcmcia)
+                            mediaType = MediaType.PCCardTypeII;
+                        else if(deviceInfo.IsCompactFlash)
+                            mediaType = MediaType.CompactFlash;
+                        else
+                            mediaType = MediaType.GENERIC_HDD;
+
+                        break;
+                }
+
+            PluginBase plugins = GetPluginBase.Instance;
+
+            foreach(IWritableImage plugin in
+                plugins.WritableImages.Values.Where(p => p.SupportedMediaTypes.Contains(mediaType)))
+                PluginsList.Add(new ImagePluginModel
+                {
+                    Plugin = plugin
+                });
+
+            Encodings.AddRange(Encoding.GetEncodings().Select(info => new EncodingModel
+            {
+                Name = info.Name, DisplayName = info.GetEncoding().EncodingName
+            }));
+
+            Encodings.AddRange(Claunia.Encoding.Encoding.GetEncodings().Select(info => new EncodingModel
+            {
+                Name = info.Name, DisplayName = info.DisplayName
+            }));
+
+            switch(mediaType)
+            {
+                case MediaType.CD:
+                case MediaType.CDDA:
+                case MediaType.CDG:
+                case MediaType.CDEG:
+                case MediaType.CDI:
+                case MediaType.CDROM:
+                case MediaType.CDROMXA:
+                case MediaType.CDPLUS:
+                case MediaType.CDMO:
+                case MediaType.CDR:
+                case MediaType.CDRW:
+                case MediaType.CDMRW:
+                case MediaType.VCD:
+                case MediaType.SVCD:
+                case MediaType.PCD:
+                case MediaType.DDCD:
+                case MediaType.DDCDR:
+                case MediaType.DDCDRW:
+                case MediaType.DTSCD:
+                case MediaType.CDMIDI:
+                case MediaType.CDV:
+                case MediaType.CDIREADY:
+                case MediaType.FMTOWNS:
+                case MediaType.PS1CD:
+                case MediaType.PS2CD:
+                case MediaType.MEGACD:
+                case MediaType.SATURNCD:
+                case MediaType.GDROM:
+                case MediaType.GDR:
+                case MediaType.MilCD:
+                case MediaType.SuperCDROM2:
+                case MediaType.JaguarCD:
+                case MediaType.ThreeDO:
+                case MediaType.PCFX:
+                case MediaType.NeoGeoCD:
+                case MediaType.CDTV:
+                case MediaType.CD32:
+                case MediaType.Playdia:
+                case MediaType.Pippin:
+                case MediaType.VideoNow:
+                case MediaType.VideoNowColor:
+                case MediaType.VideoNowXp:
+                    Track1PregapVisible = true;
+
+                    break;
+                default:
+                    Track1PregapVisible = false;
+
+                    break;
+            }
+
+            _devicePath = devicePath;
+        }
+
+        public ReactiveCommand<Unit, Unit> StartCommand       { get; }
+        public ReactiveCommand<Unit, Unit> CloseCommand       { get; }
+        public ReactiveCommand<Unit, Unit> StopCommand        { get; }
+        public ReactiveCommand<Unit, Unit> DestinationCommand { get; }
+
+        public ObservableCollection<ImagePluginModel> PluginsList { get; }
+        public ObservableCollection<EncodingModel>    Encodings   { get; }
+
+        public string Title { get; }
+
+        public bool OptionsVisible
+        {
+            get => _optionsVisible;
+            set => this.RaiseAndSetIfChanged(ref _optionsVisible, value);
+        }
+
+        public ImagePluginModel SelectedPlugin
+        {
+            get => _selectedPlugin;
+            set
+            {
+                this.RaiseAndSetIfChanged(ref _selectedPlugin, value);
+
+                Destination = "";
+
+                if(value is null)
+                {
+                    DestinationEnabled = false;
+
+                    return;
+                }
+
+                DestinationEnabled = true;
+
+                if(!value.Plugin.SupportedOptions.Any())
+                {
+                    // Hide options
+                }
+
+                /* TODO: Plugin options
+                grpOptions.Visible = true;
+
+                var stkOptions = new StackLayout
+                {
+                    Orientation = Orientation.Vertical
+                };
+
+                foreach((string name, Type type, string description, object @default) option in plugin.SupportedOptions)
+                    switch(option.type.ToString())
+                    {
+                        case "System.Boolean":
+                            var optBoolean = new CheckBox();
+                            optBoolean.ID      = "opt" + option.name;
+                            optBoolean.Text    = option.description;
+                            optBoolean.Checked = (bool)option.@default;
+                            stkOptions.Items.Add(optBoolean);
+
+                            break;
+                        case "System.SByte":
+                        case "System.Int16":
+                        case "System.Int32":
+                        case "System.Int64":
+                            var stkNumber = new StackLayout();
+                            stkNumber.Orientation = Orientation.Horizontal;
+                            var optNumber = new NumericStepper();
+                            optNumber.ID    = "opt" + option.name;
+                            optNumber.Value = Convert.ToDouble(option.@default);
+                            stkNumber.Items.Add(optNumber);
+                            var lblNumber = new Label();
+                            lblNumber.Text = option.description;
+                            stkNumber.Items.Add(lblNumber);
+                            stkOptions.Items.Add(stkNumber);
+
+                            break;
+                        case "System.Byte":
+                        case "System.UInt16":
+                        case "System.UInt32":
+                        case "System.UInt64":
+                            var stkUnsigned = new StackLayout();
+                            stkUnsigned.Orientation = Orientation.Horizontal;
+                            var optUnsigned = new NumericStepper();
+                            optUnsigned.ID       = "opt" + option.name;
+                            optUnsigned.MinValue = 0;
+                            optUnsigned.Value    = Convert.ToDouble(option.@default);
+                            stkUnsigned.Items.Add(optUnsigned);
+                            var lblUnsigned = new Label();
+                            lblUnsigned.Text = option.description;
+                            stkUnsigned.Items.Add(lblUnsigned);
+                            stkOptions.Items.Add(stkUnsigned);
+
+                            break;
+                        case "System.Single":
+                        case "System.Double":
+                            var stkFloat = new StackLayout();
+                            stkFloat.Orientation = Orientation.Horizontal;
+                            var optFloat = new NumericStepper();
+                            optFloat.ID            = "opt" + option.name;
+                            optFloat.DecimalPlaces = 2;
+                            optFloat.Value         = Convert.ToDouble(option.@default);
+                            stkFloat.Items.Add(optFloat);
+                            var lblFloat = new Label();
+                            lblFloat.Text = option.description;
+                            stkFloat.Items.Add(lblFloat);
+                            stkOptions.Items.Add(stkFloat);
+
+                            break;
+                        case "System.Guid":
+                            // TODO
+                            break;
+                        case "System.String":
+                            var stkString = new StackLayout();
+                            stkString.Orientation = Orientation.Horizontal;
+                            var lblString = new Label();
+                            lblString.Text = option.description;
+                            stkString.Items.Add(lblString);
+                            var optString = new TextBox();
+                            optString.ID   = "opt" + option.name;
+                            optString.Text = (string)option.@default;
+                            stkString.Items.Add(optString);
+                            stkOptions.Items.Add(stkString);
+
+                            break;
+                    }
+
+                grpOptions.Content = stkOptions;
+    */
+            }
+        }
+
+        public string FormatReadOnly
+        {
+            get => _formatReadOnly;
+            set => this.RaiseAndSetIfChanged(ref _formatReadOnly, value);
+        }
+
+        public string Destination
+        {
+            get => _destination;
+            set => this.RaiseAndSetIfChanged(ref _destination, value);
+        }
+
+        public bool DestinationEnabled
+        {
+            get => _destinationEnabled;
+            set => this.RaiseAndSetIfChanged(ref _destinationEnabled, value);
+        }
+
+        public bool StopOnError
+        {
+            get => _stopOnError;
+            set => this.RaiseAndSetIfChanged(ref _stopOnError, value);
+        }
+
+        public bool Force
+        {
+            get => _force;
+            set => this.RaiseAndSetIfChanged(ref _force, value);
+        }
+
+        public double Retries
+        {
+            get => _retries;
+            set => this.RaiseAndSetIfChanged(ref _retries, value);
+        }
+
+        public bool Persistent
+        {
+            get => _persistent;
+            set => this.RaiseAndSetIfChanged(ref _persistent, value);
+        }
+
+        public bool Resume
+        {
+            get => _useResume;
+            set
+            {
+                this.RaiseAndSetIfChanged(ref _useResume, value);
+
+                if(value == false)
+                    return;
+
+                if(_outputPrefix != null)
+                    CheckResumeFile();
+            }
+        }
+
+        public bool Track1Pregap
+        {
+            get => _track1Pregap;
+            set => this.RaiseAndSetIfChanged(ref _track1Pregap, value);
+        }
+
+        public bool Track1PregapVisible
+        {
+            get => _track1PregapVisible;
+            set => this.RaiseAndSetIfChanged(ref _track1PregapVisible, value);
+        }
+
+        public double Skipped
+        {
+            get => _skipped;
+            set => this.RaiseAndSetIfChanged(ref _skipped, value);
+        }
+
+        public bool Sidecar
+        {
+            get => _useSidecar;
+            set
+            {
+                this.RaiseAndSetIfChanged(ref _useSidecar, value);
+                EncodingVisible = value;
+            }
+        }
+
+        public bool EncodingVisible
+        {
+            get => _encodingVisible;
+            set => this.RaiseAndSetIfChanged(ref _encodingVisible, value);
+        }
+
+        public bool Trim
+        {
+            get => _trim;
+            set => this.RaiseAndSetIfChanged(ref _trim, value);
+        }
+
+        public bool ExistingMetadata
+        {
+            get => _existingMetadata;
+            set
+            {
+                this.RaiseAndSetIfChanged(ref _existingMetadata, value);
+
+                if(value == false)
+                {
+                    _sidecar = null;
+
+                    return;
+                }
+
+                var dlgMetadata = new OpenFileDialog
+                {
+                    Title = "Choose existing metadata sidecar"
+                };
+
+                dlgMetadata.Filters.Add(new FileDialogFilter
+                {
+                    Name = "CICM XML metadata", Extensions = new List<string>(new[]
+                    {
+                        ".xml"
+                    })
+                });
+
+                string[] result = dlgMetadata.ShowAsync(_view).Result;
+
+                if(result?.Length != 1)
+                {
+                    ExistingMetadata = false;
+
+                    return;
+                }
+
+                var sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
+
+                try
+                {
+                    var sr = new StreamReader(result[0]);
+                    _sidecar = (CICMMetadataType)sidecarXs.Deserialize(sr);
+                    sr.Close();
+                }
+                catch
+                {
+                    // ReSharper disable AssignmentIsFullyDiscarded
+                    _ = MessageBoxManager.
+
+                        // ReSharper restore AssignmentIsFullyDiscarded
+                        GetMessageBoxStandardWindow("Error", "Incorrect metadata sidecar file...", ButtonEnum.Ok,
+                                                    Icon.Error).ShowDialog(_view).Result;
+
+                    ExistingMetadata = false;
+                }
+            }
+        }
+
+        public EncodingModel SelectedEncoding
+        {
+            get => _selectedEncoding;
+            set => this.RaiseAndSetIfChanged(ref _selectedEncoding, value);
+        }
+
+        public string EncodingEnabled
+        {
+            get => _encodingEnabled;
+            set => this.RaiseAndSetIfChanged(ref _encodingEnabled, value);
+        }
+
+        public bool ProgressVisible
+        {
+            get => _progressVisible;
+            set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
+        }
+
+        public string Log
+        {
+            get => _log;
+            set => this.RaiseAndSetIfChanged(ref _log, value);
+        }
+
+        public bool Progress1Visible
+        {
+            get => _progress1Visible;
+            set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
+        }
+
+        public string ProgressText
+        {
+            get => _progressText;
+            set => this.RaiseAndSetIfChanged(ref _progressText, value);
+        }
+
+        public double ProgressValue
+        {
+            get => _progressValue;
+            set => this.RaiseAndSetIfChanged(ref _progressValue, value);
+        }
+
+        public double ProgressMaxValue
+        {
+            get => _progressMaxValue;
+            set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
+        }
+
+        public bool ProgressIndeterminate
+        {
+            get => _progressIndeterminate;
+            set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
+        }
+
+        public bool Progress2Visible
+        {
+            get => _progress2Visible;
+            set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
+        }
+
+        public string Progress2Text
+        {
+            get => _progress2Text;
+            set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
+        }
+
+        public double Progress2Value
+        {
+            get => _progress2Value;
+            set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
+        }
+
+        public double Progress2MaxValue
+        {
+            get => _progress2MaxValue;
+            set => this.RaiseAndSetIfChanged(ref _progress2MaxValue, value);
+        }
+
+        public bool Progress2Indeterminate
+        {
+            get => _progress2Indeterminate;
+            set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
+        }
+
+        public bool StartVisible
+        {
+            get => _startVisible;
+            set => this.RaiseAndSetIfChanged(ref _startVisible, value);
+        }
+
+        public bool CloseVisible
+        {
+            get => _closeVisible;
+            set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
+        }
+
+        public bool StopVisible
+        {
+            get => _stopVisible;
+            set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
+        }
+
+        public bool StopEnabled
+        {
+            get => _stopEnabled;
+            set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
+        }
+
+        async void ExecuteDestinationCommand()
+        {
+            if(SelectedPlugin is null)
+                return;
+
+            var dlgDestination = new SaveFileDialog
+            {
+                Title = "Choose destination file"
+            };
+
+            dlgDestination.Filters.Add(new FileDialogFilter
+            {
+                Name = SelectedPlugin.Plugin.Name, Extensions = SelectedPlugin.Plugin.KnownExtensions.ToList()
+            });
+
+            string result = await dlgDestination.ShowAsync(_view);
+
+            if(result is null)
+            {
+                Destination   = "";
+                _outputPrefix = null;
+
+                return;
+            }
+
+            if(string.IsNullOrEmpty(Path.GetExtension(result)))
+                result += SelectedPlugin.Plugin.KnownExtensions.First();
+
+            Destination = result;
+
+            _outputPrefix = Path.Combine(Path.GetDirectoryName(result), Path.GetFileNameWithoutExtension(result));
+
+            Resume = true;
+        }
+
+        async void CheckResumeFile()
+        {
+            _resume = null;
+            var xs = new XmlSerializer(typeof(Resume));
+
+            try
+            {
+                var sr = new StreamReader(_outputPrefix + ".resume.xml");
+                _resume = (Resume)xs.Deserialize(sr);
+                sr.Close();
+            }
+            catch
+            {
+                await MessageBoxManager.
+                      GetMessageBoxStandardWindow("Error", "Incorrect resume file, cannot use it...", ButtonEnum.Ok,
+                                                  Icon.Error).ShowDialog(_view);
+
+                Resume = false;
+
+                return;
+            }
+
+            if(_resume           == null              ||
+               _resume.NextBlock <= _resume.LastBlock ||
+               (_resume.BadBlocks.Count != 0 && !_resume.Tape))
+                return;
+
+            await MessageBoxManager.
+                  GetMessageBoxStandardWindow("Warning",
+                                              "Media already dumped correctly, please choose another destination...",
+                                              ButtonEnum.Ok, Icon.Warning).ShowDialog(_view);
+
+            Resume = false;
+        }
+
+        void ExecuteCloseCommand() => _view.Close();
+
+        internal void ExecuteStopCommand()
+        {
+            StopEnabled = false;
+            _dumper?.Abort();
+        }
+
+        void ExecuteStartCommand()
+        {
+            Log                = "";
+            CloseVisible       = false;
+            StartVisible       = false;
+            StopVisible        = true;
+            StopEnabled        = true;
+            ProgressVisible    = true;
+            DestinationEnabled = false;
+            OptionsVisible     = false;
+
+            UpdateStatus("Opening device...");
+
+            try
+            {
+                _dev = new Device(_devicePath);
+
+                if(_dev.IsRemote)
+                    Statistics.AddRemote(_dev.RemoteApplication, _dev.RemoteVersion, _dev.RemoteOperatingSystem,
+                                         _dev.RemoteOperatingSystemVersion, _dev.RemoteArchitecture);
+
+                if(_dev.Error)
+                {
+                    StoppingErrorMessage($"Error {_dev.LastError} opening device.");
+
+                    return;
+                }
+            }
+            catch(Exception exception)
+            {
+                StoppingErrorMessage($"Exception {exception.Message} opening device.");
+
+                return;
+            }
+
+            Statistics.AddDevice(_dev);
+            Statistics.AddCommand("dump-media");
+
+            if(SelectedPlugin is null)
+            {
+                StoppingErrorMessage("Cannot open output plugin.");
+
+                return;
+            }
+
+            Encoding encoding = null;
+
+            if(!(SelectedEncoding is null))
+                try
+                {
+                    encoding = Claunia.Encoding.Encoding.GetEncoding(SelectedEncoding.Name);
+                }
+                catch(ArgumentException)
+                {
+                    StoppingErrorMessage("Specified encoding is not supported.");
+
+                    return;
+                }
+
+            Dictionary<string, string> parsedOptions = new Dictionary<string, string>();
+
+            /* TODO: Options
+            if(grpOptions.Content is StackLayout stkFormatOptions)
+                foreach(Control option in stkFormatOptions.Children)
+                {
+                    string value;
+
+                    switch(option)
+                    {
+                        case CheckBox optBoolean:
+                            value = optBoolean.Checked?.ToString();
+
+                            break;
+                        case NumericStepper optNumber:
+                            value = optNumber.Value.ToString(CultureInfo.CurrentCulture);
+
+                            break;
+                        case TextBox optString:
+                            value = optString.Text;
+
+                            break;
+                        default: continue;
+                    }
+
+                    string key = option.ID.Substring(3);
+
+                    parsedOptions.Add(key, value);
+                }
+            */
+
+            var dumpLog = new DumpLog(_outputPrefix + ".log", _dev, false);
+
+            dumpLog.WriteLine("Output image format: {0}.", SelectedPlugin.Name);
+
+            _dumper = new Dump(Resume, _dev, _devicePath, SelectedPlugin.Plugin, (ushort)Retries, Force, false,
+                               Persistent, StopOnError, _resume, dumpLog, encoding, _outputPrefix, Destination,
+                               parsedOptions, _sidecar, (uint)Skipped, ExistingMetadata == false, Trim == false,
+                               Track1Pregap, true, false, DumpSubchannel.Any, 0, false);
+
+            new Thread(DoWork).Start();
+        }
+
+        void DoWork()
+        {
+            _dumper.UpdateStatus         += UpdateStatus;
+            _dumper.ErrorMessage         += ErrorMessage;
+            _dumper.StoppingErrorMessage += StoppingErrorMessage;
+            _dumper.PulseProgress        += PulseProgress;
+            _dumper.InitProgress         += InitProgress;
+            _dumper.UpdateProgress       += UpdateProgress;
+            _dumper.EndProgress          += EndProgress;
+            _dumper.InitProgress2        += InitProgress2;
+            _dumper.UpdateProgress2      += UpdateProgress2;
+            _dumper.EndProgress2         += EndProgress2;
+
+            _dumper.Start();
+
+            _dev.Close();
+
+            WorkFinished();
+        }
+
+        async void WorkFinished() => await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            CloseVisible     = true;
+            StopVisible      = false;
+            Progress1Visible = false;
+            Progress2Visible = false;
+        });
+
+        async void EndProgress2() => await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            Progress2Visible = false;
+        });
+
+        async void UpdateProgress2(string text, long current, long maximum) =>
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                Progress2Text          = text;
+                Progress2Indeterminate = false;
+
+                Progress2MaxValue = maximum;
+                Progress2Value    = current;
+            });
+
+        async void InitProgress2() => await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            Progress2Visible = true;
+        });
+
+        async void EndProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            Progress1Visible = false;
+        });
+
+        async void UpdateProgress(string text, long current, long maximum) =>
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                ProgressText          = text;
+                ProgressIndeterminate = false;
+
+                ProgressMaxValue = maximum;
+                ProgressValue    = current;
+            });
+
+        async void InitProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            Progress1Visible = true;
+        });
+
+        async void PulseProgress(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            ProgressText          = text;
+            ProgressIndeterminate = true;
+        });
+
+        async void StoppingErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(async () =>
+        {
+            ErrorMessage(text);
+
+            await MessageBoxManager.GetMessageBoxStandardWindow("Error", $"{text}", ButtonEnum.Ok, Icon.Error).
+                                    ShowDialog(_view);
+
+            WorkFinished();
+        });
+
+        async void ErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            Log += text + Environment.NewLine;
+        });
+
+        async void UpdateStatus(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            Log += text + Environment.NewLine;
+        });
+    }
+}
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/MediaInfoViewModel.cs b/Aaru.Gui/ViewModels/MediaInfoViewModel.cs
index c01a9dc00..c23316a2c 100644
--- a/Aaru.Gui/ViewModels/MediaInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/MediaInfoViewModel.cs
@@ -336,25 +336,35 @@ namespace Aaru.Gui.ViewModels
 
         void ExecuteSaveMediumSupportCommand() => SaveElement(_scsiInfo.MediaTypeSupport);
 
-        void ExecuteDumpCommand()
+        async void ExecuteDumpCommand()
         {
-            /* TODO: frmDump
-            if(scsiInfo.MediaType == MediaType.GDR ||
-               scsiInfo.MediaType == MediaType.GDROM)
+            if(_scsiInfo.MediaType == CommonTypes.MediaType.GDR ||
+               _scsiInfo.MediaType == CommonTypes.MediaType.GDROM)
             {
-                Eto.Forms.MessageBox.Show("GD-ROM dump support is not yet implemented.", MessageBoxType.Error);
+                await MessageBoxManager.
+                      GetMessageBoxStandardWindow("Error", "GD-ROM dump support is not yet implemented.", ButtonEnum.Ok,
+                                                  Icon.Error).ShowDialog(_view);
 
                 return;
             }
 
-            if((scsiInfo.MediaType == MediaType.XGD || scsiInfo.MediaType == MediaType.XGD2 ||
-                scsiInfo.MediaType == MediaType.XGD3) &&
-               scsiInfo.DeviceInfo.ScsiInquiry?.KreonPresent != true)
-                Eto.Forms.MessageBox.Show("Dumping Xbox discs require a Kreon drive.", MessageBoxType.Error);
+            if((_scsiInfo.MediaType == CommonTypes.MediaType.XGD || _scsiInfo.MediaType == CommonTypes.MediaType.XGD2 ||
+                _scsiInfo.MediaType == CommonTypes.MediaType.XGD3) &&
+               _scsiInfo.DeviceInfo.ScsiInquiry?.KreonPresent != true)
+            {
+                await MessageBoxManager.
+                      GetMessageBoxStandardWindow("Error", "Dumping Xbox discs require a Kreon drive.", ButtonEnum.Ok,
+                                                  Icon.Error).ShowDialog(_view);
 
-            var dumpForm = new frmDump(devicePath, scsiInfo.DeviceInfo, scsiInfo);
-            dumpForm.Show();
-            */
+                return;
+            }
+
+            var mediaDumpWindow = new MediaDumpWindow();
+
+            mediaDumpWindow.DataContext =
+                new MediaDumpViewModel(_devicePath, _scsiInfo.DeviceInfo, mediaDumpWindow, _scsiInfo);
+
+            mediaDumpWindow.Show();
         }
 
         async void ExecuteScanCommand()
diff --git a/Aaru.Gui/Views/MediaDumpWindow.xaml b/Aaru.Gui/Views/MediaDumpWindow.xaml
new file mode 100644
index 000000000..a0c5fa9dc
--- /dev/null
+++ b/Aaru.Gui/Views/MediaDumpWindow.xaml
@@ -0,0 +1,94 @@
+<Window xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="clr-namespace:Aaru.Gui.ViewModels;assembly=Aaru.Gui"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800"
+        d:DesignHeight="450" x:Class="Aaru.Gui.Views.MediaDumpWindow" Icon="/Assets/aaru-logo.png"
+        Title="{Binding Title}">
+    <Design.DataContext>
+        <vm:MediaDumpViewModel />
+    </Design.DataContext>
+    <StackPanel Orientation="Vertical">
+        <StackPanel Orientation="Vertical" IsVisible="{Binding OptionsVisible}">
+            <TextBlock Text="Output format" />
+            <ComboBox Items="{Binding PluginsList}" SelectedItem="{Binding SelectedPlugin}"
+                      IsEnabled="{Binding FormatReadOnly}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Name}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+            <StackPanel Orientation="Horizontal">
+                <TextBox Text="{Binding Destination}" IsReadOnly="True" />
+                <Button Command="{Binding DestinationCommand}" IsEnabled="{Binding DestinationEnabled}">
+                    <TextBlock Text="Choose..." />
+                </Button>
+            </StackPanel>
+            <CheckBox IsChecked="{Binding StopOnError}">
+                <TextBlock Text="Stop media dump on first error" />
+            </CheckBox>
+            <CheckBox IsChecked="{Binding Force}">
+                <TextBlock Text="Continue dumping whatever happens" />
+            </CheckBox>
+            <NumericUpDown Text="Retry passes" Value="{Binding Retries}" Increment="1" Minimum="0" />
+            <CheckBox IsChecked="{Binding Persistent}">
+                <TextBlock Text="Try to recover partial or incorrect data" />
+            </CheckBox>
+            <CheckBox IsChecked="{Binding Resume}">
+                <TextBlock Text="Create/use resume mapfile" />
+            </CheckBox>
+            <CheckBox IsChecked="{Binding Track1Pregap}" IsVisible="{Binding Track1PregapVisible}">
+                <TextBlock Text="Try to read track 1 pregap" />
+            </CheckBox>
+            <NumericUpDown Text="Skipped sectors on error" Increment="1" Minimum="1" Value="{Binding Skipped}" />
+            <CheckBox IsChecked="{Binding Sidecar}">
+                <TextBlock Text="Create CICM XML metadata sidecar" />
+            </CheckBox>
+            <CheckBox IsChecked="{Binding Trim}">
+                <TextBlock Text="Trim errors from skipped sectors" />
+            </CheckBox>
+            <CheckBox IsChecked="{Binding ExistingMetadata}">
+                <TextBlock Text="Take metadata from existing CICM XML sidecar" />
+            </CheckBox>
+            <StackPanel IsVisible="{Binding EncodingVisible}">
+                <TextBox Text="Encoding to use on metadata sidecar creation" />
+                <ComboBox Items="{Binding Encodings}" SelectedItem="{Binding SelectedEncoding}"
+                          IsEnabled="{Binding EncodingEnabled}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding Name}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </StackPanel>
+            <!-- TODO: Image options -->
+        </StackPanel>
+        <StackPanel Orientation="Vertical" IsVisible="{Binding ProgressVisible}">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="Writing image to:" /> <TextBlock Text="{Binding Destination}" />
+            </StackPanel>
+            <TextBlock Text="Log" /> <TextBox Text="{Binding Log}" IsReadOnly="True" />
+            <StackPanel Orientation="Vertical" IsVisible="{Binding Progress1Visible}">
+                <TextBox Text="{Binding ProgressText}" />
+                <ProgressBar Value="{Binding ProgressValue}" Maximum="{Binding ProgressMaxValue}"
+                             IsIndeterminate="{Binding ProgressIndeterminate}" />
+            </StackPanel>
+            <StackPanel Orientation="Vertical" IsVisible="{Binding Progress2Visible}">
+                <TextBox Text="{Binding Progress2Text}" />
+                <ProgressBar Value="{Binding Progress2Value}" Maximum="{Binding Progress2MaxValue}"
+                             IsIndeterminate="{Binding Progress2Indeterminate}" />
+            </StackPanel>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+            <Button Command="{Binding StartCommand}" IsVisible="{Binding StartVisible}">
+                <TextBlock Text="Start" />
+            </Button>
+            <Button Command="{Binding CloseCommand}" IsVisible="{Binding CloseVisible}">
+                <TextBlock Text="Close" />
+            </Button>
+            <Button Command="{Binding StopCommand}" IsVisible="{Binding StopVisible}" IsEnabled="{Binding StopEnabled}">
+                <TextBlock Text="Stop" />
+            </Button>
+        </StackPanel>
+    </StackPanel>
+</Window>
\ No newline at end of file
diff --git a/Aaru.Gui/Views/MediaDumpWindow.xaml.cs b/Aaru.Gui/Views/MediaDumpWindow.xaml.cs
new file mode 100644
index 000000000..0a3a694ea
--- /dev/null
+++ b/Aaru.Gui/Views/MediaDumpWindow.xaml.cs
@@ -0,0 +1,27 @@
+using System.ComponentModel;
+using Aaru.Gui.ViewModels;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Aaru.Gui.Views
+{
+    public class MediaDumpWindow : Window
+    {
+        public MediaDumpWindow()
+        {
+            InitializeComponent();
+        #if DEBUG
+            this.AttachDevTools();
+        #endif
+        }
+
+        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+
+        protected override void OnClosing(CancelEventArgs e)
+        {
+            (DataContext as MediaDumpViewModel)?.ExecuteStopCommand();
+            base.OnClosing(e);
+        }
+    }
+}
\ No newline at end of file