diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 3c6b8b14d..2165d966c 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -1,28 +1,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -71,13 +70,6 @@
-
-
-
-
-
-
-
@@ -88,12 +80,18 @@
+
+
+
+
+
+
@@ -102,14 +100,6 @@
-
-
-
-
-
-
-
-
@@ -117,11 +107,19 @@
+
+
+
+
+
+
+
+
@@ -180,6 +178,13 @@
+
+
+
+
+
+
+
@@ -200,19 +205,10 @@
-
-
-
-
-
-
-
-
-
@@ -221,6 +217,7 @@
+
@@ -238,6 +235,7 @@
+
@@ -258,8 +256,8 @@
-
+
@@ -269,11 +267,11 @@
-
+
-
+
@@ -287,17 +285,17 @@
-
-
+
+
-
+
@@ -317,12 +315,19 @@
-
+
+
+
+
+
+
+
+
@@ -339,68 +344,61 @@
-
-
-
-
-
-
-
-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
@@ -425,7 +423,6 @@
-
@@ -437,11 +434,12 @@
+
-
+
@@ -463,9 +461,9 @@
+
-
@@ -495,6 +493,13 @@
+
+
+
+
+
+
+
@@ -558,11 +563,11 @@
+
-
@@ -582,17 +587,10 @@
-
-
-
-
-
-
-
-
+
@@ -649,6 +647,13 @@
+
+
+
+
+
+
+
@@ -661,28 +666,17 @@
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
@@ -690,13 +684,16 @@
+
+
+
-
-
+
+
@@ -732,11 +729,13 @@
+
-
+
+
@@ -744,11 +743,14 @@
-
+
+
+
+
@@ -788,8 +790,8 @@
-
+
@@ -798,8 +800,8 @@
-
+
@@ -808,8 +810,8 @@
-
+
@@ -836,8 +838,15 @@
-
+
+
+
+
+
+
+
+
@@ -855,11 +864,11 @@
-
+
@@ -882,34 +891,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
@@ -917,12 +909,18 @@
+
+
+
+
+
+
@@ -1016,6 +1014,12 @@
+
+
+
+
+
+
@@ -1040,12 +1044,6 @@
-
-
-
-
-
-
@@ -1128,6 +1126,8 @@
+
+
@@ -1143,6 +1143,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1155,18 +1167,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1175,14 +1175,14 @@
-
-
+
+
@@ -1205,12 +1205,10 @@
-
-
-
+
@@ -1240,14 +1238,15 @@
-
+
+
@@ -1258,6 +1257,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1306,6 +1315,7 @@
+
@@ -1329,6 +1339,8 @@
+
+
@@ -1342,17 +1354,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -1361,6 +1362,7 @@
+
@@ -1368,10 +1370,6 @@
-
-
-
-
@@ -1379,6 +1377,9 @@
+
+
+
@@ -1461,16 +1462,7 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -1492,6 +1484,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1525,16 +1527,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1572,6 +1564,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1662,8 +1664,8 @@
-
+
@@ -1697,16 +1699,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1718,6 +1710,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1900,16 +1909,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1920,6 +1919,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1938,14 +1947,6 @@
-
-
-
-
-
-
-
-
@@ -1953,6 +1954,7 @@
+
@@ -1960,6 +1962,13 @@
+
+
+
+
+
+
+
@@ -1969,20 +1978,11 @@
-
-
-
-
-
-
-
-
-
+
-
@@ -1991,19 +1991,13 @@
+
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -2037,8 +2031,8 @@
-
+
@@ -2046,7 +2040,7 @@
-
+
@@ -2069,7 +2063,14 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Aaru.Gui/Forms/frmImageVerify.xeto b/Aaru.Gui/Forms/frmImageVerify.xeto
deleted file mode 100644
index 344d10368..000000000
--- a/Aaru.Gui/Forms/frmImageVerify.xeto
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
\ No newline at end of file
diff --git a/Aaru.Gui/Forms/frmImageVerify.xeto.cs b/Aaru.Gui/Forms/frmImageVerify.xeto.cs
deleted file mode 100644
index 4f1f358b6..000000000
--- a/Aaru.Gui/Forms/frmImageVerify.xeto.cs
+++ /dev/null
@@ -1,473 +0,0 @@
-// /***************************************************************************
-// Aaru Data Preservation Suite
-// ----------------------------------------------------------------------------
-//
-// Filename : frmImageVerify.xeto.cs
-// Author(s) : Natalia Portillo
-//
-// Component : Image verification window.
-//
-// --[ Description ] ----------------------------------------------------------
-//
-// Implements verifying media image.
-//
-// --[ 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.Threading;
-using Aaru.CommonTypes.Interfaces;
-using Aaru.CommonTypes.Structs;
-using Aaru.Console;
-using Aaru.Core;
-using Eto.Forms;
-using Eto.Serialization.Xaml;
-
-namespace Aaru.Gui.Forms
-{
- public class frmImageVerify : Form
- {
- readonly IMediaImage inputFormat;
- bool cancel;
-
- public frmImageVerify(IMediaImage inputFormat)
- {
- this.inputFormat = inputFormat;
- XamlReader.Load(this);
- cancel = false;
- }
-
- protected void OnBtnStart(object sender, EventArgs e)
- {
- chkVerifyImage.Enabled = false;
- chkVerifySectors.Enabled = false;
- btnClose.Visible = false;
- btnStart.Visible = false;
- btnStop.Visible = true;
- stkProgress.Visible = true;
- lblProgress2.Visible = false;
-
- chkVerifySectors.Visible = inputFormat as IOpticalMediaImage != null ||
- inputFormat as IVerifiableSectorsImage != null;
-
- // TODO: Do not offer the option to use this form if the image does not support any kind of verification
-
- new Thread(DoWork).Start();
- }
-
- void DoWork()
- {
- bool? correctDisc = null;
- long totalSectors = 0;
- long errorSectors = 0;
- long correctSectors = 0;
- long unknownSectors = 0;
- bool formatHasTracks;
-
- var inputOptical = inputFormat as IOpticalMediaImage;
- var verifiableSectorsImage = inputFormat as IVerifiableSectorsImage;
-
- try
- {
- formatHasTracks = inputOptical?.Tracks?.Count > 0;
- }
- catch
- {
- formatHasTracks = false;
- }
-
- // Setup progress bars
- Application.Instance.Invoke(() =>
- {
- stkProgress.Visible = true;
- prgProgress.MaxValue = 0;
-
- if(chkVerifyImage.Checked == true ||
- chkVerifySectors.Checked == true)
- prgProgress.MaxValue = 1;
-
- if(formatHasTracks && inputOptical != null)
- prgProgress.MaxValue += inputOptical.Tracks.Count;
- else
- {
- if(chkVerifySectors.Checked == true)
- {
- prgProgress.MaxValue = 2;
- prgProgress2.Visible = false;
- lblProgress2.Visible = false;
- }
- else
- {
- prgProgress2.Visible = true;
- lblProgress2.Visible = true;
- }
- }
-
- prgProgress.MaxValue++;
- });
-
- if(chkVerifyImage.Checked == true)
- {
- if(!(inputFormat is IVerifiableImage verifiableImage))
- Application.Instance.Invoke(() =>
- {
- lblImageResult.Visible = true;
- lblImageResult.Text = "Disc image does not support verification.";
- });
- else
- {
- Application.Instance.Invoke(() =>
- {
- lblProgress.Text = "Checking media image...";
-
- if(chkVerifySectors.Checked == true)
- prgProgress.Value = 1;
- else
- prgProgress.Indeterminate = true;
-
- prgProgress2.Indeterminate = true;
- });
-
- DateTime startCheck = DateTime.UtcNow;
- bool? discCheckStatus = verifiableImage.VerifyMediaImage();
- DateTime endCheck = DateTime.UtcNow;
-
- TimeSpan checkTime = endCheck - startCheck;
-
- Application.Instance.Invoke(() =>
- {
- lblImageResult.Visible = true;
-
- switch(discCheckStatus)
- {
- case true:
- lblImageResult.Text = "Disc image checksums are correct";
-
- break;
- case false:
- lblImageResult.Text = "Disc image checksums are incorrect";
-
- break;
- case null:
- lblImageResult.Text = "Disc image does not contain checksums";
-
- break;
- }
- });
-
- correctDisc = discCheckStatus;
-
- AaruConsole.VerboseWriteLine("Checking disc image checksums took {0} seconds",
- checkTime.TotalSeconds);
- }
- }
-
- if(chkVerifySectors.Checked == true)
- {
- DateTime startCheck = DateTime.Now;
- DateTime endCheck = startCheck;
- List failingLbas = new List();
- List unknownLbas = new List();
-
- Application.Instance.Invoke(() =>
- {
- lblProgress2.Visible = true;
- prgProgress2.Indeterminate = false;
- prgProgress2.MaxValue = (int)(inputFormat.Info.Sectors / 512);
- btnStop.Enabled = true;
- });
-
- if(formatHasTracks)
- {
- List