diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index 532e31014..1a30998db 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -95,6 +95,7 @@
       <e p="DiscImageChef.CommonTypes" t="IncludeRecursive">
         <e p="DiscImageChef.CommonTypes.csproj" t="IncludeRecursive" />
         <e p="Enums" t="Include">
+          <e p="DeviceType.cs" t="Include" />
           <e p="Images.cs" t="Include" />
         </e>
         <e p="Exceptions" t="Include">
diff --git a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj
index 8de21e58a..97ceb8b8b 100644
--- a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj
+++ b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj
@@ -49,6 +49,7 @@
     <Compile Include="..\CICMMetadata\dotnet\cicm.cs">
       <Link>Metadata/cicm.cs</Link>
     </Compile>
+    <Compile Include="Enums\DeviceType.cs" />
     <Compile Include="Enums\Images.cs" />
     <Compile Include="Exceptions\Images.cs" />
     <Compile Include="Extents\ExtentsByte.cs" />
diff --git a/DiscImageChef.CommonTypes/Enums/DeviceType.cs b/DiscImageChef.CommonTypes/Enums/DeviceType.cs
new file mode 100644
index 000000000..4451f82b7
--- /dev/null
+++ b/DiscImageChef.CommonTypes/Enums/DeviceType.cs
@@ -0,0 +1,13 @@
+namespace DiscImageChef.CommonTypes.Enums
+{
+    public enum DeviceType
+    {
+        Unknown,
+        ATA,
+        ATAPI,
+        SCSI,
+        SecureDigital,
+        MMC,
+        NVMe
+    }
+}
\ No newline at end of file
diff --git a/DiscImageChef.Core/Devices/Info/DeviceInfo.cs b/DiscImageChef.Core/Devices/Info/DeviceInfo.cs
index ecd6c4870..afecc09ae 100644
--- a/DiscImageChef.Core/Devices/Info/DeviceInfo.cs
+++ b/DiscImageChef.Core/Devices/Info/DeviceInfo.cs
@@ -32,6 +32,7 @@
 
 using System;
 using System.Collections.Generic;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Console;
 using DiscImageChef.Decoders.ATA;
 using DiscImageChef.Decoders.SCSI;
diff --git a/DiscImageChef.Core/Devices/Info/Properties.cs b/DiscImageChef.Core/Devices/Info/Properties.cs
index c87016bd1..e38b80de7 100644
--- a/DiscImageChef.Core/Devices/Info/Properties.cs
+++ b/DiscImageChef.Core/Devices/Info/Properties.cs
@@ -31,6 +31,7 @@
 // ****************************************************************************/
 
 using System.Collections.Generic;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Decoders.ATA;
 using DiscImageChef.Decoders.SCSI;
 using DiscImageChef.Decoders.SCSI.SSC;
diff --git a/DiscImageChef.Core/Devices/Reader.cs b/DiscImageChef.Core/Devices/Reader.cs
index a76a81954..3e77d327b 100644
--- a/DiscImageChef.Core/Devices/Reader.cs
+++ b/DiscImageChef.Core/Devices/Reader.cs
@@ -31,6 +31,7 @@
 // ****************************************************************************/
 
 using System;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Decoders.ATA;
 using DiscImageChef.Devices;
 
@@ -123,15 +124,11 @@ namespace DiscImageChef.Core.Devices
             }
         }
 
-        internal bool ReadBlock(out byte[] buffer, ulong block, out double duration)
-        {
-            return ReadBlocks(out buffer, block, 1, out duration);
-        }
+        internal bool ReadBlock(out byte[] buffer, ulong block, out double duration) =>
+            ReadBlocks(out buffer, block, 1, out duration);
 
-        internal bool ReadBlocks(out byte[] buffer, ulong block, out double duration)
-        {
-            return ReadBlocks(out buffer, block, BlocksToRead, out duration);
-        }
+        internal bool ReadBlocks(out byte[] buffer, ulong block, out double duration) =>
+            ReadBlocks(out buffer, block, BlocksToRead, out duration);
 
         internal bool ReadBlocks(out byte[] buffer, ulong block, uint count, out double duration)
         {
diff --git a/DiscImageChef.Core/Devices/ReaderATA.cs b/DiscImageChef.Core/Devices/ReaderATA.cs
index 23aa16646..063990dfd 100644
--- a/DiscImageChef.Core/Devices/ReaderATA.cs
+++ b/DiscImageChef.Core/Devices/ReaderATA.cs
@@ -31,9 +31,9 @@
 // ****************************************************************************/
 
 using System;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Console;
 using DiscImageChef.Decoders.ATA;
-using DiscImageChef.Devices;
 
 namespace DiscImageChef.Core.Devices
 {
diff --git a/DiscImageChef.Core/Devices/Report/SecureDigital.cs b/DiscImageChef.Core/Devices/Report/SecureDigital.cs
index 7e1f03c07..b91702a88 100644
--- a/DiscImageChef.Core/Devices/Report/SecureDigital.cs
+++ b/DiscImageChef.Core/Devices/Report/SecureDigital.cs
@@ -30,9 +30,9 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.CommonTypes.Metadata;
 using DiscImageChef.Console;
-using DiscImageChef.Devices;
 
 namespace DiscImageChef.Core.Devices.Report
 {
diff --git a/DiscImageChef.Core/Devices/Scanning/SecureDigital.cs b/DiscImageChef.Core/Devices/Scanning/SecureDigital.cs
index 00041905e..095a7d19c 100644
--- a/DiscImageChef.Core/Devices/Scanning/SecureDigital.cs
+++ b/DiscImageChef.Core/Devices/Scanning/SecureDigital.cs
@@ -32,6 +32,7 @@
 
 using System;
 using System.Collections.Generic;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Console;
 using DiscImageChef.Core.Logging;
 using DiscImageChef.Decoders.MMC;
diff --git a/DiscImageChef.Core/Logging/MHDDLog.cs b/DiscImageChef.Core/Logging/MHDDLog.cs
index f7321dfd0..0ad169263 100644
--- a/DiscImageChef.Core/Logging/MHDDLog.cs
+++ b/DiscImageChef.Core/Logging/MHDDLog.cs
@@ -34,6 +34,7 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Devices;
 
 namespace DiscImageChef.Core.Logging
diff --git a/DiscImageChef.Core/Media/Info/ScsiInfo.cs b/DiscImageChef.Core/Media/Info/ScsiInfo.cs
index 9f0182999..51adace36 100644
--- a/DiscImageChef.Core/Media/Info/ScsiInfo.cs
+++ b/DiscImageChef.Core/Media/Info/ScsiInfo.cs
@@ -37,6 +37,7 @@ using System.Linq;
 using System.Threading;
 using DiscImageChef.Checksums;
 using DiscImageChef.CommonTypes;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Console;
 using DiscImageChef.Core.Media.Detection;
 using DiscImageChef.Decoders.CD;
diff --git a/DiscImageChef.Devices/Device/Constructor.cs b/DiscImageChef.Devices/Device/Constructor.cs
index fecf9b2fb..4ce5a1984 100644
--- a/DiscImageChef.Devices/Device/Constructor.cs
+++ b/DiscImageChef.Devices/Device/Constructor.cs
@@ -35,6 +35,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.CommonTypes.Interop;
 using DiscImageChef.Console;
 using DiscImageChef.Decoders.ATA;
@@ -475,7 +476,9 @@ namespace DiscImageChef.Devices
 
                     // I have to search for USB disks, floppies and CD-ROMs as separate device types
                     foreach(string devGuid in new[]
-                        {Usb.GuidDevinterfaceFloppy, Usb.GuidDevinterfaceCdrom, Usb.GuidDevinterfaceDisk})
+                    {
+                        Usb.GuidDevinterfaceFloppy, Usb.GuidDevinterfaceCdrom, Usb.GuidDevinterfaceDisk
+                    })
                     {
                         usbDevice = Usb.FindDrivePath(devicePath, devGuid);
                         if(usbDevice != null) break;
diff --git a/DiscImageChef.Devices/Device/Variables.cs b/DiscImageChef.Devices/Device/Variables.cs
index 519ab2ae6..481c07a38 100644
--- a/DiscImageChef.Devices/Device/Variables.cs
+++ b/DiscImageChef.Devices/Device/Variables.cs
@@ -30,6 +30,7 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.CommonTypes.Interop;
 using DiscImageChef.Decoders.SCSI;
 
diff --git a/DiscImageChef.Devices/Enums.cs b/DiscImageChef.Devices/Enums.cs
index 79beb9d74..c58802bfc 100644
--- a/DiscImageChef.Devices/Enums.cs
+++ b/DiscImageChef.Devices/Enums.cs
@@ -37,17 +37,6 @@ using System;
 
 namespace DiscImageChef.Devices
 {
-    public enum DeviceType
-    {
-        Unknown,
-        ATA,
-        ATAPI,
-        SCSI,
-        SecureDigital,
-        MMC,
-        NVMe
-    }
-
     #region ATA Commands
     /// <summary>
     ///     All known ATA commands
diff --git a/DiscImageChef.Gui/Forms/frmDump.xeto.cs b/DiscImageChef.Gui/Forms/frmDump.xeto.cs
index 84b3b120b..f7ab331ae 100644
--- a/DiscImageChef.Gui/Forms/frmDump.xeto.cs
+++ b/DiscImageChef.Gui/Forms/frmDump.xeto.cs
@@ -39,6 +39,7 @@ using System.Linq;
 using System.Text;
 using System.Xml.Serialization;
 using DiscImageChef.CommonTypes;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.CommonTypes.Interfaces;
 using DiscImageChef.CommonTypes.Metadata;
 using DiscImageChef.Core;
diff --git a/DiscImageChef.Gui/Forms/frmMain.xeto.cs b/DiscImageChef.Gui/Forms/frmMain.xeto.cs
index e262da988..59f69bc17 100644
--- a/DiscImageChef.Gui/Forms/frmMain.xeto.cs
+++ b/DiscImageChef.Gui/Forms/frmMain.xeto.cs
@@ -36,6 +36,7 @@ using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using DiscImageChef.CommonTypes;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.CommonTypes.Interfaces;
 using DiscImageChef.CommonTypes.Structs;
 using DiscImageChef.Console;
diff --git a/DiscImageChef.Gui/Forms/frmMediaScan.xeto.cs b/DiscImageChef.Gui/Forms/frmMediaScan.xeto.cs
index 27c80b646..6d596d271 100644
--- a/DiscImageChef.Gui/Forms/frmMediaScan.xeto.cs
+++ b/DiscImageChef.Gui/Forms/frmMediaScan.xeto.cs
@@ -32,6 +32,7 @@
 
 using System;
 using DiscImageChef.CommonTypes;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Core;
 using DiscImageChef.Core.Devices.Scanning;
 using DiscImageChef.Core.Media.Info;
@@ -68,8 +69,8 @@ namespace DiscImageChef.Gui.Forms
         // TODO: Allow to save MHDD and ImgBurn log files
         void OnBtnScanClick(object sender, EventArgs e)
         {
-            btnStop.Visible = true;
-            btnScan.Visible = false;
+            btnStop.Visible   = true;
+            btnScan.Visible   = false;
             btnCancel.Visible = false;
 
             if(devicePath.Length == 2 && devicePath[1] == ':' && devicePath[0] != '/' && char.IsLetter(devicePath[0]))
diff --git a/DiscImageChef.Gui/Tabs/tabSdMmcInfo.xeto.cs b/DiscImageChef.Gui/Tabs/tabSdMmcInfo.xeto.cs
index c857a7737..58dca258b 100644
--- a/DiscImageChef.Gui/Tabs/tabSdMmcInfo.xeto.cs
+++ b/DiscImageChef.Gui/Tabs/tabSdMmcInfo.xeto.cs
@@ -30,7 +30,7 @@
 // Copyright © 2011-2018 Natalia Portillo
 // ****************************************************************************/
 
-using DiscImageChef.Devices;
+using DiscImageChef.CommonTypes.Enums;
 using Eto.Forms;
 using Eto.Serialization.Xaml;
 
diff --git a/DiscImageChef/Commands/DeviceInfo.cs b/DiscImageChef/Commands/DeviceInfo.cs
index 2e3979d2c..09873371f 100644
--- a/DiscImageChef/Commands/DeviceInfo.cs
+++ b/DiscImageChef/Commands/DeviceInfo.cs
@@ -31,6 +31,7 @@
 // ****************************************************************************/
 
 using System.Collections.Generic;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Console;
 using DiscImageChef.Core;
 using DiscImageChef.Decoders.ATA;
diff --git a/DiscImageChef/Commands/DeviceReport.cs b/DiscImageChef/Commands/DeviceReport.cs
index 212754861..e509e90d3 100644
--- a/DiscImageChef/Commands/DeviceReport.cs
+++ b/DiscImageChef/Commands/DeviceReport.cs
@@ -34,6 +34,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.CommonTypes.Metadata;
 using DiscImageChef.Console;
 using DiscImageChef.Core;
diff --git a/DiscImageChef/Commands/DumpMedia.cs b/DiscImageChef/Commands/DumpMedia.cs
index 1062a9fe1..c2baea7b6 100644
--- a/DiscImageChef/Commands/DumpMedia.cs
+++ b/DiscImageChef/Commands/DumpMedia.cs
@@ -37,6 +37,7 @@ using System.Linq;
 using System.Text;
 using System.Xml.Serialization;
 using DiscImageChef.CommonTypes;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.CommonTypes.Interfaces;
 using DiscImageChef.CommonTypes.Metadata;
 using DiscImageChef.Console;
diff --git a/DiscImageChef/Commands/MediaInfo.cs b/DiscImageChef/Commands/MediaInfo.cs
index 05d59ab8e..096218816 100644
--- a/DiscImageChef/Commands/MediaInfo.cs
+++ b/DiscImageChef/Commands/MediaInfo.cs
@@ -32,6 +32,7 @@
 
 using System;
 using System.Collections.Generic;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Console;
 using DiscImageChef.Core;
 using DiscImageChef.Core.Media.Info;
diff --git a/DiscImageChef/Commands/MediaScan.cs b/DiscImageChef/Commands/MediaScan.cs
index 03e4935c3..764d3bff8 100644
--- a/DiscImageChef/Commands/MediaScan.cs
+++ b/DiscImageChef/Commands/MediaScan.cs
@@ -31,6 +31,7 @@
 // ****************************************************************************/
 
 using System;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Console;
 using DiscImageChef.Core.Devices.Scanning;
 using DiscImageChef.Devices;