From 7b0ccf487660784ec5ae687b9b865b0372a40db1 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 17 Aug 2025 06:02:59 +0100
Subject: [PATCH] Simplify naming of AaruConsole methods.

---
 .../.idea/runConfigurations/Aaru.xml          |   2 +-
 Aaru.Archives/Symbian/Info.cs                 |  60 ++--
 Aaru.Archives/Symbian/Open.cs                 |  60 ++--
 Aaru.Archives/Symbian/Parser.cs               |   6 +-
 Aaru.Checksums/CDChecksums.cs                 |  56 ++--
 Aaru.Checksums/ReedSolomon.cs                 |  16 +-
 .../MediaTypeFromDevice/FromAta.cs            |   2 +-
 .../MediaTypeFromDevice/FromMmc.cs            |  28 +-
 .../MediaTypeFromDevice/FromOdc.cs            |  80 ++---
 .../MediaTypeFromDevice/FromSbc.cs            | 284 ++++++++---------
 .../MediaTypeFromDevice/FromScsi.cs           |  12 +-
 .../MediaTypeFromDevice/FromSsc.cs            | 192 +++++------
 .../Structs/Devices/ATA/Identify.cs           |   2 +-
 .../Structs/Devices/SCSI/Inquiry.cs           |   4 +-
 Aaru.Core/ArchiveFormat.cs                    |   2 +-
 Aaru.Core/DataFile.cs                         |   6 +-
 Aaru.Core/Devices/Dumping/CompactDisc/Data.cs |   4 +-
 Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs |   2 +-
 .../Devices/Dumping/CompactDisc/Error.cs      |   2 +-
 .../Devices/Dumping/CompactDisc/Pregap.cs     |  26 +-
 Aaru.Core/Devices/Dumping/MiniDisc.cs         |   2 +-
 .../PlayStationPortable/MemoryStick.cs        |   2 +-
 .../Dumping/PlayStationPortable/UMD.cs        |   2 +-
 Aaru.Core/Devices/Dumping/Sbc/Dump.cs         |   2 +-
 Aaru.Core/Devices/Dumping/Sbc/Error.cs        |   2 +-
 Aaru.Core/Devices/Dumping/XGD.cs              |  24 +-
 Aaru.Core/Devices/Info/DeviceInfo.cs          |  46 +--
 Aaru.Core/Devices/ReaderATA.cs                |   4 +-
 Aaru.Core/Devices/ReaderSCSI.cs               |   2 +-
 Aaru.Core/Devices/Report/ATA.cs               |  64 ++--
 Aaru.Core/Devices/Report/GdRomSwapTrick.cs    |   4 +-
 Aaru.Core/Devices/Report/MMC.cs               | 160 +++++-----
 Aaru.Core/Devices/Report/Scsi.cs              |  16 +-
 Aaru.Core/Devices/Scanning/SCSI.cs            |   2 +-
 Aaru.Core/Entropy.cs                          |  16 +-
 Aaru.Core/Filesystems.cs                      |   4 +-
 Aaru.Core/ImageFormat.cs                      |   6 +-
 Aaru.Core/ImageInfo.cs                        |   6 +-
 Aaru.Core/Media/Detection/MMC.cs              |  94 +++---
 Aaru.Core/Media/Info/ScsiInfo.cs              | 136 ++++----
 Aaru.Core/Partitions.cs                       |  16 +-
 Aaru.Core/Remote.cs                           |   6 +-
 Aaru.Core/Sidecar/BlockMedia.cs               |  20 +-
 Aaru.Core/Sidecar/Files.cs                    |   4 +-
 Aaru.Core/Sidecar/Sidecar.cs                  |  12 +-
 Aaru.Core/Statistics.cs                       |  40 +--
 Aaru.Decoders/Bluray/BCA.cs                   |   2 +-
 Aaru.Decoders/Bluray/Cartridge.cs             |   2 +-
 Aaru.Decoders/Bluray/DDS.cs                   |   2 +-
 Aaru.Decoders/Bluray/DI.cs                    |   4 +-
 Aaru.Decoders/Bluray/Spare.cs                 |   2 +-
 Aaru.Decoders/CD/ATIP.cs                      |   2 +-
 Aaru.Decoders/CD/CDTextOnLeadIn.cs            |   2 +-
 Aaru.Decoders/CD/FullTOC.cs                   |   2 +-
 Aaru.Decoders/CD/PMA.cs                       |   2 +-
 Aaru.Decoders/CD/Session.cs                   |   2 +-
 Aaru.Decoders/CD/TOC.cs                       |   2 +-
 Aaru.Decoders/Floppy/Apple2.cs                |  24 +-
 Aaru.Decoders/Sega/CD.cs                      |  42 +--
 Aaru.Decoders/Sega/Dreamcast.cs               |  32 +-
 Aaru.Decoders/Sega/Saturn.cs                  |  26 +-
 Aaru.Decryption/DVD/Dump.cs                   |  18 +-
 Aaru.Devices/Device/AtaCommands/Ata28.cs      |  16 +-
 Aaru.Devices/Device/AtaCommands/Ata48.cs      |  14 +-
 Aaru.Devices/Device/AtaCommands/AtaCHS.cs     |  20 +-
 Aaru.Devices/Device/AtaCommands/Atapi.cs      |   2 +-
 Aaru.Devices/Device/AtaCommands/Cfa.cs        |   6 +-
 Aaru.Devices/Device/AtaCommands/MCPT.cs       |   2 +-
 Aaru.Devices/Device/AtaCommands/Smart.cs      |  16 +-
 Aaru.Devices/Device/List.cs                   |   4 +-
 Aaru.Devices/Device/MmcCommands/MMC.cs        |  20 +-
 .../Device/MmcCommands/SecureDigital.cs       |   6 +-
 Aaru.Devices/Device/ScsiCommands/Adaptec.cs   |  10 +-
 .../Device/ScsiCommands/ArchiveCorp.cs        |   4 +-
 Aaru.Devices/Device/ScsiCommands/Certance.cs  |   2 +-
 Aaru.Devices/Device/ScsiCommands/Fujitsu.cs   |   2 +-
 Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs  |   2 +-
 Aaru.Devices/Device/ScsiCommands/HP.cs        |   2 +-
 Aaru.Devices/Device/ScsiCommands/Kreon.cs     |   8 +-
 Aaru.Devices/Device/ScsiCommands/LiteOn.cs    |   2 +-
 Aaru.Devices/Device/ScsiCommands/MMC.cs       |  26 +-
 Aaru.Devices/Device/ScsiCommands/MediaTek.cs  |   2 +-
 Aaru.Devices/Device/ScsiCommands/MiniDisc.cs  |  12 +-
 Aaru.Devices/Device/ScsiCommands/NEC.cs       |   2 +-
 Aaru.Devices/Device/ScsiCommands/Optical.cs   |   2 +-
 Aaru.Devices/Device/ScsiCommands/Pioneer.cs   |   6 +-
 Aaru.Devices/Device/ScsiCommands/Plasmon.cs   |   2 +-
 Aaru.Devices/Device/ScsiCommands/Plextor.cs   |  30 +-
 Aaru.Devices/Device/ScsiCommands/SBC.cs       |  16 +-
 Aaru.Devices/Device/ScsiCommands/SMC.cs       |   2 +-
 Aaru.Devices/Device/ScsiCommands/SPC.cs       |  24 +-
 Aaru.Devices/Device/ScsiCommands/SSC.cs       |  28 +-
 Aaru.Devices/Device/ScsiCommands/SyQuest.cs   |   4 +-
 Aaru.Devices/Remote/Remote.cs                 | 198 ++++++------
 Aaru.Filesystems/Acorn/Info.cs                |  92 +++---
 Aaru.Filesystems/AmigaDOS/Info.cs             |  40 +--
 Aaru.Filesystems/AppleDOS/Super.cs            |  10 +-
 Aaru.Filesystems/AppleMFS/Dir.cs              |  24 +-
 Aaru.Filesystems/AppleMFS/File.cs             |   2 +-
 Aaru.Filesystems/BTRFS/Info.cs                |  92 +++---
 Aaru.Filesystems/CPM/Info.cs                  |  24 +-
 Aaru.Filesystems/CPM/Super.cs                 |  18 +-
 Aaru.Filesystems/EFS/Info.cs                  |   8 +-
 Aaru.Filesystems/FAT/BPB.cs                   |  62 ++--
 Aaru.Filesystems/FAT/Dir.cs                   |   2 +-
 Aaru.Filesystems/FAT/Info.cs                  |  74 ++---
 Aaru.Filesystems/FAT/Super.cs                 |  12 +-
 Aaru.Filesystems/FATX/Super.cs                |  46 +--
 Aaru.Filesystems/FFS/Info.cs                  |  78 ++---
 Aaru.Filesystems/Fossil/Info.cs               |   6 +-
 Aaru.Filesystems/HPOFS/Info.cs                | 106 +++----
 Aaru.Filesystems/ISO9660/File.cs              |   4 +-
 Aaru.Filesystems/ISO9660/Info.cs              |  14 +-
 Aaru.Filesystems/ISO9660/Mode2.cs             |  24 +-
 Aaru.Filesystems/ISO9660/Super.cs             |  16 +-
 Aaru.Filesystems/LIF/Info.cs                  |   2 +-
 Aaru.Filesystems/LisaFS/Extent.cs             |  74 ++---
 Aaru.Filesystems/LisaFS/File.cs               |   2 +-
 Aaru.Filesystems/LisaFS/Info.cs               |  98 +++---
 Aaru.Filesystems/LisaFS/Super.cs              |  34 +-
 Aaru.Filesystems/Locus/Info.cs                |  44 +--
 Aaru.Filesystems/Nintendo/Info.cs             |  68 ++--
 Aaru.Filesystems/ODS/Info.cs                  |   4 +-
 Aaru.Filesystems/ProDOS/Info.cs               |  22 +-
 Aaru.Filesystems/RBF/Info.cs                  |   4 +-
 Aaru.Filesystems/ReFS/Info.cs                 |  28 +-
 Aaru.Filesystems/SolarFS/Info.cs              |  32 +-
 Aaru.Filesystems/UCSDPascal/Info.cs           |  16 +-
 Aaru.Filesystems/UDF/Info.cs                  |  24 +-
 Aaru.Filesystems/UNICOS/Info.cs               |   2 +-
 Aaru.Filesystems/UNIXBFS/Info.cs              |  18 +-
 Aaru.Filesystems/XFS/Info.cs                  |   8 +-
 Aaru.Filesystems/dump/Info.cs                 |   6 +-
 Aaru.Gui/ConsoleHandler.cs                    |   6 +-
 .../ViewModels/Dialogs/ConsoleViewModel.cs    |   2 +-
 .../Panels/SubdirectoryViewModel.cs           |   2 +-
 .../ViewModels/Tabs/PcmciaInfoViewModel.cs    |   2 +-
 Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs |  10 +-
 .../Windows/ImageChecksumViewModel.cs         |  18 +-
 .../Windows/ImageConvertViewModel.cs          |  56 ++--
 .../Windows/ImageEntropyViewModel.cs          |   2 +-
 .../Windows/ImageVerifyViewModel.cs           |   4 +-
 .../ViewModels/Windows/MainWindowViewModel.cs |  20 +-
 .../Windows/SplashWindowViewModel.cs          |   4 +-
 Aaru.Helpers/DateHandlers.cs                  |  22 +-
 Aaru.Images/A2R/Read.cs                       |  38 +--
 Aaru.Images/A2R/Write.cs                      |   2 +-
 .../AaruFormat/ClauniaSubchannelTransform.cs  |  12 +-
 Aaru.Images/AaruFormat/Read.cs                | 224 ++++++-------
 Aaru.Images/AaruFormat/Verify.cs              |  24 +-
 Aaru.Images/AaruFormat/Write.cs               | 234 +++++++-------
 Aaru.Images/Alcohol120/Read.cs                | 124 ++++----
 Aaru.Images/Alcohol120/Write.cs               |   2 +-
 Aaru.Images/Anex86/Identify.cs                |  16 +-
 Aaru.Images/Anex86/Read.cs                    |   2 +-
 Aaru.Images/Anex86/Write.cs                   |   2 +-
 Aaru.Images/Apple2MG/Read.cs                  |  40 +--
 Aaru.Images/Apple2MG/Write.cs                 |   2 +-
 Aaru.Images/AppleDOS/Write.cs                 |   2 +-
 Aaru.Images/AppleNIB/Read.cs                  |  12 +-
 Aaru.Images/Apridisk/Read.cs                  |  18 +-
 Aaru.Images/Apridisk/Write.cs                 |   2 +-
 Aaru.Images/BLU/Read.cs                       |  10 +-
 Aaru.Images/BLU/Write.cs                      |   2 +-
 Aaru.Images/BlindWrite4/Read.cs               | 156 ++++-----
 Aaru.Images/BlindWrite5/Read.cs               | 204 ++++++------
 Aaru.Images/ByteAddressable/AtariLynx.cs      |   2 +-
 Aaru.Images/ByteAddressable/GameBoy.cs        |   2 +-
 Aaru.Images/ByteAddressable/GameBoyAdvance.cs |   2 +-
 Aaru.Images/ByteAddressable/MasterSystem.cs   |   2 +-
 Aaru.Images/ByteAddressable/NES.cs            |   2 +-
 Aaru.Images/ByteAddressable/Nintendo64.cs     |   2 +-
 Aaru.Images/ByteAddressable/SegaMegaDrive.cs  |   2 +-
 Aaru.Images/ByteAddressable/SuperNintendo.cs  |   2 +-
 Aaru.Images/CDRDAO/Identify.cs                |   4 +-
 Aaru.Images/CDRDAO/Read.cs                    | 178 +++++------
 Aaru.Images/CDRDAO/Write.cs                   |   2 +-
 Aaru.Images/CDRWin/Identify.cs                |   4 +-
 Aaru.Images/CDRWin/Read.cs                    | 300 +++++++++---------
 Aaru.Images/CDRWin/Verify.cs                  |  14 +-
 Aaru.Images/CDRWin/Write.cs                   |   2 +-
 Aaru.Images/CHD/Helpers.cs                    |  22 +-
 Aaru.Images/CHD/Read.cs                       | 202 ++++++------
 Aaru.Images/CPCDSK/Identify.cs                |   2 +-
 Aaru.Images/CPCDSK/Read.cs                    |  58 ++--
 Aaru.Images/CisCopy/Read.cs                   |   6 +-
 Aaru.Images/CisCopy/Write.cs                  |   2 +-
 Aaru.Images/CloneCD/Identify.cs               |   4 +-
 Aaru.Images/CloneCD/Read.cs                   |  66 ++--
 Aaru.Images/CloneCD/Write.cs                  |   6 +-
 Aaru.Images/CopyQM/Read.cs                    |  66 ++--
 Aaru.Images/CopyTape/Read.cs                  |  12 +-
 Aaru.Images/CopyTape/Write.cs                 |   2 +-
 Aaru.Images/D88/Identify.cs                   |  12 +-
 Aaru.Images/D88/Read.cs                       |  38 +--
 Aaru.Images/DART/Read.cs                      |   4 +-
 Aaru.Images/DIM/Read.cs                       |  16 +-
 Aaru.Images/DiscFerret/Read.cs                |  12 +-
 Aaru.Images/DiscJuggler/Identify.cs           |   2 +-
 Aaru.Images/DiscJuggler/Read.cs               |  86 ++---
 Aaru.Images/DiskCopy42/Identify.cs            |  24 +-
 Aaru.Images/DiskCopy42/Read.cs                |  36 +--
 Aaru.Images/DiskCopy42/Verify.cs              |  16 +-
 Aaru.Images/DiskCopy42/Write.cs               |   2 +-
 Aaru.Images/DiskDupe/Helpers.cs               |   2 +-
 Aaru.Images/DiskDupe/Read.cs                  |   2 +-
 Aaru.Images/DriDiskCopy/Identify.cs           |  44 +--
 Aaru.Images/DriDiskCopy/Read.cs               |   4 +-
 Aaru.Images/DriDiskCopy/Write.cs              |   2 +-
 Aaru.Images/GDI/Identify.cs                   |   4 +-
 Aaru.Images/GDI/Read.cs                       |  54 ++--
 Aaru.Images/HDCopy/Helpers.cs                 |   4 +-
 Aaru.Images/HDCopy/Read.cs                    |   4 +-
 Aaru.Images/IMD/Read.cs                       |   6 +-
 Aaru.Images/KryoFlux/Read.cs                  |  14 +-
 Aaru.Images/MaxiDisk/Identify.cs              |  16 +-
 Aaru.Images/MaxiDisk/Write.cs                 |   2 +-
 Aaru.Images/NDIF/Read.cs                      |  62 ++--
 Aaru.Images/NHDr0/Identify.cs                 |  16 +-
 Aaru.Images/NHDr0/Write.cs                    |   2 +-
 Aaru.Images/Nero/Identify.cs                  |  10 +-
 Aaru.Images/Nero/Read.cs                      | 222 ++++++-------
 Aaru.Images/Parallels/Read.cs                 |  26 +-
 Aaru.Images/Parallels/Write.cs                |   2 +-
 Aaru.Images/PartClone/Read.cs                 |  26 +-
 Aaru.Images/Partimage/Read.cs                 | 130 ++++----
 Aaru.Images/QCOW/Read.cs                      |  60 ++--
 Aaru.Images/QCOW/Write.cs                     |   2 +-
 Aaru.Images/QCOW2/Identify.cs                 |   4 +-
 Aaru.Images/QCOW2/Read.cs                     |  72 ++---
 Aaru.Images/QCOW2/Write.cs                    |   2 +-
 Aaru.Images/QED/Read.cs                       |  56 ++--
 Aaru.Images/QED/Write.cs                      |   2 +-
 Aaru.Images/RayDIM/Identify.cs                |  12 +-
 Aaru.Images/RayDIM/Write.cs                   |   2 +-
 Aaru.Images/RsIde/Write.cs                    |   2 +-
 Aaru.Images/SaveDskF/Read.cs                  |  46 +--
 Aaru.Images/SaveDskF/Write.cs                 |   2 +-
 Aaru.Images/SuperCardPro/Read.cs              |  86 ++---
 Aaru.Images/SuperCardPro/Write.cs             |   2 +-
 Aaru.Images/T98/Identify.cs                   |   2 +-
 Aaru.Images/T98/Write.cs                      |   2 +-
 Aaru.Images/TeleDisk/Helpers.cs               |  28 +-
 Aaru.Images/TeleDisk/Identify.cs              |  22 +-
 Aaru.Images/TeleDisk/Read.cs                  | 100 +++---
 Aaru.Images/UDIF/Read.cs                      | 148 ++++-----
 Aaru.Images/UDIF/Write.cs                     |   2 +-
 Aaru.Images/UkvFdi/Read.cs                    |  34 +-
 Aaru.Images/VDI/Read.cs                       |  58 ++--
 Aaru.Images/VDI/Write.cs                      |   2 +-
 Aaru.Images/VHD/Read.cs                       | 114 +++----
 Aaru.Images/VHD/Write.cs                      |   2 +-
 Aaru.Images/VHDX/Read.cs                      |  34 +-
 Aaru.Images/VMware/Read.cs                    | 116 +++----
 Aaru.Images/VMware/Write.cs                   |   2 +-
 Aaru.Images/Virtual98/Identify.cs             |  18 +-
 Aaru.Images/Virtual98/Write.cs                |   2 +-
 Aaru.Images/WCDiskImage/Read.cs               |  26 +-
 Aaru.Images/ZZZRawImage/Read.cs               |   4 +-
 Aaru.Images/ZZZRawImage/Write.cs              |   2 +-
 Aaru.Logging/AaruConsole.cs                   | 122 +------
 Aaru.Logging/Delegates.cs                     |  66 ++++
 Aaru.Partitions/AppleMap.cs                   |  80 ++---
 Aaru.Partitions/Apricot.cs                    | 202 ++++++------
 Aaru.Partitions/Atari.cs                      |  32 +-
 Aaru.Partitions/BSD.cs                        |  82 ++---
 Aaru.Partitions/GPT.cs                        |  46 +--
 Aaru.Partitions/Human68k.cs                   |  18 +-
 Aaru.Partitions/MBR.cs                        |  90 +++---
 Aaru.Partitions/NeXT.cs                       |  78 ++---
 Aaru.Partitions/PC98.cs                       |  42 +--
 Aaru.Partitions/RDB.cs                        | 288 ++++++++---------
 Aaru.Partitions/SGI.cs                        |  58 ++--
 Aaru.Partitions/Sun.cs                        | 152 ++++-----
 Aaru.Partitions/VTOC.cs                       | 138 ++++----
 Aaru.Partitions/XENIX.cs                      |   6 +-
 Aaru.Tests.Devices/Main.cs                    |   6 +-
 Aaru/Commands/Archive/Extract.cs              |  54 ++--
 Aaru/Commands/Archive/Info.cs                 |  24 +-
 Aaru/Commands/Archive/List.cs                 |  44 +--
 Aaru/Commands/Database/Update.cs              |   8 +-
 Aaru/Commands/Device/DeviceReport.cs          |  36 +--
 Aaru/Commands/Device/Info.cs                  |  28 +-
 Aaru/Commands/Device/List.cs                  |   4 +-
 Aaru/Commands/Filesystem/ExtractFiles.cs      |  64 ++--
 Aaru/Commands/Filesystem/Info.cs              |  32 +-
 Aaru/Commands/Filesystem/Ls.cs                |  48 +--
 Aaru/Commands/Filesystem/Options.cs           |   4 +-
 Aaru/Commands/Formats.cs                      |   4 +-
 Aaru/Commands/Image/Checksum.cs               |  64 ++--
 Aaru/Commands/Image/Compare.cs                |  24 +-
 Aaru/Commands/Image/Convert.cs                | 214 ++++++-------
 Aaru/Commands/Image/CreateSidecar.cs          |  38 +--
 Aaru/Commands/Image/Decode.cs                 |  18 +-
 Aaru/Commands/Image/Entropy.cs                |  18 +-
 Aaru/Commands/Image/Info.cs                   |  18 +-
 Aaru/Commands/Image/Options.cs                |   4 +-
 Aaru/Commands/Image/Print.cs                  |  24 +-
 Aaru/Commands/Image/Verify.cs                 |  34 +-
 Aaru/Commands/ListEncodings.cs                |   4 +-
 Aaru/Commands/ListNamespaces.cs               |   4 +-
 Aaru/Commands/Media/Dump.cs                   | 100 +++---
 Aaru/Commands/Media/Info.cs                   |  16 +-
 Aaru/Commands/Media/Scan.cs                   |  18 +-
 Aaru/Commands/Remote.cs                       |   8 +-
 Aaru/Main.cs                                  |  10 +-
 306 files changed, 5049 insertions(+), 5073 deletions(-)
 create mode 100644 Aaru.Logging/Delegates.cs

diff --git a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
index ced732e5d..310f886f0 100644
--- a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
+++ b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Aaru" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/Aaru/bin/Debug/net10.0/aaru" />
-    <option name="PROGRAM_PARAMETERS" value="formats" />
+    <option name="PROGRAM_PARAMETERS" value="fs ls qcow.qc.lz" />
     <option name="WORKING_DIRECTORY" value="/mnt/AaruTests/Media image formats/QEMU/QEMU Copy On Write" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
diff --git a/Aaru.Archives/Symbian/Info.cs b/Aaru.Archives/Symbian/Info.cs
index 08ec85679..8d843b8e1 100644
--- a/Aaru.Archives/Symbian/Info.cs
+++ b/Aaru.Archives/Symbian/Info.cs
@@ -83,35 +83,35 @@ public sealed partial class Symbian
         stream.EnsureRead(buffer, 0, buffer.Length);
         SymbianHeader sh = Marshal.ByteArrayToStructureLittleEndian<SymbianHeader>(buffer);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.uid1 = {0}",         sh.uid1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.uid2 = {0}",         sh.uid2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.uid3 = {0}",         sh.uid3);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.uid4 = {0}",         sh.uid4);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.crc16 = {0}",        sh.crc16);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.languages = {0}",    sh.languages);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.files = {0}",        sh.files);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.requisites = {0}",   sh.requisites);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.inst_lang = {0}",    sh.inst_lang);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.inst_files = {0}",   sh.inst_files);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.inst_drive = {0}",   sh.inst_drive);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.capabilities = {0}", sh.capabilities);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.inst_version = {0}", sh.inst_version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.options = {0}",      sh.options);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.type = {0}",         sh.type);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.major = {0}",        sh.major);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.minor = {0}",        sh.minor);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.variant = {0}",      sh.variant);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.lang_ptr = {0}",     sh.lang_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.files_ptr = {0}",    sh.files_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.reqs_ptr = {0}",     sh.reqs_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.certs_ptr = {0}",    sh.certs_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.comp_ptr = {0}",     sh.comp_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.sig_ptr = {0}",      sh.sig_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.caps_ptr = {0}",     sh.caps_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.instspace = {0}",    sh.instspace);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.maxinsspc = {0}",    sh.maxinsspc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.reserved1 = {0}",    sh.reserved1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.reserved2 = {0}",    sh.reserved2);
+        AaruConsole.Debug(MODULE_NAME, "sh.uid1 = {0}",         sh.uid1);
+        AaruConsole.Debug(MODULE_NAME, "sh.uid2 = {0}",         sh.uid2);
+        AaruConsole.Debug(MODULE_NAME, "sh.uid3 = {0}",         sh.uid3);
+        AaruConsole.Debug(MODULE_NAME, "sh.uid4 = {0}",         sh.uid4);
+        AaruConsole.Debug(MODULE_NAME, "sh.crc16 = {0}",        sh.crc16);
+        AaruConsole.Debug(MODULE_NAME, "sh.languages = {0}",    sh.languages);
+        AaruConsole.Debug(MODULE_NAME, "sh.files = {0}",        sh.files);
+        AaruConsole.Debug(MODULE_NAME, "sh.requisites = {0}",   sh.requisites);
+        AaruConsole.Debug(MODULE_NAME, "sh.inst_lang = {0}",    sh.inst_lang);
+        AaruConsole.Debug(MODULE_NAME, "sh.inst_files = {0}",   sh.inst_files);
+        AaruConsole.Debug(MODULE_NAME, "sh.inst_drive = {0}",   sh.inst_drive);
+        AaruConsole.Debug(MODULE_NAME, "sh.capabilities = {0}", sh.capabilities);
+        AaruConsole.Debug(MODULE_NAME, "sh.inst_version = {0}", sh.inst_version);
+        AaruConsole.Debug(MODULE_NAME, "sh.options = {0}",      sh.options);
+        AaruConsole.Debug(MODULE_NAME, "sh.type = {0}",         sh.type);
+        AaruConsole.Debug(MODULE_NAME, "sh.major = {0}",        sh.major);
+        AaruConsole.Debug(MODULE_NAME, "sh.minor = {0}",        sh.minor);
+        AaruConsole.Debug(MODULE_NAME, "sh.variant = {0}",      sh.variant);
+        AaruConsole.Debug(MODULE_NAME, "sh.lang_ptr = {0}",     sh.lang_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.files_ptr = {0}",    sh.files_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.reqs_ptr = {0}",     sh.reqs_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.certs_ptr = {0}",    sh.certs_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.comp_ptr = {0}",     sh.comp_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.sig_ptr = {0}",      sh.sig_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.caps_ptr = {0}",     sh.caps_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.instspace = {0}",    sh.instspace);
+        AaruConsole.Debug(MODULE_NAME, "sh.maxinsspc = {0}",    sh.maxinsspc);
+        AaruConsole.Debug(MODULE_NAME, "sh.reserved1 = {0}",    sh.reserved1);
+        AaruConsole.Debug(MODULE_NAME, "sh.reserved2 = {0}",    sh.reserved2);
 
         _release6 = false;
 
@@ -187,7 +187,7 @@ public sealed partial class Symbian
 
         for(int i = 0; i < sh.languages; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "Found component name for language {0} at {1} with a length of {2} bytes",
                                        languages[i],
                                        componentRecord.namesPointers[i],
diff --git a/Aaru.Archives/Symbian/Open.cs b/Aaru.Archives/Symbian/Open.cs
index 7b70f429b..823d432f3 100644
--- a/Aaru.Archives/Symbian/Open.cs
+++ b/Aaru.Archives/Symbian/Open.cs
@@ -62,41 +62,41 @@ public sealed partial class Symbian
         _stream.EnsureRead(buffer, 0, buffer.Length);
         SymbianHeader sh = Marshal.ByteArrayToStructureLittleEndian<SymbianHeader>(buffer);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.uid1 = {0}",         sh.uid1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.uid2 = {0}",         sh.uid2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.uid3 = {0}",         sh.uid3);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.uid4 = {0}",         sh.uid4);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.crc16 = {0}",        sh.crc16);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.languages = {0}",    sh.languages);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.files = {0}",        sh.files);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.requisites = {0}",   sh.requisites);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.inst_lang = {0}",    sh.inst_lang);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.inst_files = {0}",   sh.inst_files);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.inst_drive = {0}",   sh.inst_drive);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.capabilities = {0}", sh.capabilities);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.inst_version = {0}", sh.inst_version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.options = {0}",      sh.options);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.type = {0}",         sh.type);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.major = {0}",        sh.major);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.minor = {0}",        sh.minor);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.variant = {0}",      sh.variant);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.lang_ptr = {0}",     sh.lang_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.files_ptr = {0}",    sh.files_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.reqs_ptr = {0}",     sh.reqs_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.certs_ptr = {0}",    sh.certs_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.comp_ptr = {0}",     sh.comp_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.sig_ptr = {0}",      sh.sig_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.caps_ptr = {0}",     sh.caps_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.instspace = {0}",    sh.instspace);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.maxinsspc = {0}",    sh.maxinsspc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.reserved1 = {0}",    sh.reserved1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sh.reserved2 = {0}",    sh.reserved2);
+        AaruConsole.Debug(MODULE_NAME, "sh.uid1 = {0}",         sh.uid1);
+        AaruConsole.Debug(MODULE_NAME, "sh.uid2 = {0}",         sh.uid2);
+        AaruConsole.Debug(MODULE_NAME, "sh.uid3 = {0}",         sh.uid3);
+        AaruConsole.Debug(MODULE_NAME, "sh.uid4 = {0}",         sh.uid4);
+        AaruConsole.Debug(MODULE_NAME, "sh.crc16 = {0}",        sh.crc16);
+        AaruConsole.Debug(MODULE_NAME, "sh.languages = {0}",    sh.languages);
+        AaruConsole.Debug(MODULE_NAME, "sh.files = {0}",        sh.files);
+        AaruConsole.Debug(MODULE_NAME, "sh.requisites = {0}",   sh.requisites);
+        AaruConsole.Debug(MODULE_NAME, "sh.inst_lang = {0}",    sh.inst_lang);
+        AaruConsole.Debug(MODULE_NAME, "sh.inst_files = {0}",   sh.inst_files);
+        AaruConsole.Debug(MODULE_NAME, "sh.inst_drive = {0}",   sh.inst_drive);
+        AaruConsole.Debug(MODULE_NAME, "sh.capabilities = {0}", sh.capabilities);
+        AaruConsole.Debug(MODULE_NAME, "sh.inst_version = {0}", sh.inst_version);
+        AaruConsole.Debug(MODULE_NAME, "sh.options = {0}",      sh.options);
+        AaruConsole.Debug(MODULE_NAME, "sh.type = {0}",         sh.type);
+        AaruConsole.Debug(MODULE_NAME, "sh.major = {0}",        sh.major);
+        AaruConsole.Debug(MODULE_NAME, "sh.minor = {0}",        sh.minor);
+        AaruConsole.Debug(MODULE_NAME, "sh.variant = {0}",      sh.variant);
+        AaruConsole.Debug(MODULE_NAME, "sh.lang_ptr = {0}",     sh.lang_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.files_ptr = {0}",    sh.files_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.reqs_ptr = {0}",     sh.reqs_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.certs_ptr = {0}",    sh.certs_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.comp_ptr = {0}",     sh.comp_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.sig_ptr = {0}",      sh.sig_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.caps_ptr = {0}",     sh.caps_ptr);
+        AaruConsole.Debug(MODULE_NAME, "sh.instspace = {0}",    sh.instspace);
+        AaruConsole.Debug(MODULE_NAME, "sh.maxinsspc = {0}",    sh.maxinsspc);
+        AaruConsole.Debug(MODULE_NAME, "sh.reserved1 = {0}",    sh.reserved1);
+        AaruConsole.Debug(MODULE_NAME, "sh.reserved2 = {0}",    sh.reserved2);
 
         _release6 = false;
 
         if(sh.uid1 == SYMBIAN9_MAGIC)
         {
-            AaruConsole.ErrorWriteLine("Symbian Installation Files from Symbian OS 9 or later are not yet supported.");
+            AaruConsole.Error("Symbian Installation Files from Symbian OS 9 or later are not yet supported.");
 
             return ErrorNumber.NotSupported;
         }
diff --git a/Aaru.Archives/Symbian/Parser.cs b/Aaru.Archives/Symbian/Parser.cs
index e35e3d5a0..86638a244 100644
--- a/Aaru.Archives/Symbian/Parser.cs
+++ b/Aaru.Archives/Symbian/Parser.cs
@@ -55,7 +55,7 @@ public sealed partial class Symbian
         for(int i = 0; i < conditionLevel; i++) tabulationChars[i] = '\t';
         string tabulation                                          = new(tabulationChars);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "Seeking to {0} for parsing of file {1} of {2}",
                                    offset,
                                    currentFile,
@@ -64,7 +64,7 @@ public sealed partial class Symbian
         br.BaseStream.Seek(offset, SeekOrigin.Begin);
         var recordType = (FileRecordType)br.ReadUInt32();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "Found record with type {0}", recordType);
+        AaruConsole.Debug(MODULE_NAME, "Found record with type {0}", recordType);
 
         br.BaseStream.Seek(-sizeof(FileRecordType), SeekOrigin.Current);
 
@@ -118,7 +118,7 @@ public sealed partial class Symbian
                     decodedFileRecord.mime = _encoding.GetString(buffer);
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "Found file for \"{0}\" with length {1} at {2}",
                                            decodedFileRecord.destinationName,
                                            decodedFileRecord.length,
diff --git a/Aaru.Checksums/CDChecksums.cs b/Aaru.Checksums/CDChecksums.cs
index 64761a2df..4cefca467 100644
--- a/Aaru.Checksums/CDChecksums.cs
+++ b/Aaru.Checksums/CDChecksums.cs
@@ -201,7 +201,7 @@ public static class CdChecksums
                 {
                     if(channel[i] == 0x00) continue;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "Mode 0 sector with error at address: {0:X2}:{1:X2}:{2:X2}",
                                                channel[0x00C],
                                                channel[0x00D],
@@ -224,7 +224,7 @@ public static class CdChecksums
                            channel[0x819] != 0x00 ||
                            channel[0x81A] != 0x00 ||
                            channel[0x81B] != 0x00:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "Mode 1 sector with data in reserved bytes at address: {0:X2}:{1:X2}:{2:X2}",
                                            channel[0x00C],
                                            channel[0x00D],
@@ -253,7 +253,7 @@ public static class CdChecksums
 
                 if(failedEccP)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check",
                                                channel[0x00C],
                                                channel[0x00D],
@@ -262,7 +262,7 @@ public static class CdChecksums
 
                 if(failedEccQ)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check",
                                                channel[0x00C],
                                                channel[0x00D],
@@ -276,7 +276,7 @@ public static class CdChecksums
 
                 if(calculatedEdc == storedEdc) return !failedEccP && !failedEccQ;
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "Mode 1 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}",
                                            channel[0x00C],
                                            channel[0x00D],
@@ -302,7 +302,7 @@ public static class CdChecksums
                        channel[0x012] != channel[0x016] ||
                        channel[0x013] != channel[0x017])
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "Subheader copies differ in mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}",
                                                    channel[0x00C],
                                                    channel[0x00D],
@@ -320,7 +320,7 @@ public static class CdChecksums
 
                     if(calculatedEdc == storedEdc) return true;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "Mode 2 form 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}",
                                                channel[0x00C],
                                                channel[0x00D],
@@ -337,7 +337,7 @@ public static class CdChecksums
                        channel[0x012] != channel[0x016] ||
                        channel[0x013] != channel[0x017])
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "Subheader copies differ in mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}",
                                                    channel[0x00C],
                                                    channel[0x00D],
@@ -359,7 +359,7 @@ public static class CdChecksums
 
                     if(failedEccP)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC P check",
                                                    channel[0x00C],
                                                    channel[0x00D],
@@ -368,7 +368,7 @@ public static class CdChecksums
 
                     if(failedEccQ)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "Mode 2 form 1 sector at address: {0:X2}:{1:X2}:{2:X2}, fails ECC Q check",
                                                    channel[0x00C],
                                                    channel[0x00D],
@@ -382,7 +382,7 @@ public static class CdChecksums
 
                     if(calculatedEdc == storedEdc) return !failedEccP && !failedEccQ;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "Mode 2 sector at address: {0:X2}:{1:X2}:{2:X2}, got CRC 0x{3:X8} expected 0x{4:X8}",
                                                channel[0x00C],
                                                channel[0x00D],
@@ -394,7 +394,7 @@ public static class CdChecksums
                 }
             }
             default:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "Unknown mode {0} sector at address: {1:X2}:{2:X2}:{3:X2}",
                                            channel[0x00F],
                                            channel[0x00C],
@@ -534,35 +534,35 @@ public static class CdChecksums
         switch(cdSubRwPack1[0])
         {
             case 0x00:
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Detected_Zero_Pack_in_subchannel);
+                AaruConsole.Debug(MODULE_NAME, Localization.Detected_Zero_Pack_in_subchannel);
 
                 break;
             case 0x08:
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Detected_Line_Graphics_Pack_in_subchannel);
+                AaruConsole.Debug(MODULE_NAME, Localization.Detected_Line_Graphics_Pack_in_subchannel);
 
                 break;
             case 0x09:
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Detected_CD_G_Pack_in_subchannel);
+                AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_G_Pack_in_subchannel);
 
                 break;
             case 0x0A:
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Detected_CD_EG_Pack_in_subchannel);
+                AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_EG_Pack_in_subchannel);
 
                 break;
             case 0x14:
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Detected_CD_TEXT_Pack_in_subchannel);
+                AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_TEXT_Pack_in_subchannel);
 
                 break;
             case 0x18:
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Detected_CD_MIDI_Pack_in_subchannel);
+                AaruConsole.Debug(MODULE_NAME, Localization.Detected_CD_MIDI_Pack_in_subchannel);
 
                 break;
             case 0x38:
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Detected_User_Pack_in_subchannel);
+                AaruConsole.Debug(MODULE_NAME, Localization.Detected_User_Pack_in_subchannel);
 
                 break;
             default:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Detected_unknown_Pack_type_in_subchannel_mode_0_item_1,
                                            Convert.ToString(cdSubRwPack1[0] & 0x38, 2),
                                            Convert.ToString(cdSubRwPack1[0] & 0x07, 2));
@@ -577,7 +577,7 @@ public static class CdChecksums
 
         if(qSubChannelCrc != calculatedQcrc)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Q_subchannel_CRC_0_expected_1,
                                        calculatedQcrc,
                                        qSubChannelCrc);
@@ -594,7 +594,7 @@ public static class CdChecksums
 
             if(cdTextPack1Crc != calculatedCdtp1Crc && cdTextPack1Crc != 0)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.CD_Text_Pack_one_CRC_0_expected_1,
                                            cdTextPack1Crc,
                                            calculatedCdtp1Crc);
@@ -610,14 +610,14 @@ public static class CdChecksums
             Array.Copy(cdTextPack2, 0, cdTextPack2ForCrc, 0, 16);
             ushort calculatedCdtp2Crc = CRC16CcittContext.Calculate(cdTextPack2ForCrc);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Cyclic_CDTP2_0_Calc_CDTP2_1,
                                        cdTextPack2Crc,
                                        calculatedCdtp2Crc);
 
             if(cdTextPack2Crc != calculatedCdtp2Crc && cdTextPack2Crc != 0)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.CD_Text_Pack_two_CRC_0_expected_1,
                                            cdTextPack2Crc,
                                            calculatedCdtp2Crc);
@@ -633,14 +633,14 @@ public static class CdChecksums
             Array.Copy(cdTextPack3, 0, cdTextPack3ForCrc, 0, 16);
             ushort calculatedCdtp3Crc = CRC16CcittContext.Calculate(cdTextPack3ForCrc);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Cyclic_CDTP3_0_Calc_CDTP3_1,
                                        cdTextPack3Crc,
                                        calculatedCdtp3Crc);
 
             if(cdTextPack3Crc != calculatedCdtp3Crc && cdTextPack3Crc != 0)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.CD_Text_Pack_three_CRC_0_expected_1,
                                            cdTextPack3Crc,
                                            calculatedCdtp3Crc);
@@ -656,14 +656,14 @@ public static class CdChecksums
         Array.Copy(cdTextPack4, 0, cdTextPack4ForCrc, 0, 16);
         ushort calculatedCdtp4Crc = CRC16CcittContext.Calculate(cdTextPack4ForCrc);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Cyclic_CDTP4_0_Calc_CDTP4_1,
                                    cdTextPack4Crc,
                                    calculatedCdtp4Crc);
 
         if(cdTextPack4Crc == calculatedCdtp4Crc || cdTextPack4Crc == 0) return status;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.CD_Text_Pack_four_CRC_0_expected_1,
                                    cdTextPack4Crc,
                                    calculatedCdtp4Crc);
diff --git a/Aaru.Checksums/ReedSolomon.cs b/Aaru.Checksums/ReedSolomon.cs
index 305976905..4f4c7f44f 100644
--- a/Aaru.Checksums/ReedSolomon.cs
+++ b/Aaru.Checksums/ReedSolomon.cs
@@ -452,17 +452,17 @@ public class ReedSolomon
 
             if(count != noEras)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.lambda_is_wrong);
+                AaruConsole.Debug(MODULE_NAME, Localization.lambda_is_wrong);
 
                 return -1;
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Erasure_positions_as_determined_by_roots_of_Eras_Loc_Poly);
 
-            for(i = 0; i < count; i++) AaruConsole.DebugWriteLine(MODULE_NAME, "{0} ", loc[i]);
+            for(i = 0; i < count; i++) AaruConsole.Debug(MODULE_NAME, "{0} ", loc[i]);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\n");
+            AaruConsole.Debug(MODULE_NAME, "\n");
 #endif
         }
 
@@ -569,11 +569,11 @@ public class ReedSolomon
         }
 
 #if DEBUG
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Final_error_positions);
+        AaruConsole.Debug(MODULE_NAME, Localization.Final_error_positions);
 
-        for(i = 0; i < count; i++) AaruConsole.DebugWriteLine(MODULE_NAME, "{0} ", loc[i]);
+        for(i = 0; i < count; i++) AaruConsole.Debug(MODULE_NAME, "{0} ", loc[i]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "\n");
+        AaruConsole.Debug(MODULE_NAME, "\n");
 #endif
 
         if(degLambda != count) return -1;
@@ -625,7 +625,7 @@ public class ReedSolomon
 
             if(den == 0)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.ERROR_denominator_equals_zero);
+                AaruConsole.Debug(MODULE_NAME, Localization.ERROR_denominator_equals_zero);
 
                 return -1;
             }
diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs
index d74c17aa0..e9e11159b 100644
--- a/Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs
+++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromAta.cs
@@ -62,7 +62,7 @@ public static partial class MediaTypeFromDevice
            blocks != 1961069)
             return MediaType.Unknown;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization
                                       .Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ);
 
diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs
index e2f40ef5e..cbbd66d2e 100644
--- a/Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs
+++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromMmc.cs
@@ -59,7 +59,7 @@ public static partial class MediaTypeFromDevice
                 {
                     if(blocks == 1281856)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650,
                                                    mediumType,
@@ -69,7 +69,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.PD650_WORM;
                     }
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization
                                                   .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650,
                                                mediumType,
@@ -79,21 +79,21 @@ public static partial class MediaTypeFromDevice
                     return MediaType.PD650;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc,
                                            mediumType);
 
                 return MediaType.CD;
             case 0x01:
             case 0x05:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_ROM,
                                            mediumType);
 
                 return MediaType.CDROM;
             case 0x02:
             case 0x06:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization
                                               .SCSI_medium_type_is_0_setting_media_type_to_Compact_Disc_Digital_Audio,
                                            mediumType);
@@ -101,13 +101,13 @@ public static partial class MediaTypeFromDevice
                 return MediaType.CDDA;
             case 0x03:
             case 0x07:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_medium_type_is_0_setting_media_type_to_CD_Plus,
                                            mediumType);
 
                 return MediaType.CDPLUS;
             case 0x04:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_medium_type_is_0_setting_media_type_to_Photo_CD,
                                            mediumType);
 
@@ -121,7 +121,7 @@ public static partial class MediaTypeFromDevice
             case 0x16:
             case 0x17:
             case 0x18:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_medium_type_is_0_setting_media_type_to_CDR,
                                            mediumType);
 
@@ -135,7 +135,7 @@ public static partial class MediaTypeFromDevice
             case 0x26:
             case 0x27:
             case 0x28:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_medium_type_is_0_setting_media_type_to_CDRW,
                                            mediumType);
 
@@ -143,7 +143,7 @@ public static partial class MediaTypeFromDevice
             case 0x40 when isUsb && !opticalDisc:
             case 0x41 when isUsb && !opticalDisc:
             case 0x42 when isUsb && !opticalDisc:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization
                                               .SCSI_medium_type_is_0_and_device_is_USB_setting_media_type_to_Flash_Drive,
                                            mediumType);
@@ -155,7 +155,7 @@ public static partial class MediaTypeFromDevice
                     switch(densityCode)
                     {
                         case 0x42:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO2,
                                                        mediumType,
@@ -163,7 +163,7 @@ public static partial class MediaTypeFromDevice
 
                             return MediaType.LTO2;
                         case 0x44:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO3,
                                                        mediumType,
@@ -171,7 +171,7 @@ public static partial class MediaTypeFromDevice
 
                             return MediaType.LTO3;
                         case 0x46:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO4,
                                                        mediumType,
@@ -179,7 +179,7 @@ public static partial class MediaTypeFromDevice
 
                             return MediaType.LTO4;
                         case 0x58:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .SCSI_medium_type_is_0_density_code_is_1_drive_starts_with_ult_setting_media_type_to_LTO5,
                                                        mediumType,
diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs
index 47a253af4..546f4ea6c 100644
--- a/Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs
+++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromOdc.cs
@@ -47,7 +47,7 @@ public static partial class MediaTypeFromDevice
     {
         if(mediumType != 0x01 && mediumType != 0x02 && mediumType != 0x03 && mediumType != 0x05 && mediumType != 0x07)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.SCSI_medium_type_is_0_setting_media_type_to_unknown_magneto_optical,
                                        mediumType);
 
@@ -61,7 +61,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 248826:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA154,
                                                    mediumType,
                                                    blocks,
@@ -69,7 +69,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_154;
                     case 429975:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA201_embossed,
                                                    mediumType,
                                                    blocks,
@@ -77,7 +77,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_201_ROM;
                     case 446325:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA201,
                                                    mediumType,
                                                    blocks,
@@ -85,7 +85,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_201;
                     case 694929:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA223,
                                                    mediumType,
                                                    blocks,
@@ -93,7 +93,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_223_512;
                     case 904995:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA183,
                                                    mediumType,
                                                    blocks,
@@ -101,7 +101,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_183_512;
                     case 1041500:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO15041,
                                                    mediumType,
                                                    blocks,
@@ -110,7 +110,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.ISO_15041_512;
                     case 1128772:
                     case 1163337:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA184,
                                                    mediumType,
                                                    blocks,
@@ -118,7 +118,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_184_512;
                     case 1281856:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650,
                                                    mediumType,
@@ -127,7 +127,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.PD650_WORM;
                     case 1298496:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650,
                                                    mediumType,
@@ -137,7 +137,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.PD650;
                     case 1644581:
                     case 1647371:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA195,
                                                    mediumType,
                                                    blocks,
@@ -145,7 +145,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_195_512;
                     case 2244958:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO14517,
                                                    mediumType,
                                                    blocks,
@@ -153,7 +153,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ISO_14517_512;
                     default:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Unknown_MO,
                                                    mediumType,
                                                    blocks,
@@ -168,7 +168,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 314569:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO10089,
                                                    mediumType,
                                                    blocks,
@@ -176,7 +176,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ISO_10089;
                     case 371371:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA223,
                                                    mediumType,
                                                    blocks,
@@ -184,7 +184,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_223;
                     case 498526:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA184,
                                                    mediumType,
                                                    blocks,
@@ -193,7 +193,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.ECMA_183;
                     case 603466:
                     case 637041:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA184,
                                                    mediumType,
                                                    blocks,
@@ -202,7 +202,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.ECMA_184;
                     case 936921:
                     case 948770:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA195,
                                                    mediumType,
                                                    blocks,
@@ -210,7 +210,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_195;
                     case 1244621:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA238,
                                                    mediumType,
                                                    blocks,
@@ -218,7 +218,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_238;
                     case 1273011:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO14517,
                                                    mediumType,
                                                    blocks,
@@ -226,7 +226,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ISO_14517;
                     case 2319786:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO15286,
                                                    mediumType,
                                                    blocks,
@@ -234,7 +234,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ISO_15286_1024;
                     case 4383356:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA322,
                                                    mediumType,
                                                    blocks,
@@ -242,7 +242,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_322_1k;
                     case 14476734:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA260,
                                                    mediumType,
                                                    blocks,
@@ -250,7 +250,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_260;
                     case 24445990:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA260,
                                                    mediumType,
                                                    blocks,
@@ -258,7 +258,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_260_Double;
                     default:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Unknown_MO,
                                                    mediumType,
                                                    blocks,
@@ -276,7 +276,7 @@ public static partial class MediaTypeFromDevice
                     case 318988:
                     case 320332:
                     case 321100:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA239,
                                                    mediumType,
                                                    blocks,
@@ -284,7 +284,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_239;
                     case 605846:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_GigaMO,
                                                    mediumType,
                                                    blocks,
@@ -292,7 +292,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.GigaMo;
                     case 1063146:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_GigaMO2,
                                                    mediumType,
                                                    blocks,
@@ -300,7 +300,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.GigaMo2;
                     case 1128134:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA280,
                                                    mediumType,
                                                    blocks,
@@ -308,7 +308,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_280;
                     case 1263472:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO15286,
                                                    mediumType,
                                                    blocks,
@@ -316,7 +316,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ISO_15286;
                     case 2043664:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA322,
                                                    mediumType,
                                                    blocks,
@@ -324,7 +324,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_322_2k;
                     case 7355716:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA317,
                                                    mediumType,
                                                    blocks,
@@ -332,7 +332,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_317;
                     default:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Unknown_MO,
                                                    mediumType,
                                                    blocks,
@@ -347,7 +347,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 1095840:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA322,
                                                    mediumType,
                                                    blocks,
@@ -355,7 +355,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_322;
                     default:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Unknown_MO,
                                                    mediumType,
                                                    blocks,
@@ -370,7 +370,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 1834348:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_UDO,
                                                    mediumType,
                                                    blocks,
@@ -378,7 +378,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.UDO;
                     case 3668759:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_WORM_UDO2,
                                                    mediumType,
                                                    blocks,
@@ -386,7 +386,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.UDO2_WORM;
                     case 3669724:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_UDO2,
                                                    mediumType,
                                                    blocks,
@@ -394,7 +394,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.UDO2;
                     default:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Unknown_MO,
                                                    mediumType,
                                                    blocks,
@@ -405,7 +405,7 @@ public static partial class MediaTypeFromDevice
             }
 
             default:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_Unknown_MO,
                                            mediumType,
                                            blocks,
diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs
index 173463491..6133df422 100644
--- a/Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs
+++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromSbc.cs
@@ -51,7 +51,7 @@ public static partial class MediaTypeFromDevice
         switch(mediumType)
         {
             case 0x09:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_ECMA54,
                                            mediumType,
                                            blocks,
@@ -59,7 +59,7 @@ public static partial class MediaTypeFromDevice
 
                 return MediaType.ECMA_54;
             case 0x0A:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_ECMA59,
                                            mediumType,
                                            blocks,
@@ -70,7 +70,7 @@ public static partial class MediaTypeFromDevice
                 switch(blockSize)
                 {
                     case 256:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA69,
                                                    mediumType,
                                                    blocks,
@@ -78,7 +78,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_69_26;
                     case 512:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA69,
                                                    mediumType,
                                                    blocks,
@@ -86,7 +86,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_69_15;
                     case 1024:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA69,
                                                    mediumType,
                                                    blocks,
@@ -95,7 +95,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.ECMA_69_8;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_Unknown,
                                            mediumType,
                                            blocks,
@@ -103,7 +103,7 @@ public static partial class MediaTypeFromDevice
 
                 return MediaType.Unknown;
             case 0x0E:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_ECMA66,
                                            mediumType,
                                            blocks,
@@ -111,7 +111,7 @@ public static partial class MediaTypeFromDevice
 
                 return MediaType.ECMA_66;
             case 0x12:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_ECMA70,
                                            mediumType,
                                            blocks,
@@ -122,7 +122,7 @@ public static partial class MediaTypeFromDevice
                 switch(blockSize)
                 {
                     case 256:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA78,
                                                    mediumType,
                                                    blocks,
@@ -130,7 +130,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_78;
                     case 512:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA78,
                                                    mediumType,
                                                    blocks,
@@ -139,7 +139,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.ECMA_78_2;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_Unknown,
                                            mediumType,
                                            blocks,
@@ -150,7 +150,7 @@ public static partial class MediaTypeFromDevice
                 switch(blockSize)
                 {
                     case 256:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA99,
                                                    mediumType,
                                                    blocks,
@@ -158,7 +158,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_99_26;
                     case 512:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA99,
                                                    mediumType,
                                                    blocks,
@@ -166,7 +166,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_99_15;
                     case 1024:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA99,
                                                    mediumType,
                                                    blocks,
@@ -175,7 +175,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.ECMA_99_8;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_Unknown,
                                            mediumType,
                                            blocks,
@@ -183,7 +183,7 @@ public static partial class MediaTypeFromDevice
 
                 return MediaType.Unknown;
             case 0x1E:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_IBM_MF2DD,
                                            mediumType,
                                            blocks,
@@ -194,7 +194,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 58620544:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_REV120,
                                                    mediumType,
                                                    blocks,
@@ -202,7 +202,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.REV120;
                     case 34185728:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_REV70,
                                                    mediumType,
                                                    blocks,
@@ -210,7 +210,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.REV70;
                     case 17090880:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_REV35,
                                                    mediumType,
                                                    blocks,
@@ -221,7 +221,7 @@ public static partial class MediaTypeFromDevice
 
                 break;
             case 0x93:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_PC98_MF2HD,
                                            mediumType,
                                            blocks,
@@ -229,7 +229,7 @@ public static partial class MediaTypeFromDevice
 
                 return MediaType.NEC_35_HD_15;
             case 0x94:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_IBM_MF2HD,
                                            mediumType,
                                            blocks,
@@ -244,7 +244,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 720:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Atari_MD1SD,
                                                    mediumType,
                                                    blocks,
@@ -252,7 +252,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ATARI_525_SD;
                     case 1040:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Atari_MD1DD,
                                                    mediumType,
                                                    blocks,
@@ -260,7 +260,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ATARI_525_DD;
                     case 1898:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_33FD,
                                                    mediumType,
                                                    blocks,
@@ -268,7 +268,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.IBM33FD_128;
                     case 2002:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA54,
                                                    mediumType,
                                                    blocks,
@@ -276,7 +276,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_54;
                     case 3848:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_43FD,
                                                    mediumType,
                                                    blocks,
@@ -284,7 +284,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.IBM43FD_128;
                     case 4004:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA59,
                                                    mediumType,
                                                    blocks,
@@ -298,7 +298,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 322:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA56,
                                                    mediumType,
                                                    blocks,
@@ -306,7 +306,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_66;
                     case 400:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Acorn_MD1SD,
                                                    mediumType,
                                                    blocks,
@@ -314,7 +314,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ACORN_525_SS_SD_40;
                     case 455:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Apple_DOS32,
                                                    mediumType,
                                                    blocks,
@@ -322,7 +322,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.Apple32SS;
                     case 560:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Apple_DOS33,
                                                    mediumType,
                                                    blocks,
@@ -330,7 +330,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.Apple33SS;
                     case 640:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Acorn_MD1DD,
                                                    mediumType,
                                                    blocks,
@@ -338,7 +338,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ACORN_525_SS_DD_40;
                     case 720:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Atari_MD1DD,
                                                    mediumType,
                                                    blocks,
@@ -346,7 +346,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ATARI_525_DD;
                     case 800:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80,
                                                    mediumType,
                                                    blocks,
@@ -354,7 +354,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ACORN_525_SS_SD_80;
                     case 910:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Apple_DOS32_DS,
                                                    mediumType,
                                                    blocks,
@@ -362,7 +362,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.Apple32DS;
                     case 1120:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Apple_DOS33_DS,
                                                    mediumType,
                                                    blocks,
@@ -370,7 +370,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.Apple33DS;
                     case 1121:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_33FD,
                                                    mediumType,
                                                    blocks,
@@ -378,7 +378,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.IBM33FD_256;
                     case 1232:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_MetaFloppy,
                                                    mediumType,
                                                    blocks,
@@ -386,7 +386,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.MetaFloppy_Mod_II;
                     case 1280 when mediumType == 0x01:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Acorn_MD1DD_80,
                                                    mediumType,
                                                    blocks,
@@ -394,7 +394,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ACORN_525_SS_DD_80;
                     case 1280:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA70,
                                                    mediumType,
                                                    blocks,
@@ -402,7 +402,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_70;
                     case 2002:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_DEC_RX02,
                                                    mediumType,
                                                    blocks,
@@ -410,7 +410,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.RX02;
                     case 2560:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA78,
                                                    mediumType,
                                                    blocks,
@@ -418,7 +418,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_78;
                     case 3848:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_53FD,
                                                    mediumType,
                                                    blocks,
@@ -426,7 +426,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.IBM53FD_256;
                     case 4004:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA99,
                                                    mediumType,
                                                    blocks,
@@ -434,29 +434,29 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_99_26;
                     case 19584 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "Drive manufacturer is SyQuest, media has 19584 blocks of 256 bytes, setting media type to SQ100.");
 
                         return MediaType.SQ200;
                     case 39360 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "Drive manufacturer is SyQuest, media has 39360 blocks of 256 bytes, setting media type to SQ200.");
 
                         return MediaType.SQ200;
 
                     case 39168 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
                     case 41004 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Bernoulli10,
                                                    blocks);
 
                         return MediaType.Bernoulli10;
                     case 46956:
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_HF12);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_HF12);
 
                         return MediaType.HF12;
                     case 78936:
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_HF24);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_HF24);
 
                         return MediaType.HF12;
                 }
@@ -466,7 +466,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 256:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_23FD,
                                                    mediumType,
                                                    blocks,
@@ -480,7 +480,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 320:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MD1DD_8,
                                                    mediumType,
                                                    blocks,
@@ -488,7 +488,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_525_SS_DD_8;
                     case 360:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MD1DD,
                                                    mediumType,
                                                    blocks,
@@ -496,7 +496,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_525_SS_DD_9;
                     case 610:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_33FD,
                                                    mediumType,
                                                    blocks,
@@ -504,7 +504,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.IBM33FD_512;
                     case 630 when mediumType == 0x01:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Apricot_MF2DD,
                                                    mediumType,
                                                    blocks,
@@ -512,7 +512,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.Apricot_35;
                     case 640 when mediumType == 0x01:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MF1DD_8,
                                                    mediumType,
                                                    blocks,
@@ -520,7 +520,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_35_SS_DD_8;
                     case 640:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MD2DD_8,
                                                    mediumType,
                                                    blocks,
@@ -528,7 +528,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_525_DS_DD_8;
                     case 720 when mediumType == 0x01:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MF1DD,
                                                    mediumType,
                                                    blocks,
@@ -536,7 +536,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_35_SS_DD_9;
                     case 720:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MD2DD,
                                                    mediumType,
                                                    blocks,
@@ -544,7 +544,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_525_DS_DD_9;
                     case 800:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Apple_MF1DD,
                                                    mediumType,
                                                    blocks,
@@ -552,7 +552,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.AppleSonySS;
                     case 1280:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MF2DD_8,
                                                    mediumType,
                                                    blocks,
@@ -560,7 +560,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_35_DS_DD_8;
                     case 1440:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MF2DD,
                                                    mediumType,
                                                    blocks,
@@ -568,7 +568,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_35_DS_DD_9;
                     case 1640:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_FDFORMAT_MF2DD,
                                                    mediumType,
                                                    blocks,
@@ -576,7 +576,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.FDFORMAT_35_DD;
                     case 1760:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Amiga_MF2DD,
                                                    mediumType,
                                                    blocks,
@@ -584,7 +584,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.CBM_AMIGA_35_DD;
                     case 2242:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_53FD,
                                                    mediumType,
                                                    blocks,
@@ -592,7 +592,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.IBM53FD_512;
                     case 2332:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA99,
                                                    mediumType,
                                                    blocks,
@@ -600,7 +600,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_99_15;
                     case 2400:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MD2HD,
                                                    mediumType,
                                                    blocks,
@@ -608,7 +608,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_525_HD;
                     case 2788:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_FDFORMAT_MD2HD,
                                                    mediumType,
                                                    blocks,
@@ -616,7 +616,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.FDFORMAT_525_HD;
                     case 2880:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MF2HD,
                                                    mediumType,
                                                    blocks,
@@ -624,7 +624,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_35_HD;
                     case 3360:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_DMF_MF2HD,
                                                    mediumType,
                                                    blocks,
@@ -632,7 +632,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DMF;
                     case 3444:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_FDFORMAT_MF2HD,
                                                    mediumType,
                                                    blocks,
@@ -640,7 +640,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.FDFORMAT_35_HD;
                     case 3520:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Amiga_MF2HD,
                                                    mediumType,
                                                    blocks,
@@ -648,7 +648,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.CBM_AMIGA_35_HD;
                     case 5760:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_MF2ED,
                                                    mediumType,
                                                    blocks,
@@ -656,7 +656,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.DOS_35_ED;
                     case 40662 when mediumType == 0x20:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Floptical,
                                                    mediumType,
                                                    blocks,
@@ -664,44 +664,44 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.Floptical;
                     case 65536 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_FD32MB);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_FD32MB);
 
                         return MediaType.FD32MB;
                     case 78882 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_PocketZIP);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_PocketZIP);
 
                         return MediaType.PocketZip;
                     case 86700 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ400);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ400);
 
                         return MediaType.SQ400;
                     case 87040 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli2_44);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli2_44);
 
                         return MediaType.Bernoulli44;
                     case 173456 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ800);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ800);
 
                         return MediaType.SQ800;
                     case 175856 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli2_90);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_Bernoulli2_90);
 
                         return MediaType.Bernoulli90;
                     case 196608 when model.ToLowerInvariant().StartsWith("zip", StringComparison.OrdinalIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ZIP100);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_ZIP100);
 
                         return MediaType.ZIP100;
 
                     case 215440 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ310);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ310);
 
                         return MediaType.SQ310;
                     case 246528 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LS120);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_LS120);
 
                         return MediaType.LS120;
                     case 248826 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA154,
                                                    mediumType,
                                                    blocks,
@@ -709,27 +709,27 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_154;
                     case 262144 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_EZ135);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_EZ135);
 
                         return MediaType.EZ135;
                     case 294918 when vendor.StartsWith("iomega", StringComparison.OrdinalIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Bernoulli2_150);
 
                         return MediaType.Bernoulli150;
                     case 390696 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ2000);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ2000);
 
                         return MediaType.SQ2000;
                     case 393380 when model.ToLowerInvariant().StartsWith("hifd", StringComparison.Ordinal):
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_HiFD,
                                                    blocks,
                                                    blockSize);
 
                         return MediaType.HiFD;
                     case 429975 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA201_embossed,
                                                    mediumType,
                                                    blocks,
@@ -737,7 +737,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_201_ROM;
                     case 446325 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA201,
                                                    mediumType,
                                                    blocks,
@@ -745,23 +745,23 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_201;
                     case 450560 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_EZ230);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_EZ230);
 
                         return MediaType.EZ230;
                     case 469504 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LS240);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_LS240);
 
                         return MediaType.LS240;
                     case 489532 when model.ToLowerInvariant().StartsWith("zip", StringComparison.OrdinalIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ZIP250);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_ZIP250);
 
                         return MediaType.ZIP250;
                     case 524288 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ327);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_SQ327);
 
                         return MediaType.SQ327;
                     case 694929 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA223,
                                                    mediumType,
                                                    blocks,
@@ -769,7 +769,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_223_512;
                     case 904995 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA183,
                                                    mediumType,
                                                    blocks,
@@ -777,7 +777,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_183_512;
                     case 1041500 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO15041,
                                                    mediumType,
                                                    blocks,
@@ -786,7 +786,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.ISO_15041_512;
                     case 1128772 when mediumType is 0x01 or 0x02:
                     case 1163337 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA184,
                                                    mediumType,
                                                    blocks,
@@ -794,7 +794,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_184_512;
                     case 1281856 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_WORM_PD_650,
                                                    mediumType,
@@ -803,7 +803,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.PD650_WORM;
                     case 1298496 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .SCSI_medium_type_is_0_media_has_1_blocks_of_2_bytes_setting_media_type_to_PD_650,
                                                    mediumType,
@@ -812,12 +812,12 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.PD650;
                     case 1470500 when model.ToLowerInvariant().StartsWith("zip", StringComparison.OrdinalIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_ZIP250);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_ZIP250);
 
                         return MediaType.ZIP750;
                     case 1644581 when mediumType is 0x01 or 0x02:
                     case 1647371 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA195,
                                                    mediumType,
                                                    blocks,
@@ -825,17 +825,17 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_195_512;
                     case 1961069 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Drive_manufacturer_is_SyQuest_media_has_1961069_blocks_of_512_bytes_setting_media_type_to_SparQ);
 
                         return MediaType.SparQ;
                     case 2091050 when model.ToLowerInvariant().StartsWith("jaz", StringComparison.Ordinal):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_JAZ);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_JAZ);
 
                         return MediaType.Jaz;
                     case 2244958 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO14517,
                                                    mediumType,
                                                    blocks,
@@ -843,19 +843,19 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ISO_14517_512;
                     case 2929800 when vendor.Equals("syquest", StringComparison.InvariantCultureIgnoreCase):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_SyJet);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_SyJet);
 
                         return MediaType.SyJet;
                     case 3915600 when model.ToLowerInvariant().StartsWith("jaz", StringComparison.Ordinal):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_JAZ2);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_JAZ2);
 
                         return MediaType.Jaz2;
                     case 4307184 when vendor.ToLowerInvariant().StartsWith("cws orb", StringComparison.Ordinal):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_Orb);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_Orb);
 
                         return MediaType.Orb;
                     case 625134256 when model.ToLowerInvariant().StartsWith("rdx", StringComparison.Ordinal):
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_RDX320,
                                                    blocks,
                                                    blockSize);
@@ -869,7 +869,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 800 when mediumType == 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Acorn_MF2DD,
                                                    mediumType,
                                                    blocks,
@@ -877,7 +877,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ACORN_35_DS_DD;
                     case 1220:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM_53FD,
                                                    mediumType,
                                                    blocks,
@@ -885,11 +885,11 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.IBM53FD_1024;
                     case 1232 when model.ToLowerInvariant().StartsWith("ls-", StringComparison.Ordinal):
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.SCSI_Media_Type_Description_LS_PC98_MF2HD);
+                        AaruConsole.Debug(MODULE_NAME, Localization.SCSI_Media_Type_Description_LS_PC98_MF2HD);
 
                         return MediaType.NEC_35_HD_8;
                     case 1232:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Sharp_MF2HD,
                                                    mediumType,
                                                    blocks,
@@ -897,7 +897,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.SHARP_35;
                     case 1268:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA69,
                                                    mediumType,
                                                    blocks,
@@ -905,7 +905,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_69_8;
                     case 1280:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_PC98_MD2HD,
                                                    mediumType,
                                                    blocks,
@@ -913,7 +913,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.NEC_525_HD;
                     case 1316:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA99,
                                                    mediumType,
                                                    blocks,
@@ -921,7 +921,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_99_8;
                     case 1600 when mediumType == 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Acorn_MF2HD,
                                                    mediumType,
                                                    blocks,
@@ -929,7 +929,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ACORN_35_DS_HD;
                     case 314569 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO10089,
                                                    mediumType,
                                                    blocks,
@@ -937,7 +937,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ISO_10089;
                     case 371371 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA223,
                                                    mediumType,
                                                    blocks,
@@ -945,7 +945,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_223;
                     case 498526 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA183,
                                                    mediumType,
                                                    blocks,
@@ -954,7 +954,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.ECMA_183;
                     case 603466 when mediumType is 0x01 or 0x02:
                     case 637041 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA184,
                                                    mediumType,
                                                    blocks,
@@ -963,7 +963,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.ECMA_184;
                     case 936921 when mediumType is 0x01 or 0x02:
                     case 948770 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA195,
                                                    mediumType,
                                                    blocks,
@@ -971,7 +971,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_195;
                     case 1244621 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA238,
                                                    mediumType,
                                                    blocks,
@@ -979,7 +979,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_238;
                     case 1273011 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO14517,
                                                    mediumType,
                                                    blocks,
@@ -987,7 +987,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ISO_14517;
                     case 2319786 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO15286,
                                                    mediumType,
                                                    blocks,
@@ -995,7 +995,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ISO_15286_1024;
                     case 4383356 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA322,
                                                    mediumType,
                                                    blocks,
@@ -1003,7 +1003,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_322_1k;
                     case 14476734 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA260,
                                                    mediumType,
                                                    blocks,
@@ -1011,7 +1011,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_260;
                     case 24445990 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA260,
                                                    mediumType,
                                                    blocks,
@@ -1027,7 +1027,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 112311:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_MD60,
                                                    mediumType,
                                                    blocks,
@@ -1035,7 +1035,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.MD60;
                     case 138363:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_MD74,
                                                    mediumType,
                                                    blocks,
@@ -1043,7 +1043,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.MD74;
                     case 149373:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_MD80,
                                                    mediumType,
                                                    blocks,
@@ -1054,7 +1054,7 @@ public static partial class MediaTypeFromDevice
                     case 318988 when mediumType is 0x01 or 0x02:
                     case 320332 when mediumType is 0x01 or 0x02:
                     case 321100 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA239,
                                                    mediumType,
                                                    blocks,
@@ -1062,7 +1062,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_239;
                     case 494023:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_HiMD,
                                                    mediumType,
                                                    blocks,
@@ -1070,7 +1070,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.HiMD;
                     case 605846 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_GigaMO,
                                                    mediumType,
                                                    blocks,
@@ -1078,7 +1078,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.GigaMo;
                     case 1063146 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_GigaMO2,
                                                    mediumType,
                                                    blocks,
@@ -1086,7 +1086,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.GigaMo2;
                     case 1128134 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA280,
                                                    mediumType,
                                                    blocks,
@@ -1094,7 +1094,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_280;
                     case 1263472 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ISO15286,
                                                    mediumType,
                                                    blocks,
@@ -1102,7 +1102,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ISO_15286;
                     case 2043664 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA322,
                                                    mediumType,
                                                    blocks,
@@ -1110,7 +1110,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.ECMA_322_2k;
                     case 7355716 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA317,
                                                    mediumType,
                                                    blocks,
@@ -1126,7 +1126,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 1095840 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_ECMA322,
                                                    mediumType,
                                                    blocks,
@@ -1142,7 +1142,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 1834348 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_UDO,
                                                    mediumType,
                                                    blocks,
@@ -1150,7 +1150,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.UDO;
                     case 3668759 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_WORM_UDO2,
                                                    mediumType,
                                                    blocks,
@@ -1158,7 +1158,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.UDO2_WORM;
                     case 3669724 when mediumType is 0x01 or 0x02:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_UDO2,
                                                    mediumType,
                                                    blocks,
diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs
index 10bd5e1f6..0a921bb5d 100644
--- a/Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs
+++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromScsi.cs
@@ -84,7 +84,7 @@ public static partial class MediaTypeFromDevice
                            model.StartsWith("MDH", StringComparison.Ordinal):
                 if(blockSize == 2048)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.SCSI_Media_Type_Description_MDDATA,
                                                scsiPeripheralType,
                                                blocks,
@@ -96,7 +96,7 @@ public static partial class MediaTypeFromDevice
                 switch(blocks)
                 {
                     case 57312:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_MD60_MDDATA,
                                                    scsiPeripheralType,
                                                    blocks,
@@ -104,7 +104,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.MD60;
                     case 70464:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_MD74_MDDATA,
                                                    scsiPeripheralType,
                                                    blocks,
@@ -112,7 +112,7 @@ public static partial class MediaTypeFromDevice
 
                         return MediaType.MD74;
                     case 76096:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_MD80_MDDATA,
                                                    scsiPeripheralType,
                                                    blocks,
@@ -121,7 +121,7 @@ public static partial class MediaTypeFromDevice
                         return MediaType.MD80;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_MD60_MDDATA,
                                            scsiPeripheralType,
                                            blocks,
@@ -131,7 +131,7 @@ public static partial class MediaTypeFromDevice
 
             // Host managed zoned block device
             case 0x14:
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.SCSI_Media_Type_Description_ZBC_Host_Managed,
                                            scsiPeripheralType,
                                            blocks,
diff --git a/Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs b/Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs
index cca29635d..e7c83b57c 100644
--- a/Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs
+++ b/Aaru.CommonTypes/MediaTypeFromDevice/FromSsc.cs
@@ -53,70 +53,70 @@ public static partial class MediaTypeFromDevice
                 switch(densityCode)
                 {
                     case 0x04:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_QIC11,
                                                    mediumType,
                                                    densityCode);
 
                         return MediaType.QIC11;
                     case 0x05:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_QIC24,
                                                    mediumType,
                                                    densityCode);
 
                         return MediaType.QIC24;
                     case 0x09:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM3490,
                                                    mediumType,
                                                    densityCode);
 
                         return MediaType.IBM3490;
                     case 0x0F:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_QIC120,
                                                    mediumType,
                                                    densityCode);
 
                         return MediaType.QIC120;
                     case 0x10:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_QIC150,
                                                    mediumType,
                                                    densityCode);
 
                         return MediaType.QIC150;
                     case 0x13:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_DDS,
                                                    mediumType,
                                                    densityCode);
 
                         return MediaType.DDS1;
                     case 0x24:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_DDS2,
                                                    mediumType,
                                                    densityCode);
 
                         return MediaType.DDS2;
                     case 0x25:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_DDS3,
                                                    mediumType,
                                                    densityCode);
 
                         return MediaType.DDS3;
                     case 0x26:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_DDS4,
                                                    mediumType,
                                                    densityCode);
 
                         return MediaType.DDS4;
                     case 0x28:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_IBM3490E,
                                                    mediumType,
                                                    densityCode);
@@ -125,7 +125,7 @@ public static partial class MediaTypeFromDevice
                     case 0x40:
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO_ult,
                                                        mediumType,
                                                        densityCode);
@@ -135,7 +135,7 @@ public static partial class MediaTypeFromDevice
 
                         if(model.StartsWith("sdz", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_SAIT,
                                                        mediumType,
                                                        densityCode);
@@ -149,7 +149,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO2_ult,
                                                        mediumType,
                                                        densityCode);
@@ -164,7 +164,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO2_ult,
                                                        mediumType,
                                                        densityCode);
@@ -174,7 +174,7 @@ public static partial class MediaTypeFromDevice
 
                         if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_T9840A,
                                                        mediumType,
                                                        densityCode);
@@ -189,7 +189,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_T9940A,
                                                        mediumType,
                                                        densityCode);
@@ -204,7 +204,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO3,
                                                        mediumType,
                                                        densityCode);
@@ -214,7 +214,7 @@ public static partial class MediaTypeFromDevice
 
                         if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_T9940B,
                                                        mediumType,
                                                        densityCode);
@@ -229,7 +229,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_T9940C,
                                                        mediumType,
                                                        densityCode);
@@ -244,7 +244,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO4,
                                                        mediumType,
                                                        densityCode);
@@ -254,7 +254,7 @@ public static partial class MediaTypeFromDevice
 
                         if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_T9840D,
                                                        mediumType,
                                                        densityCode);
@@ -269,7 +269,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_T10000A,
                                                        mediumType,
                                                        densityCode);
@@ -284,7 +284,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_T10000B,
                                                        mediumType,
                                                        densityCode);
@@ -299,7 +299,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_T10000C,
                                                        mediumType,
                                                        densityCode);
@@ -314,7 +314,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(vendor.Equals("stk", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_T10000D,
                                                        mediumType,
                                                        densityCode);
@@ -329,7 +329,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO5,
                                                        mediumType,
                                                        densityCode);
@@ -343,7 +343,7 @@ public static partial class MediaTypeFromDevice
                     // Used by some HP drives for all generations
                     case 0x8C:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_DDS,
                                                    mediumType,
                                                    densityCode);
@@ -361,7 +361,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_WORM_LTO3,
                                                        mediumType,
                                                        densityCode);
@@ -376,7 +376,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_WORM_LTO4,
                                                        mediumType,
                                                        densityCode);
@@ -391,7 +391,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_WORM_LTO5,
                                                        mediumType,
                                                        densityCode);
@@ -413,7 +413,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO_ult,
                                                        mediumType,
                                                        densityCode);
@@ -426,7 +426,7 @@ public static partial class MediaTypeFromDevice
 
                     case 0x40:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_LTO,
                                                    mediumType,
                                                    densityCode);
@@ -445,7 +445,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO2_ult,
                                                        mediumType,
                                                        densityCode);
@@ -458,7 +458,7 @@ public static partial class MediaTypeFromDevice
 
                     case 0x42:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_LTO2,
                                                    mediumType,
                                                    densityCode);
@@ -478,7 +478,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_DDS3_dat,
                                                        mediumType,
                                                        densityCode);
@@ -501,7 +501,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_DDS4_alt,
                                                        mediumType,
                                                        densityCode);
@@ -524,7 +524,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_DAT72_dat,
                                                        mediumType,
                                                        densityCode);
@@ -547,7 +547,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO3,
                                                        mediumType,
                                                        densityCode);
@@ -570,7 +570,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_WORM_LTO3,
                                                        mediumType,
                                                        densityCode);
@@ -593,7 +593,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO4,
                                                        mediumType,
                                                        densityCode);
@@ -616,7 +616,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_WORM_LTO4,
                                                        mediumType,
                                                        densityCode);
@@ -639,7 +639,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("dat", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_DDS2_dat,
                                                        mediumType,
                                                        densityCode);
@@ -662,7 +662,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO5,
                                                        mediumType,
                                                        densityCode);
@@ -685,7 +685,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_WORM_LTO5,
                                                        mediumType,
                                                        densityCode);
@@ -708,7 +708,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO6_ult,
                                                        mediumType,
                                                        densityCode);
@@ -731,7 +731,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_WORM_LTO6_ult,
                                                        mediumType,
                                                        densityCode);
@@ -754,7 +754,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_LTO7_ult,
                                                        mediumType,
                                                        densityCode);
@@ -777,7 +777,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("ult", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_WORM_LTO7_ult,
                                                        mediumType,
                                                        densityCode);
@@ -799,7 +799,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_15m,
                                                        mediumType,
                                                        densityCode);
@@ -809,7 +809,7 @@ public static partial class MediaTypeFromDevice
 
                         if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_IBM3592,
                                                        mediumType,
                                                        densityCode);
@@ -819,7 +819,7 @@ public static partial class MediaTypeFromDevice
 
                         if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_VXA,
                                                        mediumType,
                                                        densityCode);
@@ -838,7 +838,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_15m,
                                                        mediumType,
                                                        densityCode);
@@ -854,7 +854,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_IBM3592,
                                                        mediumType,
                                                        densityCode);
@@ -869,7 +869,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_VXA,
                                                        mediumType,
                                                        densityCode);
@@ -891,7 +891,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_28m,
                                                        mediumType,
                                                        densityCode);
@@ -901,7 +901,7 @@ public static partial class MediaTypeFromDevice
 
                         if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_IBM3592,
                                                        mediumType,
                                                        densityCode);
@@ -916,7 +916,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_CompactTape,
                                                        mediumType,
                                                        densityCode);
@@ -935,7 +935,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_28m,
                                                        mediumType,
                                                        densityCode);
@@ -950,7 +950,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_CompactTapeII,
                                                        mediumType,
                                                        densityCode);
@@ -966,7 +966,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(vendor.Equals("ibm", StringComparison.InvariantCultureIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_IBM3592,
                                                        mediumType,
                                                        densityCode);
@@ -981,7 +981,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_VXA2,
                                                        mediumType,
                                                        densityCode);
@@ -996,7 +996,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("vxa", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_VXA3,
                                                        mediumType,
                                                        densityCode);
@@ -1018,7 +1018,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_54m,
                                                        mediumType,
                                                        densityCode);
@@ -1028,7 +1028,7 @@ public static partial class MediaTypeFromDevice
 
                         if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_DLTtapeIII,
                                                        mediumType,
                                                        densityCode);
@@ -1047,7 +1047,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_54m,
                                                        mediumType,
                                                        densityCode);
@@ -1066,7 +1066,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_DLTtapeIII,
                                                        mediumType,
                                                        densityCode);
@@ -1088,7 +1088,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_80m,
                                                        mediumType,
                                                        densityCode);
@@ -1098,7 +1098,7 @@ public static partial class MediaTypeFromDevice
 
                         if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_DLTtapeIIIxt,
                                                        mediumType,
                                                        densityCode);
@@ -1117,7 +1117,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_80m,
                                                        mediumType,
                                                        densityCode);
@@ -1134,7 +1134,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("dlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_DLTtapeIIIxt,
                                                        mediumType,
                                                        densityCode);
@@ -1156,7 +1156,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_106m,
                                                        mediumType,
                                                        densityCode);
@@ -1168,7 +1168,7 @@ public static partial class MediaTypeFromDevice
                            model.StartsWith("sdlt",     StringComparison.OrdinalIgnoreCase) ||
                            model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_DLTtapeIV,
                                                        mediumType,
                                                        densityCode);
@@ -1178,7 +1178,7 @@ public static partial class MediaTypeFromDevice
 
                         if(model.StartsWith("stt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Travan5_stt,
                                                        mediumType,
                                                        densityCode);
@@ -1197,7 +1197,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_106m,
                                                        mediumType,
                                                        densityCode);
@@ -1225,7 +1225,7 @@ public static partial class MediaTypeFromDevice
                            model.StartsWith("sdlt",     StringComparison.OrdinalIgnoreCase) ||
                            model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_DLTtapeIV,
                                                        mediumType,
                                                        densityCode);
@@ -1240,7 +1240,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("stt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Travan5_stt,
                                                        mediumType,
                                                        densityCode);
@@ -1263,7 +1263,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_160m,
                                                        mediumType,
                                                        densityCode);
@@ -1275,7 +1275,7 @@ public static partial class MediaTypeFromDevice
                            model.StartsWith("sdlt",     StringComparison.OrdinalIgnoreCase) ||
                            model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_SDLT,
                                                        mediumType,
                                                        densityCode);
@@ -1290,7 +1290,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_160m,
                                                        mediumType,
                                                        densityCode);
@@ -1309,7 +1309,7 @@ public static partial class MediaTypeFromDevice
                            model.StartsWith("sdlt",     StringComparison.OrdinalIgnoreCase) ||
                            model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_SDLT,
                                                        mediumType,
                                                        densityCode);
@@ -1334,7 +1334,7 @@ public static partial class MediaTypeFromDevice
                            model.StartsWith("sdlt",     StringComparison.OrdinalIgnoreCase) ||
                            model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_SDLT2,
                                                        mediumType,
                                                        densityCode);
@@ -1361,7 +1361,7 @@ public static partial class MediaTypeFromDevice
                            model.StartsWith("sdlt",     StringComparison.OrdinalIgnoreCase) ||
                            model.StartsWith("superdlt", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_VStape,
                                                        mediumType,
                                                        densityCode);
@@ -1379,7 +1379,7 @@ public static partial class MediaTypeFromDevice
             {
                 if(model.StartsWith("stt", StringComparison.OrdinalIgnoreCase))
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.SCSI_Media_Type_Description_Travan7,
                                                mediumType,
                                                densityCode);
@@ -1395,7 +1395,7 @@ public static partial class MediaTypeFromDevice
                 {
                     case 0x45:
                         // HP Colorado tapes have a different capacity but return same density code at least in Seagate drives
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Travan4,
                                                    mediumType,
                                                    densityCode);
@@ -1410,7 +1410,7 @@ public static partial class MediaTypeFromDevice
                 switch(densityCode)
                 {
                     case 0x47:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.SCSI_Media_Type_Description_Travan5,
                                                    mediumType,
                                                    densityCode);
@@ -1432,7 +1432,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_22m,
                                                        mediumType,
                                                        densityCode);
@@ -1459,7 +1459,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_40m,
                                                        mediumType,
                                                        densityCode);
@@ -1486,7 +1486,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_76m,
                                                        mediumType,
                                                        densityCode);
@@ -1513,7 +1513,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_112m,
                                                        mediumType,
                                                        densityCode);
@@ -1537,7 +1537,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_22m_AME,
                                                        mediumType,
                                                        densityCode);
@@ -1561,7 +1561,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_170m,
                                                        mediumType,
                                                        densityCode);
@@ -1585,7 +1585,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_125m,
                                                        mediumType,
                                                        densityCode);
@@ -1609,7 +1609,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_45m,
                                                        mediumType,
                                                        densityCode);
@@ -1633,7 +1633,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_225m,
                                                        mediumType,
                                                        densityCode);
@@ -1657,7 +1657,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_150m,
                                                        mediumType,
                                                        densityCode);
@@ -1681,7 +1681,7 @@ public static partial class MediaTypeFromDevice
                     {
                         if(model.StartsWith("exb", StringComparison.OrdinalIgnoreCase))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.SCSI_Media_Type_Description_Exatape_75m,
                                                        mediumType,
                                                        densityCode);
diff --git a/Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs b/Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs
index 4f1692393..9df2226c3 100644
--- a/Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs
+++ b/Aaru.CommonTypes/Structs/Devices/ATA/Identify.cs
@@ -800,7 +800,7 @@ public static class Identify
 
         if(IdentifyDeviceResponse.Length != 512)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.IDENTIFY_response_is_different_than_512_bytes_not_decoding);
 
             return null;
diff --git a/Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs b/Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs
index ccced5b11..92d49bda7 100644
--- a/Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs
+++ b/Aaru.CommonTypes/Structs/Devices/SCSI/Inquiry.cs
@@ -275,7 +275,7 @@ public struct Inquiry
 
         if(SCSIInquiryResponse.Length < 36 && SCSIInquiryResponse.Length != 5)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.INQUIRY_response_is_0_bytes_less_than_minimum_of_36_bytes,
                                        SCSIInquiryResponse.Length);
 
@@ -285,7 +285,7 @@ public struct Inquiry
         if(SCSIInquiryResponse.Length < SCSIInquiryResponse[4] + 4 &&
            SCSIInquiryResponse.Length != SCSIInquiryResponse[4])
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization
                                           .INQUIRY_response_length_0_bytes_is_different_than_specified_in_length_field,
                                        SCSIInquiryResponse.Length,
diff --git a/Aaru.Core/ArchiveFormat.cs b/Aaru.Core/ArchiveFormat.cs
index f6d1f5836..724899bfd 100644
--- a/Aaru.Core/ArchiveFormat.cs
+++ b/Aaru.Core/ArchiveFormat.cs
@@ -59,7 +59,7 @@ public static class ArchiveFormat
 
                 try
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Trying_plugin_0, plugin.Name);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, plugin.Name);
 
                     if(!plugin.Identify(archiveFilter)) continue;
 
diff --git a/Aaru.Core/DataFile.cs b/Aaru.Core/DataFile.cs
index bccbd087d..bf3555430 100644
--- a/Aaru.Core/DataFile.cs
+++ b/Aaru.Core/DataFile.cs
@@ -137,7 +137,7 @@ public sealed class DataFile
                 File.Delete(filename);
             else
             {
-                AaruConsole.ErrorWriteLine(Localization.Core.Not_overwriting_file_0, filename);
+                AaruConsole.Error(Localization.Core.Not_overwriting_file_0, filename);
 
                 return;
             }
@@ -145,14 +145,14 @@ public sealed class DataFile
 
         try
         {
-            AaruConsole.DebugWriteLine(who, string.Format(Localization.Core.Writing_0_to_1, whatWriting, filename));
+            AaruConsole.Debug(who, string.Format(Localization.Core.Writing_0_to_1, whatWriting, filename));
             var outputFs = new FileStream(filename, FileMode.CreateNew);
             outputFs.Write(data, 0, data.Length);
             outputFs.Close();
         }
         catch
         {
-            AaruConsole.ErrorWriteLine(Localization.Core.Unable_to_write_file_0, filename);
+            AaruConsole.Error(Localization.Core.Unable_to_write_file_0, filename);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
index 7878a24de..04c02bf88 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
@@ -903,7 +903,7 @@ partial class Dump
 
                         _resume.BadBlocks.Add(i + r);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_error_0,
                                                    Sense.PrettifySense(senseBuf));
 
@@ -1104,7 +1104,7 @@ partial class Dump
 
                 for(ulong b = i; b < i + _skip; b++) _resume.BadBlocks.Add(b);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
+                AaruConsole.Debug(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
                 mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration, _skip);
 
                 ibgLog.Write(i, 0);
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
index 5f6a815e8..598edf783 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
@@ -1687,7 +1687,7 @@ sealed partial class Dump
             {
                 if(tag.Value is null)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
+                    AaruConsole.Error(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
 
                     continue;
                 }
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
index 90632a2e5..b2bfc6680 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
@@ -207,7 +207,7 @@ partial class Dump
                 UpdateStatus?.Invoke(Localization.Core
                                                  .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
 
-                AaruConsole.DebugWriteLine(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
+                AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
 
                 _dumpLog.WriteLine(Localization.Core
                                                .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
index ebb404fbd..aec86b038 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
@@ -189,7 +189,7 @@ partial class Dump
             break;
         }
 
-        AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
+        AaruConsole.Debug(PREGAP_MODULE_NAME,
                                    bcd switch
                                    {
                                        true  => Localization.Core.Subchannel_is_BCD,
@@ -219,7 +219,7 @@ partial class Dump
             // First track of each session has at least 150 sectors of pregap and is not always readable
             if(tracks.Where(trk => trk.Session == track.Session).MinBy(trk => trk.Sequence).Sequence == track.Sequence)
             {
-                AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0, track.Sequence);
+                AaruConsole.Debug(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0, track.Sequence);
 
                 if(track.Sequence > 1) pregaps[track.Sequence] = 150;
 
@@ -228,21 +228,21 @@ partial class Dump
 
             if(t > 0 && tracks[t - 1].Type == tracks[t].Type && dumping)
             {
-                AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0, track.Sequence);
+                AaruConsole.Debug(PREGAP_MODULE_NAME, Localization.Core.Skipping_track_0, track.Sequence);
 
                 continue;
             }
 
             if(dumping && dev.Manufacturer.ToLowerInvariant().StartsWith("plextor", StringComparison.Ordinal))
             {
-                AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
+                AaruConsole.Debug(PREGAP_MODULE_NAME,
                                            Localization.Core.Skipping_track_0_due_to_Plextor_firmware_bug,
                                            track.Sequence);
 
                 continue;
             }
 
-            AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.Track_0, track.Sequence);
+            AaruConsole.Debug(PREGAP_MODULE_NAME, Localization.Core.Track_0, track.Sequence);
 
             int   lba           = (int)track.StartSector - 1;
             bool  pregapFound   = false;
@@ -263,7 +263,7 @@ partial class Dump
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
+                    AaruConsole.Debug(PREGAP_MODULE_NAME,
                                                Localization.Core.LBA_0_Try_1_Sense_2,
                                                lba,
                                                retries + 1,
@@ -276,7 +276,7 @@ partial class Dump
 
                 CRC16CcittContext.Data(subBuf, 10, out crc);
 
-                AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
+                AaruConsole.Debug(PREGAP_MODULE_NAME,
                                            Localization.Core
                                                        .LBA_0_Try_1_Sense_2_Q_3_4_5_6_7_8_9_10_11_12_CRC_13_14_Calculated_CRC_15_16,
                                            lba,
@@ -329,7 +329,7 @@ partial class Dump
 
                     if(crcOk)
                     {
-                        AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
+                        AaruConsole.Debug(PREGAP_MODULE_NAME,
                                                    Localization.Core
                                                                .LBA_0_Try_1_Sense_2_Q_FIXED_3_4_5_6_7_8_9_10_11_12_CRC_13_14_Calculated_CRC_15_16,
                                                    lba,
@@ -403,7 +403,7 @@ partial class Dump
 
                     CRC16CcittContext.Data(subBuf, 10, out crc);
 
-                    AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
+                    AaruConsole.Debug(PREGAP_MODULE_NAME,
                                                Localization.Core
                                                            .LBA_0_Try_1_Sense_2_Q_3_4_5_6_7_8_9_10_11_12_CRC_13_14_Calculated_CRC_15_16,
                                                lba,
@@ -456,7 +456,7 @@ partial class Dump
 
                         if(crcOk)
                         {
-                            AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
+                            AaruConsole.Debug(PREGAP_MODULE_NAME,
                                                        Localization.Core
                                                                    .LBA_0_Try_1_Sense_2_Q_FIXED_3_4_5_6_7_8_9_10_11_12_CRC_13_14_Calculated_CRC_15_16,
                                                        lba,
@@ -549,7 +549,7 @@ partial class Dump
                 {
                     inexactPositioning = true;
 
-                    AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME, Localization.Core.All_Q_empty_for_LBA_0, lba);
+                    AaruConsole.Debug(PREGAP_MODULE_NAME, Localization.Core.All_Q_empty_for_LBA_0, lba);
 
                     break;
                 }
@@ -611,7 +611,7 @@ partial class Dump
 
                 if(diff != 0)
                 {
-                    AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
+                    AaruConsole.Debug(PREGAP_MODULE_NAME,
                                                Localization.Core.Invalid_Q_position_for_LBA_0_got_1,
                                                lba,
                                                posQ);
@@ -635,7 +635,7 @@ partial class Dump
                     // If CRC is not OK, only accept pregaps less than 10 sectors longer than previously now
                     if(crcOk || pregapQ - pregaps[track.Sequence] < 10)
                     {
-                        AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
+                        AaruConsole.Debug(PREGAP_MODULE_NAME,
                                                    Localization.Core.Pregap_for_track_0_1,
                                                    track.Sequence,
                                                    pregapQ);
diff --git a/Aaru.Core/Devices/Dumping/MiniDisc.cs b/Aaru.Core/Devices/Dumping/MiniDisc.cs
index da4622b4f..54a3c9853 100644
--- a/Aaru.Core/Devices/Dumping/MiniDisc.cs
+++ b/Aaru.Core/Devices/Dumping/MiniDisc.cs
@@ -635,7 +635,7 @@ partial class Dump
                     UpdateStatus?.Invoke(Localization.Core
                                                      .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
 
-                    AaruConsole.DebugWriteLine(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
+                    AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
 
                     _dumpLog.WriteLine(Localization.Core
                                                    .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
index c29aeb540..5efc1724f 100644
--- a/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
+++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
@@ -519,7 +519,7 @@ public partial class Dump
                     UpdateStatus?.Invoke(Localization.Core
                                                      .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
 
-                    AaruConsole.DebugWriteLine(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
+                    AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
 
                     _dumpLog.WriteLine(Localization.Core
                                                    .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs
index ae59a5510..e2d92bc66 100644
--- a/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs
+++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs
@@ -536,7 +536,7 @@ public partial class Dump
                     UpdateStatus?.Invoke(Localization.Core
                                                      .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
 
-                    AaruConsole.DebugWriteLine(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
+                    AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
 
                     _dumpLog.WriteLine(Localization.Core
                                                    .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
diff --git a/Aaru.Core/Devices/Dumping/Sbc/Dump.cs b/Aaru.Core/Devices/Dumping/Sbc/Dump.cs
index 153c777fa..649d85519 100644
--- a/Aaru.Core/Devices/Dumping/Sbc/Dump.cs
+++ b/Aaru.Core/Devices/Dumping/Sbc/Dump.cs
@@ -972,7 +972,7 @@ partial class Dump
             {
                 if(tag.Value is null)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
+                    AaruConsole.Error(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
 
                     continue;
                 }
diff --git a/Aaru.Core/Devices/Dumping/Sbc/Error.cs b/Aaru.Core/Devices/Dumping/Sbc/Error.cs
index ae42e49e5..95cc756d1 100644
--- a/Aaru.Core/Devices/Dumping/Sbc/Error.cs
+++ b/Aaru.Core/Devices/Dumping/Sbc/Error.cs
@@ -233,7 +233,7 @@ partial class Dump
                 UpdateStatus?.Invoke(Localization.Core
                                                  .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
 
-                AaruConsole.DebugWriteLine(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
+                AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
 
                 _dumpLog.WriteLine(Localization.Core
                                                .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
diff --git a/Aaru.Core/Devices/Dumping/XGD.cs b/Aaru.Core/Devices/Dumping/XGD.cs
index bb72b728b..cd92c7406 100644
--- a/Aaru.Core/Devices/Dumping/XGD.cs
+++ b/Aaru.Core/Devices/Dumping/XGD.cs
@@ -90,7 +90,7 @@ partial class Dump
 
             if(!isAdmin)
             {
-                AaruConsole.ErrorWriteLine(Localization.Core
+                AaruConsole.Error(Localization.Core
                                                        .Because_of_commands_sent_dumping_XGD_must_be_administrative_Cannot_continue);
 
                 _dumpLog.WriteLine(Localization.Core.Cannot_dump_XGD_without_administrative_privileges);
@@ -162,7 +162,7 @@ partial class Dump
         mediaTags.Add(MediaTagType.Xbox_SecuritySector, tmpBuf);
 
         // Get video partition size
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_video_partition_size);
+        AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_video_partition_size);
         UpdateStatus?.Invoke(Localization.Core.Locking_drive);
         _dumpLog.WriteLine(Localization.Core.Locking_drive);
         sense = _dev.KreonLock(out senseBuf, _dev.Timeout, out _);
@@ -217,7 +217,7 @@ partial class Dump
         Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
         mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize);
+        AaruConsole.Debug(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize);
 
         ulong l0Video = (PFI.Decode(readBuffer, MediaType.DVDROM)?.Layer0EndPSN     ?? 0) -
                         (PFI.Decode(readBuffer, MediaType.DVDROM)?.DataAreaStartPSN ?? 0) +
@@ -266,7 +266,7 @@ partial class Dump
             mediaTags.Remove(MediaTagType.DVD_PFI);
             mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Video_partition_total_size_0_sectors, totalSize);
 
             l0Video = (PFI.Decode(coldPfi, MediaType.DVDROM)?.Layer0EndPSN     ?? 0) -
                       (PFI.Decode(coldPfi, MediaType.DVDROM)?.DataAreaStartPSN ?? 0) +
@@ -285,7 +285,7 @@ partial class Dump
         }
 
         // Get game partition size
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_game_partition_size);
+        AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_game_partition_size);
         UpdateStatus?.Invoke(Localization.Core.Unlocking_drive_Xtreme_);
         _dumpLog.WriteLine(Localization.Core.Unlocking_drive_Xtreme_);
         sense = _dev.KreonUnlockXtreme(out senseBuf, _dev.Timeout, out _);
@@ -316,10 +316,10 @@ partial class Dump
              0xFFFFFFFF) +
             1;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Game_partition_total_size_0_sectors, gameSize);
+        AaruConsole.Debug(MODULE_NAME, Localization.Core.Game_partition_total_size_0_sectors, gameSize);
 
         // Get middle zone size
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_middle_zone_size);
+        AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_middle_zone_size);
         UpdateStatus?.Invoke(Localization.Core.Unlocking_drive_Wxripper);
         _dumpLog.WriteLine(Localization.Core.Unlocking_drive_Wxripper);
         sense = _dev.KreonUnlockWxripper(out senseBuf, _dev.Timeout, out _);
@@ -369,7 +369,7 @@ partial class Dump
             return;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Unlocked_total_size_0_sectors, totalSize);
+        AaruConsole.Debug(MODULE_NAME, Localization.Core.Unlocked_total_size_0_sectors, totalSize);
         ulong blocks = totalSize + 1;
 
         PFI.PhysicalFormatInformation? wxRipperPfiNullable = PFI.Decode(readBuffer, MediaType.DVDROM);
@@ -772,7 +772,7 @@ partial class Dump
 
                     for(ulong b = i; b < i + _skip; b++) _resume.BadBlocks.Add(b);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.READ_error_0,
                                                Sense.PrettifySense(senseBuf));
 
@@ -984,7 +984,7 @@ partial class Dump
                 // TODO: Handle errors in video partition
                 //errored += blocksToRead;
                 //resume.BadBlocks.Add(l1);
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
+                AaruConsole.Debug(MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
                 mhddLog.Write(l1, cmdDuration < 500 ? 65535 : cmdDuration, _skip);
 
                 ibgLog.Write(l1, 0);
@@ -1261,7 +1261,7 @@ partial class Dump
                     UpdateStatus?.Invoke(Localization.Core
                                                      .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
 
-                    AaruConsole.DebugWriteLine(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
+                    AaruConsole.Debug(Localization.Core.Error_0, Sense.PrettifySense(senseBuf));
 
                     _dumpLog.WriteLine(Localization.Core
                                                    .Drive_did_not_accept_MODE_SELECT_command_for_persistent_error_reading);
@@ -1384,7 +1384,7 @@ partial class Dump
         {
             if(tag.Value is null)
             {
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
+                AaruConsole.Error(Localization.Core.Error_Tag_type_0_is_null_skipping, tag.Key);
 
                 continue;
             }
diff --git a/Aaru.Core/Devices/Info/DeviceInfo.cs b/Aaru.Core/Devices/Info/DeviceInfo.cs
index a81180ddf..af5546a50 100644
--- a/Aaru.Core/Devices/Info/DeviceInfo.cs
+++ b/Aaru.Core/Devices/Info/DeviceInfo.cs
@@ -88,27 +88,27 @@ public partial class DeviceInfo
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "STATUS = 0x{0:X2}", errorRegisters.Status);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ERROR = 0x{0:X2}",  errorRegisters.Error);
+                    AaruConsole.Debug(MODULE_NAME, "STATUS = 0x{0:X2}", errorRegisters.Status);
+                    AaruConsole.Debug(MODULE_NAME, "ERROR = 0x{0:X2}",  errorRegisters.Error);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount);
+                    AaruConsole.Debug(MODULE_NAME, "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "SECTOR = 0x{0:X2}", errorRegisters.Sector);
+                    AaruConsole.Debug(MODULE_NAME, "SECTOR = 0x{0:X2}", errorRegisters.Sector);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "CYLHIGH = 0x{0:X2}", errorRegisters.CylinderHigh);
+                    AaruConsole.Debug(MODULE_NAME, "CYLHIGH = 0x{0:X2}", errorRegisters.CylinderHigh);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow);
+                    AaruConsole.Debug(MODULE_NAME, "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead);
+                    AaruConsole.Debug(MODULE_NAME, "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Error_code_equals_0, dev.LastError);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Error_code_equals_0, dev.LastError);
 
                     break;
                 }
 
                 if(dev.Error)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Core.Error_0_querying_ATA_IDENTIFY, dev.LastError);
+                    AaruConsole.Error(Localization.Core.Error_0_querying_ATA_IDENTIFY, dev.LastError);
 
                     break;
                 }
@@ -128,20 +128,20 @@ public partial class DeviceInfo
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "STATUS = 0x{0:X2}", errorRegisters.Status);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ERROR = 0x{0:X2}",  errorRegisters.Error);
+                    AaruConsole.Debug(MODULE_NAME, "STATUS = 0x{0:X2}", errorRegisters.Status);
+                    AaruConsole.Debug(MODULE_NAME, "ERROR = 0x{0:X2}",  errorRegisters.Error);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount);
+                    AaruConsole.Debug(MODULE_NAME, "NSECTOR = 0x{0:X2}", errorRegisters.SectorCount);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "SECTOR = 0x{0:X2}", errorRegisters.Sector);
+                    AaruConsole.Debug(MODULE_NAME, "SECTOR = 0x{0:X2}", errorRegisters.Sector);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "CYLHIGH = 0x{0:X2}", errorRegisters.CylinderHigh);
+                    AaruConsole.Debug(MODULE_NAME, "CYLHIGH = 0x{0:X2}", errorRegisters.CylinderHigh);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow);
+                    AaruConsole.Debug(MODULE_NAME, "CYLLOW = 0x{0:X2}", errorRegisters.CylinderLow);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead);
+                    AaruConsole.Debug(MODULE_NAME, "DEVICE = 0x{0:X2}", errorRegisters.DeviceHead);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Error_code_equals_0, dev.LastError);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Error_code_equals_0, dev.LastError);
 
                     break;
                 }
@@ -149,7 +149,7 @@ public partial class DeviceInfo
                 if(!dev.Error)
                     AtapiIdentify = ataBuf;
                 else
-                    AaruConsole.ErrorWriteLine(Localization.Core.Error_0_querying_ATA_PACKET_IDENTIFY, dev.LastError);
+                    AaruConsole.Error(Localization.Core.Error_0_querying_ATA_PACKET_IDENTIFY, dev.LastError);
 
                 // ATAPI devices are also SCSI devices
                 goto case DeviceType.SCSI;
@@ -161,7 +161,7 @@ public partial class DeviceInfo
 
                 if(sense)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Core.SCSI_error_0, Sense.PrettifySense(senseBuf));
+                    AaruConsole.Error(Localization.Core.SCSI_error_0, Sense.PrettifySense(senseBuf));
 
                     break;
                 }
@@ -546,14 +546,14 @@ public partial class DeviceInfo
                         sense = dev.ReadBlockLimits(out byte[] seqBuf, out senseBuf, dev.Timeout, out _);
 
                         if(sense)
-                            AaruConsole.ErrorWriteLine("READ BLOCK LIMITS:\n{0}", Sense.PrettifySense(senseBuf));
+                            AaruConsole.Error("READ BLOCK LIMITS:\n{0}", Sense.PrettifySense(senseBuf));
                         else
                             BlockLimits = seqBuf;
 
                         sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, dev.Timeout, out _);
 
                         if(sense)
-                            AaruConsole.ErrorWriteLine("REPORT DENSITY SUPPORT:\n{0}", Sense.PrettifySense(senseBuf));
+                            AaruConsole.Error("REPORT DENSITY SUPPORT:\n{0}", Sense.PrettifySense(senseBuf));
                         else
                         {
                             DensitySupport       = seqBuf;
@@ -564,7 +564,7 @@ public partial class DeviceInfo
 
                         if(sense)
                         {
-                            AaruConsole.ErrorWriteLine("REPORT DENSITY SUPPORT (MEDIUM):\n{0}",
+                            AaruConsole.Error("REPORT DENSITY SUPPORT (MEDIUM):\n{0}",
                                                        Sense.PrettifySense(senseBuf));
                         }
                         else
@@ -621,7 +621,7 @@ public partial class DeviceInfo
 
                 break;
             default:
-                AaruConsole.ErrorWriteLine(Localization.Core.Unknown_device_type_0_cannot_get_information, dev.Type);
+                AaruConsole.Error(Localization.Core.Unknown_device_type_0_cannot_get_information, dev.Type);
 
                 break;
         }
diff --git a/Aaru.Core/Devices/ReaderATA.cs b/Aaru.Core/Devices/ReaderATA.cs
index 33a3dd78b..83eddd8f1 100644
--- a/Aaru.Core/Devices/ReaderATA.cs
+++ b/Aaru.Core/Devices/ReaderATA.cs
@@ -395,7 +395,7 @@ sealed partial class Reader
 
         if((status & 0x04) == 0x04) recoveredError = true;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status);
 
         return true;
     }
@@ -454,7 +454,7 @@ sealed partial class Reader
 
         if((status & 0x04) == 0x04) recoveredError = true;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.Core.ATA_ERROR_0_STATUS_1, errorByte, status);
 
         return true;
     }
diff --git a/Aaru.Core/Devices/ReaderSCSI.cs b/Aaru.Core/Devices/ReaderSCSI.cs
index ee4679a7c..752a51d10 100644
--- a/Aaru.Core/Devices/ReaderSCSI.cs
+++ b/Aaru.Core/Devices/ReaderSCSI.cs
@@ -920,7 +920,7 @@ sealed partial class Reader
 
         blankCheck = Sense.Decode(senseBuf)?.SenseKey == SenseKeys.BlankCheck;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.READ_error_0, Sense.PrettifySense(senseBuf));
 
         return sense;
     }
diff --git a/Aaru.Core/Devices/Report/ATA.cs b/Aaru.Core/Devices/Report/ATA.cs
index dbd91f20a..c9462b10f 100644
--- a/Aaru.Core/Devices/Report/ATA.cs
+++ b/Aaru.Core/Devices/Report/ATA.cs
@@ -192,7 +192,7 @@ public sealed partial class DeviceReport
             mediaTest.SupportsReadSectors =
                 !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -210,7 +210,7 @@ public sealed partial class DeviceReport
             mediaTest.SupportsReadRetry =
                 !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -228,7 +228,7 @@ public sealed partial class DeviceReport
             mediaTest.SupportsReadDma =
                 !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -246,7 +246,7 @@ public sealed partial class DeviceReport
             mediaTest.SupportsReadDmaRetry =
                 !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -263,7 +263,7 @@ public sealed partial class DeviceReport
 
             mediaTest.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2,
                                        sense,
                                        errorChs.Status,
@@ -278,7 +278,7 @@ public sealed partial class DeviceReport
             mediaTest.SupportsReadLba =
                 !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -296,7 +296,7 @@ public sealed partial class DeviceReport
             mediaTest.SupportsReadRetryLba =
                 !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -314,7 +314,7 @@ public sealed partial class DeviceReport
             mediaTest.SupportsReadDmaLba =
                 !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -332,7 +332,7 @@ public sealed partial class DeviceReport
             mediaTest.SupportsReadDmaRetryLba =
                 !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -349,7 +349,7 @@ public sealed partial class DeviceReport
 
             mediaTest.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2,
                                        sense,
                                        errorChs.Status,
@@ -364,7 +364,7 @@ public sealed partial class DeviceReport
             mediaTest.SupportsReadLba48 =
                 !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -382,7 +382,7 @@ public sealed partial class DeviceReport
             mediaTest.SupportsReadDmaLba48 =
                 !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -431,7 +431,7 @@ public sealed partial class DeviceReport
                                          readBuf.Length                    > 0     &&
                                          BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -461,7 +461,7 @@ public sealed partial class DeviceReport
                                               readBuf.Length                    > 0     &&
                                               BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -489,7 +489,7 @@ public sealed partial class DeviceReport
                                             readBuf.Length                    > 0     &&
                                             BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -517,7 +517,7 @@ public sealed partial class DeviceReport
                                                  readBuf.Length                    > 0     &&
                                                  BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
 
-            AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+            AaruConsole.Debug(ATA_MODULE_NAME,
                                        Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                        sense,
                                        errorChs.Status,
@@ -656,7 +656,7 @@ public sealed partial class DeviceReport
         capabilities.SupportsReadSectors =
             !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorChs.Status,
@@ -674,7 +674,7 @@ public sealed partial class DeviceReport
         capabilities.SupportsReadRetry =
             !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorChs.Status,
@@ -692,7 +692,7 @@ public sealed partial class DeviceReport
         capabilities.SupportsReadDma =
             !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorChs.Status,
@@ -710,7 +710,7 @@ public sealed partial class DeviceReport
         capabilities.SupportsReadDmaRetry =
             !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorChs.Status,
@@ -727,7 +727,7 @@ public sealed partial class DeviceReport
 
         capabilities.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2,
                                    sense,
                                    errorChs.Status,
@@ -742,7 +742,7 @@ public sealed partial class DeviceReport
         capabilities.SupportsReadLba =
             !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorLba.Status,
@@ -760,7 +760,7 @@ public sealed partial class DeviceReport
         capabilities.SupportsReadRetryLba =
             !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorLba.Status,
@@ -778,7 +778,7 @@ public sealed partial class DeviceReport
         capabilities.SupportsReadDmaLba =
             !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorLba.Status,
@@ -796,7 +796,7 @@ public sealed partial class DeviceReport
         capabilities.SupportsReadDmaRetryLba =
             !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorLba.Status,
@@ -813,7 +813,7 @@ public sealed partial class DeviceReport
 
         capabilities.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2,
                                    sense,
                                    errorLba.Status,
@@ -828,7 +828,7 @@ public sealed partial class DeviceReport
         capabilities.SupportsReadLba48 =
             !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorLba48.Status,
@@ -846,7 +846,7 @@ public sealed partial class DeviceReport
         capabilities.SupportsReadDmaLba48 =
             !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && readBuf.Length > 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorLba48.Status,
@@ -895,7 +895,7 @@ public sealed partial class DeviceReport
                                         readBuf.Length                    > 0     &&
                                         BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorChs.Status,
@@ -925,7 +925,7 @@ public sealed partial class DeviceReport
                                              readBuf.Length                    > 0     &&
                                              BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorChs.Status,
@@ -953,7 +953,7 @@ public sealed partial class DeviceReport
                                            readBuf.Length                    > 0     &&
                                            BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorLba.Status,
@@ -981,7 +981,7 @@ public sealed partial class DeviceReport
                                                 readBuf.Length                    > 0     &&
                                                 BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME,
+        AaruConsole.Debug(ATA_MODULE_NAME,
                                    Localization.Core.Sense_0_Status_1_Error_2_Length_3,
                                    sense,
                                    errorLba.Status,
diff --git a/Aaru.Core/Devices/Report/GdRomSwapTrick.cs b/Aaru.Core/Devices/Report/GdRomSwapTrick.cs
index 7bfbda6f9..770256a5e 100644
--- a/Aaru.Core/Devices/Report/GdRomSwapTrick.cs
+++ b/Aaru.Core/Devices/Report/GdRomSwapTrick.cs
@@ -104,7 +104,7 @@ public sealed partial class DeviceReport
         if(sense)
         {
             AaruConsole.WriteLine(Localization.Core.READ_FULL_TOC_failed);
-            AaruConsole.DebugWriteLine(GDROM_MODULE_NAME, "{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.Debug(GDROM_MODULE_NAME, "{0}", Sense.PrettifySense(senseBuffer));
 
             report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
             report.GdRomSwapDiscCapabilities.TestCrashed        = false;
@@ -218,7 +218,7 @@ public sealed partial class DeviceReport
         if(sense)
         {
             AaruConsole.WriteLine(Localization.Core.READ_FULL_TOC_failed);
-            AaruConsole.DebugWriteLine(GDROM_MODULE_NAME, "{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.Debug(GDROM_MODULE_NAME, "{0}", Sense.PrettifySense(senseBuffer));
 
             report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
             report.GdRomSwapDiscCapabilities.TestCrashed        = false;
diff --git a/Aaru.Core/Devices/Report/MMC.cs b/Aaru.Core/Devices/Report/MMC.cs
index 6b7a7162d..8a92fd688 100644
--- a/Aaru.Core/Devices/Report/MMC.cs
+++ b/Aaru.Core/Devices/Report/MMC.cs
@@ -674,7 +674,7 @@ public sealed partial class DeviceReport
                     !_dev.ReadTocPmaAtip(out buffer, out senseBuffer, false, 0, 0, _dev.Timeout, out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadTOC);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadTOC);
             mediaTest.TocData = buffer;
 
             Spectre.ProgressSingleSpinner(ctx =>
@@ -683,7 +683,7 @@ public sealed partial class DeviceReport
                 mediaTest.CanReadFullTOC = !_dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadFullTOC);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadFullTOC);
             mediaTest.FullTocData = buffer;
         }
 
@@ -696,7 +696,7 @@ public sealed partial class DeviceReport
                 mediaTest.CanReadATIP = !_dev.ReadAtip(out buffer, out senseBuffer, _dev.Timeout, out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadATIP);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadATIP);
 
             mediaTest.AtipData = buffer;
 
@@ -706,7 +706,7 @@ public sealed partial class DeviceReport
                 mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPMA);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPMA);
 
             mediaTest.PmaData = buffer;
         }
@@ -731,7 +731,7 @@ public sealed partial class DeviceReport
                                                                out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPFI);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPFI);
 
             mediaTest.PfiData = buffer;
 
@@ -750,7 +750,7 @@ public sealed partial class DeviceReport
                                                                out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDMI);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDMI);
 
             mediaTest.DmiData = buffer;
         }
@@ -772,7 +772,7 @@ public sealed partial class DeviceReport
                                                                out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadCMI);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadCMI);
 
             mediaTest.CmiData = buffer;
         }
@@ -796,7 +796,7 @@ public sealed partial class DeviceReport
                                                                    out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
+                AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
 
                 mediaTest.DvdBcaData = buffer;
 
@@ -815,7 +815,7 @@ public sealed partial class DeviceReport
                                                                     out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadAACS);
+                AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadAACS);
 
                 mediaTest.DvdAacsData = buffer;
 
@@ -837,7 +837,7 @@ public sealed partial class DeviceReport
                                                                    out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
+                AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
 
                 mediaTest.DvdBcaData = buffer;
 
@@ -856,7 +856,7 @@ public sealed partial class DeviceReport
                                                                    out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPFI);
+                AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPFI);
 
                 mediaTest.PfiData = buffer;
 
@@ -875,7 +875,7 @@ public sealed partial class DeviceReport
                                                                    out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDMI);
+                AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDMI);
 
                 mediaTest.DmiData = buffer;
 
@@ -902,7 +902,7 @@ public sealed partial class DeviceReport
                                                                    out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
+                AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadBCA);
 
                 mediaTest.BluBcaData = buffer;
 
@@ -926,7 +926,7 @@ public sealed partial class DeviceReport
                                                                    out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDDS);
+                AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDDS);
 
                 mediaTest.DvdDdsData = buffer;
 
@@ -946,7 +946,7 @@ public sealed partial class DeviceReport
                                                 out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.CanReadSpareAreaInformation);
 
@@ -972,7 +972,7 @@ public sealed partial class DeviceReport
                                                                out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDDS);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDDS);
 
             mediaTest.BluDdsData = buffer;
 
@@ -992,7 +992,7 @@ public sealed partial class DeviceReport
                                             out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+            AaruConsole.Debug(SCSI_MODULE_NAME,
                                        Localization.Core.Sense_equals_0,
                                        !mediaTest.CanReadSpareAreaInformation);
 
@@ -1016,7 +1016,7 @@ public sealed partial class DeviceReport
                                                                out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPRI);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPRI);
 
             mediaTest.PriData = buffer;
         }
@@ -1038,7 +1038,7 @@ public sealed partial class DeviceReport
                                                                    out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadMediaID);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadMediaID);
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -1055,7 +1055,7 @@ public sealed partial class DeviceReport
                                                                          out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+            AaruConsole.Debug(SCSI_MODULE_NAME,
                                        Localization.Core.Sense_equals_0,
                                        !mediaTest.CanReadRecordablePFI);
 
@@ -1079,7 +1079,7 @@ public sealed partial class DeviceReport
                                                                 out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadADIP);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadADIP);
 
             mediaTest.AdipData = buffer;
 
@@ -1098,7 +1098,7 @@ public sealed partial class DeviceReport
                                                                out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDCB);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadDCB);
 
             mediaTest.DcbData = buffer;
         }
@@ -1120,7 +1120,7 @@ public sealed partial class DeviceReport
                                                                  out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadHDCMI);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadHDCMI);
 
             mediaTest.HdCmiData = buffer;
         }
@@ -1142,7 +1142,7 @@ public sealed partial class DeviceReport
                                                                          out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+            AaruConsole.Debug(SCSI_MODULE_NAME,
                                        Localization.Core.Sense_equals_0,
                                        !mediaTest.CanReadLayerCapacity);
 
@@ -1172,7 +1172,7 @@ public sealed partial class DeviceReport
                                                                            out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+            AaruConsole.Debug(SCSI_MODULE_NAME,
                                        Localization.Core.Sense_equals_0,
                                        !mediaTest.CanReadDiscInformation);
 
@@ -1193,7 +1193,7 @@ public sealed partial class DeviceReport
                                                                out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPAC);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadPAC);
 
             mediaTest.BluPacData = buffer;
         }
@@ -1233,7 +1233,7 @@ public sealed partial class DeviceReport
                 mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 16, 512, _dev.Timeout, out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
 
             mediaTest.Read6Data = buffer;
 
@@ -1256,7 +1256,7 @@ public sealed partial class DeviceReport
                                                         out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
 
             mediaTest.Read10Data = buffer;
 
@@ -1280,7 +1280,7 @@ public sealed partial class DeviceReport
                                                         out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
 
             mediaTest.Read12Data = buffer;
 
@@ -1303,7 +1303,7 @@ public sealed partial class DeviceReport
                                                         out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
 
             mediaTest.Read16Data = buffer;
         }
@@ -1315,7 +1315,7 @@ public sealed partial class DeviceReport
                 mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 16, 2048, _dev.Timeout, out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
 
             mediaTest.Read6Data = buffer;
 
@@ -1338,7 +1338,7 @@ public sealed partial class DeviceReport
                                                         out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
 
             mediaTest.Read10Data = buffer;
 
@@ -1362,7 +1362,7 @@ public sealed partial class DeviceReport
                                                         out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
 
             mediaTest.Read12Data = buffer;
 
@@ -1385,7 +1385,7 @@ public sealed partial class DeviceReport
                                                         out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
 
             mediaTest.Read16Data = buffer;
         }
@@ -1418,7 +1418,7 @@ public sealed partial class DeviceReport
                                                             out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.SupportsReadCd);
 
@@ -1445,7 +1445,7 @@ public sealed partial class DeviceReport
                                                                   out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.SupportsReadCdMsf);
 
@@ -1475,7 +1475,7 @@ public sealed partial class DeviceReport
                                                             out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.SupportsReadCd);
 
@@ -1502,7 +1502,7 @@ public sealed partial class DeviceReport
                                                                   out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.SupportsReadCdMsf);
 
@@ -1530,7 +1530,7 @@ public sealed partial class DeviceReport
                                                                out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.SupportsReadCdRaw);
 
@@ -1557,7 +1557,7 @@ public sealed partial class DeviceReport
                                                                      out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.SupportsReadCdMsfRaw);
 
@@ -1614,7 +1614,7 @@ public sealed partial class DeviceReport
 
                         // ReSharper restore IntVariableOverflowInUncheckedContext
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, sense);
+                        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, sense);
 
                         mediaTest.Track1PregapData = buffer;
 
@@ -1676,7 +1676,7 @@ public sealed partial class DeviceReport
                                                 out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, sense);
+                        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, sense);
 
                         mediaTest.LeadInData = buffer;
 
@@ -1734,7 +1734,7 @@ public sealed partial class DeviceReport
                     }
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.CanReadLeadOut);
 
@@ -1789,7 +1789,7 @@ public sealed partial class DeviceReport
                                                                        out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadC2Pointers);
 
@@ -1818,7 +1818,7 @@ public sealed partial class DeviceReport
                                                                  _dev.Timeout,
                                                                  out _);
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.Sense_equals_0,
                                                !mediaTest.CanReadPQSubchannel);
 
@@ -1841,7 +1841,7 @@ public sealed partial class DeviceReport
                                                                  _dev.Timeout,
                                                                  out _);
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.Sense_equals_0,
                                                !mediaTest.CanReadRWSubchannel);
 
@@ -1869,7 +1869,7 @@ public sealed partial class DeviceReport
                                                                             _dev.Timeout,
                                                                             out _);
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadCorrectedSubchannel);
 
@@ -1927,7 +1927,7 @@ public sealed partial class DeviceReport
                                                                                out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadPQSubchannelWithC2);
 
@@ -1970,7 +1970,7 @@ public sealed partial class DeviceReport
                                                                                out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadRWSubchannelWithC2);
 
@@ -2013,7 +2013,7 @@ public sealed partial class DeviceReport
                                                                              out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadCorrectedSubchannelWithC2);
 
@@ -2069,7 +2069,7 @@ public sealed partial class DeviceReport
                                                                        out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadC2Pointers);
 
@@ -2098,7 +2098,7 @@ public sealed partial class DeviceReport
                                                                  _dev.Timeout,
                                                                  out _);
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.Sense_equals_0,
                                                !mediaTest.CanReadPQSubchannel);
 
@@ -2121,7 +2121,7 @@ public sealed partial class DeviceReport
                                                                  _dev.Timeout,
                                                                  out _);
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.Sense_equals_0,
                                                !mediaTest.CanReadRWSubchannel);
 
@@ -2149,7 +2149,7 @@ public sealed partial class DeviceReport
                                                                             _dev.Timeout,
                                                                             out _);
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadCorrectedSubchannel);
 
@@ -2206,7 +2206,7 @@ public sealed partial class DeviceReport
                                                                                out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadPQSubchannelWithC2);
 
@@ -2249,7 +2249,7 @@ public sealed partial class DeviceReport
                                                                                out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadRWSubchannelWithC2);
 
@@ -2297,7 +2297,7 @@ public sealed partial class DeviceReport
                                                                                  out _);
                             }
 
-                            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                            AaruConsole.Debug(SCSI_MODULE_NAME,
                                                        Localization.Core.Sense_equals_0,
                                                        !mediaTest.CanReadCorrectedSubchannelWithC2);
 
@@ -2354,7 +2354,7 @@ public sealed partial class DeviceReport
                         }
                     });
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.Sense_equals_0,
                                                !mediaTest.CanReadC2Pointers);
 
@@ -2382,7 +2382,7 @@ public sealed partial class DeviceReport
                                                                  _dev.Timeout,
                                                                  out _);
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.Sense_equals_0,
                                                !mediaTest.CanReadPQSubchannel);
 
@@ -2405,7 +2405,7 @@ public sealed partial class DeviceReport
                                                                  _dev.Timeout,
                                                                  out _);
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.Sense_equals_0,
                                                !mediaTest.CanReadRWSubchannel);
 
@@ -2433,7 +2433,7 @@ public sealed partial class DeviceReport
                                                                             _dev.Timeout,
                                                                             out _);
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadCorrectedSubchannel);
 
@@ -2490,7 +2490,7 @@ public sealed partial class DeviceReport
                                                                                out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadPQSubchannelWithC2);
 
@@ -2533,7 +2533,7 @@ public sealed partial class DeviceReport
                                                                                out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadRWSubchannelWithC2);
 
@@ -2576,7 +2576,7 @@ public sealed partial class DeviceReport
                                                                              out _);
                         }
 
-                        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                        AaruConsole.Debug(SCSI_MODULE_NAME,
                                                    Localization.Core.Sense_equals_0,
                                                    !mediaTest.CanReadCorrectedSubchannelWithC2);
 
@@ -2602,7 +2602,7 @@ public sealed partial class DeviceReport
                                               out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.SupportsPlextorReadCDDA);
 
@@ -2626,7 +2626,7 @@ public sealed partial class DeviceReport
                                               out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.SupportsPioneerReadCDDA);
 
@@ -2647,7 +2647,7 @@ public sealed partial class DeviceReport
                                                  out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.SupportsPioneerReadCDDAMSF);
 
@@ -2664,7 +2664,7 @@ public sealed partial class DeviceReport
                         !_dev.NecReadCdDa(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.SupportsNECReadCDDA);
 
@@ -2727,7 +2727,7 @@ public sealed partial class DeviceReport
                     !_dev.PlextorReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+            AaruConsole.Debug(SCSI_MODULE_NAME,
                                        Localization.Core.Sense_equals_0,
                                        !mediaTest.SupportsPlextorReadRawDVD);
 
@@ -2747,7 +2747,7 @@ public sealed partial class DeviceReport
                     !_dev.HlDtStReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _, 0xffff, false);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+            AaruConsole.Debug(SCSI_MODULE_NAME,
                                        Localization.Core.Sense_equals_0,
                                        !mediaTest.SupportsHLDTSTReadRawDVD);
 
@@ -2767,7 +2767,7 @@ public sealed partial class DeviceReport
                     !_dev.LiteOnReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _, 0xffff, false);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+            AaruConsole.Debug(SCSI_MODULE_NAME,
                                        Localization.Core.Sense_equals_0,
                                        !mediaTest.SupportsLiteOnReadRawDVD);
 
@@ -2882,7 +2882,7 @@ public sealed partial class DeviceReport
 
                 mediaTest.ReadF1_06Data = mediaTest.CanReadF1_06 == true ? buffer : senseBuffer;
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadF1_06);
+                AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadF1_06);
             });
 
             Spectre.ProgressSingleSpinner(ctx =>
@@ -3035,7 +3035,7 @@ public sealed partial class DeviceReport
                     mediaTest.ReadF1_06LeadOutData = senseBuffer;
                 }
 
-                AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                AaruConsole.Debug(SCSI_MODULE_NAME,
                                            Localization.Core.Sense_equals_0,
                                            !mediaTest.CanReadF1_06LeadOut);
             });
@@ -3050,7 +3050,7 @@ public sealed partial class DeviceReport
                 mediaTest.CanReadFullTOC = !_dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
             });
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadFullTOC);
+            AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.CanReadFullTOC);
 
             mediaTest.FullTocData = buffer;
 
@@ -3066,7 +3066,7 @@ public sealed partial class DeviceReport
 
                     if(!decodedToc.TrackDescriptors.Any(t => t.SessionNumber > 1))
                     {
-                        AaruConsole.ErrorWriteLine(Localization.Core
+                        AaruConsole.Error(Localization.Core
                                                                .Could_not_find_second_session_Have_you_inserted_the_correct_type_of_disc);
 
                         return null;
@@ -3080,19 +3080,19 @@ public sealed partial class DeviceReport
 
                     if(firstSessionLeadOutTrack.SessionNumber == 0 || secondSessionFirstTrack.SessionNumber == 0)
                     {
-                        AaruConsole.ErrorWriteLine(Localization.Core
+                        AaruConsole.Error(Localization.Core
                                                                .Could_not_find_second_session_Have_you_inserted_the_correct_type_of_disc);
 
                         return null;
                     }
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.First_session_Lead_Out_starts_at_0_1_2,
                                                firstSessionLeadOutTrack.PMIN,
                                                firstSessionLeadOutTrack.PSEC,
                                                firstSessionLeadOutTrack.PFRAME);
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.Second_session_starts_at_0_1_2,
                                                secondSessionFirstTrack.PMIN,
                                                secondSessionFirstTrack.PSEC,
@@ -3171,7 +3171,7 @@ public sealed partial class DeviceReport
                         }
                     });
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.Sense_equals_0,
                                                !mediaTest.CanReadingIntersessionLeadOut);
 
@@ -3238,7 +3238,7 @@ public sealed partial class DeviceReport
                         }
                     });
 
-                    AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+                    AaruConsole.Debug(SCSI_MODULE_NAME,
                                                Localization.Core.Sense_equals_0,
                                                !mediaTest.CanReadingIntersessionLeadIn);
 
diff --git a/Aaru.Core/Devices/Report/Scsi.cs b/Aaru.Core/Devices/Report/Scsi.cs
index 4547be174..284ff7621 100644
--- a/Aaru.Core/Devices/Report/Scsi.cs
+++ b/Aaru.Core/Devices/Report/Scsi.cs
@@ -600,7 +600,7 @@ public sealed partial class DeviceReport
                 !_dev.Read6(out buffer, out senseBuffer, 0, mediaTest.BlockSize ?? 512, _dev.Timeout, out _);
         });
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead6);
         mediaTest.Read6Data = buffer;
 
         Spectre.ProgressSingleSpinner(ctx =>
@@ -622,7 +622,7 @@ public sealed partial class DeviceReport
                                                     out _);
         });
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead10);
         mediaTest.Read10Data = buffer;
 
         Spectre.ProgressSingleSpinner(ctx =>
@@ -645,7 +645,7 @@ public sealed partial class DeviceReport
                                                     out _);
         });
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead12);
         mediaTest.Read12Data = buffer;
 
         Spectre.ProgressSingleSpinner(ctx =>
@@ -667,7 +667,7 @@ public sealed partial class DeviceReport
                                                     out _);
         });
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !mediaTest.SupportsRead16);
         mediaTest.Read16Data = buffer;
 
         mediaTest.LongBlockSize = mediaTest.BlockSize;
@@ -981,7 +981,7 @@ public sealed partial class DeviceReport
                                                      out _);
         });
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead6);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead6);
         capabilities.Read6Data = buffer;
 
         Spectre.ProgressSingleSpinner(ctx =>
@@ -1003,7 +1003,7 @@ public sealed partial class DeviceReport
                                                        out _);
         });
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead10);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead10);
         capabilities.Read10Data = buffer;
 
         Spectre.ProgressSingleSpinner(ctx =>
@@ -1026,7 +1026,7 @@ public sealed partial class DeviceReport
                                                        out _);
         });
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead12);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead12);
         capabilities.Read12Data = buffer;
 
         Spectre.ProgressSingleSpinner(ctx =>
@@ -1048,7 +1048,7 @@ public sealed partial class DeviceReport
                                                        out _);
         });
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead16);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Core.Sense_equals_0, !capabilities.SupportsRead16);
         capabilities.Read16Data = buffer;
 
         capabilities.LongBlockSize = capabilities.BlockSize;
diff --git a/Aaru.Core/Devices/Scanning/SCSI.cs b/Aaru.Core/Devices/Scanning/SCSI.cs
index c17c8e8a4..66460a16c 100644
--- a/Aaru.Core/Devices/Scanning/SCSI.cs
+++ b/Aaru.Core/Devices/Scanning/SCSI.cs
@@ -453,7 +453,7 @@ public sealed partial class MediaScan
 
                     if(readcd)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_CD_error_0,
                                                    Sense.PrettifySense(senseBuf));
 
diff --git a/Aaru.Core/Entropy.cs b/Aaru.Core/Entropy.cs
index ea421817e..657af444d 100644
--- a/Aaru.Core/Entropy.cs
+++ b/Aaru.Core/Entropy.cs
@@ -84,7 +84,7 @@ public sealed class Entropy
 
         if(_inputFormat is not IOpticalMediaImage opticalMediaImage)
         {
-            AaruConsole.ErrorWriteLine(Localization.Core.The_selected_image_does_not_support_tracks);
+            AaruConsole.Error(Localization.Core.The_selected_image_does_not_support_tracks);
 
             return entropyResults.ToArray();
         }
@@ -115,7 +115,7 @@ public sealed class Entropy
 
                 trackEntropy.Sectors = currentTrack.EndSector - currentTrack.StartSector + 1;
 
-                AaruConsole.VerboseWriteLine(Localization.Core.Track_0_has_1_sectors,
+                AaruConsole.Verbose(Localization.Core.Track_0_has_1_sectors,
                                              currentTrack.Sequence,
                                              trackEntropy.Sectors);
 
@@ -133,7 +133,7 @@ public sealed class Entropy
 
                     if(errno != ErrorNumber.NoError)
                     {
-                        AaruConsole.ErrorWriteLine(string.Format(Localization.Core
+                        AaruConsole.Error(string.Format(Localization.Core
                                                                              .Error_0_while_reading_sector_1_continuing,
                                                                  errno,
                                                                  i));
@@ -170,12 +170,12 @@ public sealed class Entropy
         {
             if(_debug)
             {
-                AaruConsole.DebugWriteLine(Localization.Core.Could_not_get_tracks_because_0, ex.Message);
-                AaruConsole.WriteException(ex);
+                AaruConsole.Debug(Localization.Core.Could_not_get_tracks_because_0, ex.Message);
+                AaruConsole.Exception(ex);
             }
             else
             {
-                AaruConsole.ErrorWriteLine(Localization.Core
+                AaruConsole.Error(Localization.Core
                                                        .Unable_to_get_separate_tracks_not_calculating_their_entropy);
             }
         }
@@ -213,7 +213,7 @@ public sealed class Entropy
 
             if(errno != ErrorNumber.NoError)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_while_reading_sector_1_continuing,
+                AaruConsole.Error(string.Format(Localization.Core.Error_0_while_reading_sector_1_continuing,
                                                          errno,
                                                          i));
 
@@ -265,7 +265,7 @@ public sealed class Entropy
 
         if(errno != ErrorNumber.NoError)
         {
-            AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_while_reading_data__not_continuing,
+            AaruConsole.Error(string.Format(Localization.Core.Error_0_while_reading_data__not_continuing,
                                                      errno));
 
             return entropy;
diff --git a/Aaru.Core/Filesystems.cs b/Aaru.Core/Filesystems.cs
index dd144dcca..1445029d3 100644
--- a/Aaru.Core/Filesystems.cs
+++ b/Aaru.Core/Filesystems.cs
@@ -67,10 +67,10 @@ public static class Filesystems
             catch(Exception ex)
             {
                 AaruConsole
-                   .ErrorWriteLine("Error identifying filesystem {0}. Please open a report with the following line in a Github issue.",
+                   .Error("Error identifying filesystem {0}. Please open a report with the following line in a Github issue.",
                                    plugin.Name);
 
-                AaruConsole.WriteException(ex);
+                AaruConsole.Exception(ex);
             }
         }
     }
diff --git a/Aaru.Core/ImageFormat.cs b/Aaru.Core/ImageFormat.cs
index a32eba69c..046c4530a 100644
--- a/Aaru.Core/ImageFormat.cs
+++ b/Aaru.Core/ImageFormat.cs
@@ -62,7 +62,7 @@ public static class ImageFormat
 
                 try
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
 
                     if(!imagePlugin.Identify(imageFilter)) continue;
 
@@ -88,7 +88,7 @@ public static class ImageFormat
 
                     if(imagePlugin.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000")) continue;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
 
                     if(!imagePlugin.Identify(imageFilter)) continue;
 
@@ -114,7 +114,7 @@ public static class ImageFormat
 
                 try
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Trying_plugin_0, imagePlugin.Name);
 
                     if(!imagePlugin.Identify(imageFilter)) continue;
 
diff --git a/Aaru.Core/ImageInfo.cs b/Aaru.Core/ImageInfo.cs
index cea5a618d..c5118e055 100644
--- a/Aaru.Core/ImageInfo.cs
+++ b/Aaru.Core/ImageInfo.cs
@@ -672,13 +672,13 @@ public static class ImageInfo
                             case TupleCodes.CISTPL_SPCL:
                             case TupleCodes.CISTPL_SWIL:
                             case TupleCodes.CISTPL_VERS_2:
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Core.Invoke_Found_undecoded_tuple_ID_0,
                                                            tuple.Code);
 
                                 break;
                             default:
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Core.Found_unknown_tuple_ID_0,
                                                            (byte)tuple.Code);
 
@@ -687,7 +687,7 @@ public static class ImageInfo
                     }
                 }
                 else
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Could_not_get_tuples);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Could_not_get_tuples);
             }
         }
 
diff --git a/Aaru.Core/Media/Detection/MMC.cs b/Aaru.Core/Media/Detection/MMC.cs
index 1e956a294..99e115faa 100644
--- a/Aaru.Core/Media/Detection/MMC.cs
+++ b/Aaru.Core/Media/Detection/MMC.cs
@@ -270,7 +270,7 @@ public static class MMC
         {
             Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Core.GET_CONFIGURATION_current_profile_is_0,
                                        ftr.CurrentProfile);
 
@@ -346,12 +346,12 @@ public static class MMC
                     switch(a0Track.PSEC)
                     {
                         case 0x10:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.TOC_says_disc_type_is_CD_i);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Core.TOC_says_disc_type_is_CD_i);
                             mediaType = MediaType.CDI;
 
                             break;
                         case 0x20:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.TOC_says_disc_type_is_CD_ROM_XA);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Core.TOC_says_disc_type_is_CD_ROM_XA);
 
                             mediaType = MediaType.CDROMXA;
 
@@ -393,7 +393,7 @@ public static class MMC
                 switch(hasDataTrack)
                 {
                     case true when hasAudioTrack && allFirstSessionTracksAreAudio && sessions == 2:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core
                                                                .Disc_has_audio_and_data_two_sessions_all_data_second_CD_Plus);
 
@@ -401,7 +401,7 @@ public static class MMC
 
                         break;
                     case false when hasAudioTrack && sessions == 1:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.Disc_has_only_audio_in_a_session_CD_Digital_Audio);
 
                         mediaType = MediaType.CDDA;
@@ -411,14 +411,14 @@ public static class MMC
 
                 if(hasDataTrack && !hasAudioTrack && sessions == 1)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Disc_has_only_data_in_a_session_CD_ROM);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Disc_has_only_data_in_a_session_CD_ROM);
 
                     mediaType = MediaType.CDROM;
                 }
 
                 if(hasVideoTrack && !hasDataTrack && sessions == 1)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Disc_has_video_tracks_CD_Video);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Disc_has_video_tracks_CD_Video);
 
                     mediaType = MediaType.CDV;
                 }
@@ -473,7 +473,7 @@ public static class MMC
                        cmdBuf[15] != 0x02)
                         continue;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Disc_has_a_mode_two_data_track_CD_ROM_XA);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Disc_has_a_mode_two_data_track_CD_ROM_XA);
 
                     mediaType = MediaType.CDROMXA;
 
@@ -689,7 +689,7 @@ public static class MMC
                         {
                             mediaType = MediaType.CDIREADY;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.Disc_has_hidden_CD_i_pregap_CD_i_Ready);
 
                             return;
@@ -781,7 +781,7 @@ public static class MMC
                             {
                                 mediaType = MediaType.CDIREADY;
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Core.Disc_has_hidden_CD_i_pregap_CD_i_Ready);
 
                                 return;
@@ -1496,7 +1496,7 @@ public static class MMC
                     {
                         if(DMI.IsXbox(cmdBuf))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "Found Xbox DMI, setting disc type to Xbox Game Disc (XGD).");
 
                             mediaType = MediaType.XGD;
@@ -1509,7 +1509,7 @@ public static class MMC
                             // All XGD3 all have the same number of blocks
                             if(blocks is 25063 or 4229664 or 4246304) // Wxripper unlock
                             {
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            "Found Xbox 360 DMI with {0} blocks, setting disc type to Xbox 360 Game Disc 3 (XGD3).");
 
                                 mediaType = MediaType.XGD3;
@@ -1517,7 +1517,7 @@ public static class MMC
                                 return;
                             }
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "Found Xbox 360 DMI with {0} blocks, setting disc type to Xbox 360 Game Disc 2 (XGD2).");
 
                             mediaType = MediaType.XGD2;
@@ -1760,7 +1760,7 @@ public static class MMC
                                 case "PHOTO_CD":
                                     mediaType = MediaType.PCD;
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization.Core.Found_Photo_CD_description_file);
 
                                     return;
@@ -1813,7 +1813,7 @@ public static class MMC
                 {
                     mediaType = MediaType.MEGACD;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Mega_Sega_CD_IP_BIN);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Mega_Sega_CD_IP_BIN);
 
                     return;
                 }
@@ -1822,7 +1822,7 @@ public static class MMC
                 {
                     mediaType = MediaType.SATURNCD;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sega_Saturn_IP_BIN);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Sega_Saturn_IP_BIN);
 
                     return;
                 }
@@ -1832,7 +1832,7 @@ public static class MMC
                 {
                     mediaType = MediaType.GDROM;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Sega_Dreamcast_IP_BIN);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Sega_Dreamcast_IP_BIN);
 
                     return;
                 }
@@ -1846,7 +1846,7 @@ public static class MMC
 
                     string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.PlayStation_2_boot_sectors_SHA256_0,
                                                ps2BootSectorsHash);
 
@@ -1854,7 +1854,7 @@ public static class MMC
                     {
                         mediaType = MediaType.PS2CD;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.Found_Sony_PlayStation_2_boot_sectors);
 
                         goto hasPs2CdBoot;
@@ -1870,7 +1870,7 @@ public static class MMC
                     {
                         mediaType = MediaType.ThreeDO;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Opera_filesystem);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Opera_filesystem);
 
                         return;
                     }
@@ -1879,7 +1879,7 @@ public static class MMC
                     {
                         mediaType = MediaType.FMTOWNS;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_FM_Towns_boot);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_FM_Towns_boot);
 
                         return;
                     }
@@ -1897,7 +1897,7 @@ public static class MMC
                     {
                         mediaType = MediaType.Playdia;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Playdia_copyright);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Playdia_copyright);
 
                         return;
                     }
@@ -1912,7 +1912,7 @@ public static class MMC
                     {
                         mediaType = MediaType.SuperCDROM2;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_PC_Engine_CD_signature);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_PC_Engine_CD_signature);
 
                         return;
                     }
@@ -1927,7 +1927,7 @@ public static class MMC
                     {
                         mediaType = MediaType.PCFX;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_PC_FX_copyright);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_PC_FX_copyright);
 
                         return;
                     }
@@ -1945,7 +1945,7 @@ public static class MMC
 
                         mediaType = MediaType.JaguarCD;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_Atari_signature);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_Atari_signature);
 
                         break;
                     }
@@ -1960,7 +1960,7 @@ public static class MMC
                     {
                         mediaType = MediaType.MilCD;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.Found_Sega_Dreamcast_IP_BIN_on_second_session);
 
                         return;
@@ -1973,7 +1973,7 @@ public static class MMC
                 {
                     mediaType = MediaType.VideoNowColor;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_VideoNow_Color_frame);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_VideoNow_Color_frame);
 
                     return;
                 }
@@ -2021,7 +2021,7 @@ public static class MMC
                         {
                             mediaType = MediaType.CDEG;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.Found_enhanced_graphics_RW_packet);
 
                             return;
@@ -2031,7 +2031,7 @@ public static class MMC
                         {
                             mediaType = MediaType.CDG;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_graphics_RW_packet);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_graphics_RW_packet);
 
                             return;
                         }
@@ -2040,7 +2040,7 @@ public static class MMC
                         {
                             mediaType = MediaType.CDMIDI;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_MIDI_RW_packet);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_MIDI_RW_packet);
 
                             return;
                         }
@@ -2227,7 +2227,7 @@ public static class MMC
                 {
                     mediaType = MediaType.CD32;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_CD32_TM_file_in_root);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_CD32_TM_file_in_root);
 
                     return;
                 }
@@ -2236,7 +2236,7 @@ public static class MMC
                 {
                     mediaType = MediaType.CDTV;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_CDTV_TM_file_in_root);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_CDTV_TM_file_in_root);
 
                     return;
                 }
@@ -2382,7 +2382,7 @@ public static class MMC
                         {
                             mediaType = MediaType.NeoGeoCD;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.Found_correct_IPL_TXT_file_in_root);
 
                             return;
@@ -2484,21 +2484,21 @@ public static class MMC
                             case "VIDEO_CD":
                                 mediaType = MediaType.VCD;
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Core.Found_Video_CD_description_file);
 
                                 return;
                             case "SUPERVCD":
                                 mediaType = MediaType.SVCD;
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Core.Found_Super_Video_CD_description_file);
 
                                 break;
                             case "HQ-VCD":
                                 mediaType = MediaType.CVD;
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Core.Found_China_Video_Disc_description_file);
 
                                 break;
@@ -2600,7 +2600,7 @@ public static class MMC
                             case "PHOTO_CD":
                                 mediaType = MediaType.PCD;
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Core.Found_Photo_CD_description_file);
 
                                 return;
@@ -2697,7 +2697,7 @@ public static class MMC
                         {
                             mediaType = MediaType.PS1CD;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.Found_correct_SYSTEM_CNF_file_in_root_PS1);
                         }
 
@@ -2705,7 +2705,7 @@ public static class MMC
                         {
                             mediaType = MediaType.PS2CD;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.Found_correct_SYSTEM_CNF_file_in_root_PS2);
                         }
                     }
@@ -2732,13 +2732,13 @@ public static class MMC
 
                     string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.PlayStation_2_boot_sectors_SHA256_0,
                                                ps2BootSectorsHash);
 
                     if(ps2BootSectorsHash is PS2_PAL_HASH or PS2_NTSC_HASH or PS2_JAPANESE_HASH)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.Found_Sony_PlayStation_2_boot_sectors_DVD);
 
                         mediaType = MediaType.PS2DVD;
@@ -2755,14 +2755,14 @@ public static class MMC
                         switch(mediaType)
                         {
                             case MediaType.BDROM:
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Core.Found_Sony_PlayStation_3_boot_sectors);
 
                                 mediaType = MediaType.PS3BD;
 
                                 break;
                             case MediaType.DVDROM:
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Core.Found_Sony_PlayStation_3_boot_sectors_DVD);
 
                                 mediaType = MediaType.PS3DVD;
@@ -2778,7 +2778,7 @@ public static class MMC
                     {
                         mediaType = MediaType.PS4BD;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.Found_Sony_PlayStation_4_boot_sectors);
                     }
                 }
@@ -2790,7 +2790,7 @@ public static class MMC
                     switch(blurayType)
                     {
                         case "XG4":
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.Blu_ray_type_XG4_setting_disc_type_XGD4);
 
                             mediaType = MediaType.XGD4;
@@ -2808,14 +2808,14 @@ public static class MMC
                                 {
                                     mediaType = MediaType.PS5BD;
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization.Core.Found_Sony_PlayStation_5_boot_sectors);
 
                                     break;
                                 }
                             }
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.Blu_ray_type_BDU_setting_disc_type_UHD);
 
                             mediaType = MediaType.UHDBD;
diff --git a/Aaru.Core/Media/Info/ScsiInfo.cs b/Aaru.Core/Media/Info/ScsiInfo.cs
index 3b561c639..18a7a349e 100644
--- a/Aaru.Core/Media/Info/ScsiInfo.cs
+++ b/Aaru.Core/Media/Info/ScsiInfo.cs
@@ -112,7 +112,7 @@ public sealed class ScsiInfo
 
                             if(sense)
                             {
-                                AaruConsole.ErrorWriteLine(Localization.Core.Please_insert_media_in_drive);
+                                AaruConsole.Error(Localization.Core.Please_insert_media_in_drive);
 
                                 return;
                             }
@@ -136,7 +136,7 @@ public sealed class ScsiInfo
 
                             if(sense)
                             {
-                                AaruConsole.ErrorWriteLine(Localization.Core.Error_testing_unit_was_ready_0,
+                                AaruConsole.Error(Localization.Core.Error_testing_unit_was_ready_0,
                                                            Sense.PrettifySense(senseBuf));
 
                                 return;
@@ -145,7 +145,7 @@ public sealed class ScsiInfo
                             break;
                         }
                         default:
-                            AaruConsole.ErrorWriteLine(Localization.Core.Error_testing_unit_was_ready_0,
+                            AaruConsole.Error(Localization.Core.Error_testing_unit_was_ready_0,
                                                        Sense.PrettifySense(senseBuf));
 
                             return;
@@ -153,7 +153,7 @@ public sealed class ScsiInfo
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Core.Unknown_sense_testing_unit_was_ready);
+                    AaruConsole.Error(Localization.Core.Unknown_sense_testing_unit_was_ready);
 
                     return;
                 }
@@ -210,8 +210,8 @@ public sealed class ScsiInfo
                     {
                         if(dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
                         {
-                            AaruConsole.ErrorWriteLine(Localization.Core.Unable_to_get_media_capacity);
-                            AaruConsole.ErrorWriteLine("{0}", Sense.PrettifySense(senseBuf));
+                            AaruConsole.Error(Localization.Core.Unable_to_get_media_capacity);
+                            AaruConsole.Error("{0}", Sense.PrettifySense(senseBuf));
                         }
                     }
 
@@ -296,7 +296,7 @@ public sealed class ScsiInfo
 
             if(sense)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, "READ GET CONFIGURATION:\n{0}", Sense.PrettifySense(senseBuf));
+                AaruConsole.Debug(MODULE_NAME, "READ GET CONFIGURATION:\n{0}", Sense.PrettifySense(senseBuf));
 
                 if(dev.IsUsb && scsiMediumType is 0x40 or 0x41 or 0x42) MediaType = MediaType.FlashDrive;
             }
@@ -305,7 +305,7 @@ public sealed class ScsiInfo
                 MmcConfiguration = cmdBuf;
                 Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Core.GET_CONFIGURATION_current_profile_is_0,
                                            ftr.CurrentProfile);
 
@@ -369,7 +369,7 @@ public sealed class ScsiInfo
 
             if(sense)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Core.READ_DISC_STRUCTURE_Recognized_Format_Layers_0,
                                            Sense.PrettifySense(senseBuf));
             }
@@ -388,7 +388,7 @@ public sealed class ScsiInfo
 
             if(sense)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Core.READ_DISC_STRUCTURE_Write_Protection_Status_0,
                                            Sense.PrettifySense(senseBuf));
             }
@@ -436,7 +436,7 @@ public sealed class ScsiInfo
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.READ_DISC_STRUCTURE_PFI_0,
                                                Sense.PrettifySense(senseBuf));
                 }
@@ -488,7 +488,7 @@ public sealed class ScsiInfo
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.READ_DISC_STRUCTURE_DMI_0,
                                                Sense.PrettifySense(senseBuf));
                 }
@@ -527,7 +527,7 @@ public sealed class ScsiInfo
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.READ_DISC_STRUCTURE_CMI_0,
                                                Sense.PrettifySense(senseBuf));
                 }
@@ -556,7 +556,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_BCA_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -575,7 +575,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_DVD_AACS_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -602,7 +602,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_DDS_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -621,7 +621,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_Medium_Status_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -640,7 +640,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_SAI_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -667,7 +667,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_Last_Out_Border_RMD_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -696,7 +696,7 @@ public sealed class ScsiInfo
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.READ_DISC_STRUCTURE_Disc_Key_0,
                                                Sense.PrettifySense(senseBuf));
                 }
@@ -715,7 +715,7 @@ public sealed class ScsiInfo
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.READ_DISC_STRUCTURE_Sector_CMI_0,
                                                Sense.PrettifySense(senseBuf));
                 }
@@ -791,7 +791,7 @@ public sealed class ScsiInfo
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.READ_DISC_STRUCTURE_Pre_Recorded_Info_0,
                                                Sense.PrettifySense(senseBuf));
                 }
@@ -826,7 +826,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_DVD_R_Media_ID_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -845,7 +845,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_DVD_R_PFI_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -878,7 +878,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_ADIP_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -897,7 +897,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_DCB_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -923,7 +923,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_HD_DVD_CMI_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -953,7 +953,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_HD_DVD_R_Medium_Status,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -972,7 +972,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_Last_RMD_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1000,7 +1000,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_Layer_Capacity_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1030,7 +1030,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_Middle_Zone_Start_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1049,7 +1049,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_Jump_Interval_Size_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1068,7 +1068,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_Manual_Layer_Jump_Start_LBA_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1087,7 +1087,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_Remap_Anchor_Point_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1118,7 +1118,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_DI_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1137,7 +1137,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_PAC_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1167,7 +1167,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_BCA_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1196,7 +1196,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_DDS_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1215,7 +1215,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_Cartridge_Status_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1234,7 +1234,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "READ DISC STRUCTURE: Spare Area Information\n{0}",
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1253,7 +1253,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_Raw_DFL_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1268,7 +1268,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_001b_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1283,7 +1283,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_DISC_STRUCTURE_010b_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1307,7 +1307,7 @@ public sealed class ScsiInfo
 
                     if(tocSense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_TOC_PMA_ATIP_TOC_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1325,7 +1325,7 @@ public sealed class ScsiInfo
 
                     if(sense)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.READ_TOC_PMA_ATIP_ATIP_0,
                                                    Sense.PrettifySense(senseBuf));
                     }
@@ -1349,7 +1349,7 @@ public sealed class ScsiInfo
 
                         if(sense)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.READ_TOC_PMA_ATIP_Session_Info_0,
                                                        Sense.PrettifySense(senseBuf));
                         }
@@ -1369,7 +1369,7 @@ public sealed class ScsiInfo
 
                         if(sense)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.READ_TOC_PMA_ATIP_Raw_TOC_0,
                                                        Sense.PrettifySense(senseBuf));
                         }
@@ -1384,7 +1384,7 @@ public sealed class ScsiInfo
 
                         if(sense)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.READ_TOC_PMA_ATIP_PMA_0,
                                                        Sense.PrettifySense(senseBuf));
                         }
@@ -1394,7 +1394,7 @@ public sealed class ScsiInfo
 
                         if(sense)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.READ_TOC_PMA_ATIP_CD_TEXT_0,
                                                        Sense.PrettifySense(senseBuf));
                         }
@@ -1441,7 +1441,7 @@ public sealed class ScsiInfo
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.READ_DISC_STRUCTURE_PFI_0,
                                                Sense.PrettifySense(senseBuf));
                 }
@@ -1478,7 +1478,7 @@ public sealed class ScsiInfo
 
                 if(sense)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.READ_DISC_STRUCTURE_DMI_0,
                                                Sense.PrettifySense(senseBuf));
                 }
@@ -1493,7 +1493,7 @@ public sealed class ScsiInfo
 
         if(sense)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Core.READ_MEDIA_SERIAL_NUMBER_0,
                                        Sense.PrettifySense(senseBuf));
         }
@@ -1522,7 +1522,7 @@ public sealed class ScsiInfo
 
                         if(sense)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.KREON_EXTRACT_SS_0,
                                                        Sense.PrettifySense(senseBuf));
                         }
@@ -1532,13 +1532,13 @@ public sealed class ScsiInfo
                         DecodedXboxSecuritySector = SS.Decode(cmdBuf);
 
                         // Get video partition size
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_video_partition_size);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_video_partition_size);
 
                         sense = dev.KreonLock(out senseBuf, dev.Timeout, out _);
 
                         if(sense)
                         {
-                            AaruConsole.ErrorWriteLine(Localization.Core.Cannot_lock_drive_not_continuing);
+                            AaruConsole.Error(Localization.Core.Cannot_lock_drive_not_continuing);
 
                             break;
                         }
@@ -1547,7 +1547,7 @@ public sealed class ScsiInfo
 
                         if(sense)
                         {
-                            AaruConsole.ErrorWriteLine(Localization.Core.Cannot_get_disc_capacity);
+                            AaruConsole.Error(Localization.Core.Cannot_get_disc_capacity);
 
                             break;
                         }
@@ -1567,12 +1567,12 @@ public sealed class ScsiInfo
 
                         if(sense)
                         {
-                            AaruConsole.ErrorWriteLine(Localization.Core.Cannot_get_PFI);
+                            AaruConsole.Error(Localization.Core.Cannot_get_PFI);
 
                             break;
                         }
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.Video_partition_total_size_0_sectors,
                                                    totalSize);
 
@@ -1583,12 +1583,12 @@ public sealed class ScsiInfo
                         ulong l1Video = totalSize - l0Video + 1;
 
                         // Get game partition size
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_game_partition_size);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_game_partition_size);
                         sense = dev.KreonUnlockXtreme(out senseBuf, dev.Timeout, out _);
 
                         if(sense)
                         {
-                            AaruConsole.ErrorWriteLine(Localization.Core.Cannot_unlock_drive_not_continuing);
+                            AaruConsole.Error(Localization.Core.Cannot_unlock_drive_not_continuing);
 
                             break;
                         }
@@ -1597,7 +1597,7 @@ public sealed class ScsiInfo
 
                         if(sense)
                         {
-                            AaruConsole.ErrorWriteLine(Localization.Core.Cannot_get_disc_capacity);
+                            AaruConsole.Error(Localization.Core.Cannot_get_disc_capacity);
 
                             return;
                         }
@@ -1607,17 +1607,17 @@ public sealed class ScsiInfo
                              0xFFFFFFFF) +
                             1;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.Game_partition_total_size_0_sectors,
                                                    gameSize);
 
                         // Get middle zone size
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Getting_middle_zone_size);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Core.Getting_middle_zone_size);
                         sense = dev.KreonUnlockWxripper(out senseBuf, dev.Timeout, out _);
 
                         if(sense)
                         {
-                            AaruConsole.ErrorWriteLine(Localization.Core.Cannot_unlock_drive_not_continuing);
+                            AaruConsole.Error(Localization.Core.Cannot_unlock_drive_not_continuing);
 
                             break;
                         }
@@ -1626,7 +1626,7 @@ public sealed class ScsiInfo
 
                         if(sense)
                         {
-                            AaruConsole.ErrorWriteLine(Localization.Core.Cannot_get_disc_capacity);
+                            AaruConsole.Error(Localization.Core.Cannot_get_disc_capacity);
 
                             break;
                         }
@@ -1646,12 +1646,12 @@ public sealed class ScsiInfo
 
                         if(sense)
                         {
-                            AaruConsole.ErrorWriteLine(Localization.Core.Cannot_get_PFI);
+                            AaruConsole.Error(Localization.Core.Cannot_get_PFI);
 
                             break;
                         }
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.Unlocked_total_size_0_sectors,
                                                    totalSize);
 
@@ -1711,7 +1711,7 @@ public sealed class ScsiInfo
 
         if(sense)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Core.READ_DISC_INFORMATION_000b_0,
                                        Sense.PrettifySense(senseBuf));
         }
diff --git a/Aaru.Core/Partitions.cs b/Aaru.Core/Partitions.cs
index 4ddc83cf9..c9e1b40bc 100644
--- a/Aaru.Core/Partitions.cs
+++ b/Aaru.Core/Partitions.cs
@@ -70,7 +70,7 @@ public static class Partitions
 
                     foundPartitions.AddRange(partitions);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.Found_0_at_1,
                                                plugin.Name,
                                                tapeFile.FirstBlock);
@@ -93,7 +93,7 @@ public static class Partitions
 
                     foundPartitions.AddRange(partitions);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.Found_0_at_1,
                                                plugin.Name,
                                                imagePartition.Start);
@@ -113,7 +113,7 @@ public static class Partitions
                 if(!plugin.GetInformation(image, out List<Partition> partitions, 0)) continue;
 
                 foundPartitions.AddRange(partitions);
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Found_0_at_zero, plugin.Name);
+                AaruConsole.Debug(MODULE_NAME, Localization.Core.Found_0_at_zero, plugin.Name);
             }
 
             checkedLocations.Add(0);
@@ -135,14 +135,14 @@ public static class Partitions
             {
                 if(plugin is null) continue;
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Core.Trying_0_at_1,
                                            plugin.Name,
                                            foundPartitions[0].Start);
 
                 if(!plugin.GetInformation(image, out List<Partition> partitions, foundPartitions[0].Start)) continue;
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Core.Found_0_at_1,
                                            plugin.Name,
                                            foundPartitions[0].Start);
@@ -152,7 +152,7 @@ public static class Partitions
 
             checkedLocations.Add(foundPartitions[0].Start);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Got_0_children, children.Count);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Got_0_children, children.Count);
 
             if(children.Count > 0)
             {
@@ -172,8 +172,8 @@ public static class Partitions
                 foundPartitions.RemoveAt(0);
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Got_0_parents,    foundPartitions.Count);
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Got_0_partitions, childPartitions.Count);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Got_0_parents,    foundPartitions.Count);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Got_0_partitions, childPartitions.Count);
         }
 
         // Be sure that device partitions are not excluded if not mapped by any scheme...
diff --git a/Aaru.Core/Remote.cs b/Aaru.Core/Remote.cs
index 2bbe287ba..7edd57045 100644
--- a/Aaru.Core/Remote.cs
+++ b/Aaru.Core/Remote.cs
@@ -179,7 +179,7 @@ public static class Remote
 
             if(!response.IsSuccessStatusCode)
             {
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_0_when_trying_to_get_updated_entities,
+                AaruConsole.Error(Localization.Core.Error_0_when_trying_to_get_updated_entities,
                                            response.StatusCode);
 
                 return;
@@ -584,8 +584,8 @@ public static class Remote
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(Localization.Core.Exception_0_when_updating_database, ex);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Localization.Core.Exception_0_when_updating_database, ex);
+            AaruConsole.Exception(ex);
         }
         finally
         {
diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs
index fcb96c4fd..83856ecbd 100644
--- a/Aaru.Core/Sidecar/BlockMedia.cs
+++ b/Aaru.Core/Sidecar/BlockMedia.cs
@@ -505,7 +505,7 @@ public sealed partial class Sidecar
 
                             if(errno != ErrorNumber.NoError)
                             {
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
+                                AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
                                                                          errno,
                                                                          tapePartition.FirstBlock + doneSectors));
 
@@ -525,7 +525,7 @@ public sealed partial class Sidecar
 
                             if(errno != ErrorNumber.NoError)
                             {
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
+                                AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
                                                                          errno,
                                                                          tapePartition.FirstBlock + doneSectors));
 
@@ -605,7 +605,7 @@ public sealed partial class Sidecar
 
                                 if(errno != ErrorNumber.NoError)
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
+                                    AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
                                                                              errno,
                                                                              tapeFile.FirstBlock + doneSectors));
 
@@ -628,7 +628,7 @@ public sealed partial class Sidecar
 
                                 if(errno != ErrorNumber.NoError)
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
+                                    AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
                                                                              errno,
                                                                              tapeFile.FirstBlock + doneSectors));
 
@@ -1046,7 +1046,7 @@ public sealed partial class Sidecar
                     }
                     else
                     {
-                        AaruConsole.ErrorWriteLine(Localization.Core
+                        AaruConsole.Error(Localization.Core
                                                                .SCP_image_do_not_same_number_tracks_0_disk_image_1_ignoring,
                                                    scpImage.Header.end + 1,
                                                    image.Info.Cylinders);
@@ -1054,7 +1054,7 @@ public sealed partial class Sidecar
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Core
+                    AaruConsole.Error(Localization.Core
                                                            .SCP_image_do_not_same_number_heads_0_disk_image_1_ignoring,
                                                2,
                                                image.Info.Heads);
@@ -1157,7 +1157,7 @@ public sealed partial class Sidecar
                     }
                     else
                     {
-                        AaruConsole.ErrorWriteLine(Localization.Core
+                        AaruConsole.Error(Localization.Core
                                                                .KryoFlux_image_do_not_same_number_tracks_0_disk_image_1_ignoring,
                                                    kfImage.Info.Cylinders,
                                                    image.Info.Cylinders);
@@ -1165,7 +1165,7 @@ public sealed partial class Sidecar
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Core
+                    AaruConsole.Error(Localization.Core
                                                            .KryoFlux_image_do_not_same_number_heads_0_disk_image_1_ignoring,
                                                kfImage.Info.Heads,
                                                image.Info.Heads);
@@ -1249,7 +1249,7 @@ public sealed partial class Sidecar
             }
             else
             {
-                AaruConsole.ErrorWriteLine(Localization.Core
+                AaruConsole.Error(Localization.Core
                                                        .DiscFerret_image_do_not_same_number_tracks_0_disk_image_1_ignoring,
                                            dfiImage.Info.Cylinders,
                                            image.Info.Cylinders);
@@ -1257,7 +1257,7 @@ public sealed partial class Sidecar
         }
         else
         {
-            AaruConsole.ErrorWriteLine(Localization.Core
+            AaruConsole.Error(Localization.Core
                                                    .DiscFerret_image_do_not_same_number_heads_0_disk_image_1_ignoring,
                                        dfiImage.Info.Heads,
                                        image.Info.Heads);
diff --git a/Aaru.Core/Sidecar/Files.cs b/Aaru.Core/Sidecar/Files.cs
index 02e53d5a9..6d1f501f8 100644
--- a/Aaru.Core/Sidecar/Files.cs
+++ b/Aaru.Core/Sidecar/Files.cs
@@ -62,7 +62,7 @@ public sealed partial class Sidecar
 
             if(ret != ErrorNumber.NoError)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Cannot_stat_0, dirent);
+                AaruConsole.Debug(MODULE_NAME, Localization.Core.Cannot_stat_0, dirent);
 
                 continue;
             }
@@ -118,7 +118,7 @@ public sealed partial class Sidecar
 
             if(ret != ErrorNumber.NoError)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Cannot_stat_0, dirent);
+                AaruConsole.Debug(MODULE_NAME, Localization.Core.Cannot_stat_0, dirent);
 
                 continue;
             }
diff --git a/Aaru.Core/Sidecar/Sidecar.cs b/Aaru.Core/Sidecar/Sidecar.cs
index f146f0209..90a15e703 100644
--- a/Aaru.Core/Sidecar/Sidecar.cs
+++ b/Aaru.Core/Sidecar/Sidecar.cs
@@ -147,10 +147,10 @@ public sealed partial class Sidecar
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Core
+                    AaruConsole.Error(Localization.Core
                                                            .The_specified_image_says_it_contains_an_optical_media_but_at_the_same_time_says_it_does_not_support_them);
 
-                    AaruConsole.ErrorWriteLine(Localization.Core.Please_open_an_issue_at_Github);
+                    AaruConsole.Error(Localization.Core.Please_open_an_issue_at_Github);
                 }
 
                 break;
@@ -159,10 +159,10 @@ public sealed partial class Sidecar
                     BlockMedia(blockImage, _filterId, _imagePath, _fi, _plugins, imgChecksums, ref _sidecar, _encoding);
                 else
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Core
+                    AaruConsole.Error(Localization.Core
                                                            .The_specified_image_says_it_contains_a_block_addressable_media_but_at_the_same_time_says_it_does_not_support_them);
 
-                    AaruConsole.ErrorWriteLine(Localization.Core.Please_open_an_issue_at_Github);
+                    AaruConsole.Error(Localization.Core.Please_open_an_issue_at_Github);
                 }
 
                 break;
@@ -180,10 +180,10 @@ public sealed partial class Sidecar
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Core
+                    AaruConsole.Error(Localization.Core
                                                            .The_specified_image_says_it_contains_a_byte_addressable_media_but_at_the_same_time_says_it_does_not_support_them);
 
-                    AaruConsole.ErrorWriteLine(Localization.Core.Please_open_an_issue_at_Github);
+                    AaruConsole.Error(Localization.Core.Please_open_an_issue_at_Github);
                 }
 
                 break;
diff --git a/Aaru.Core/Statistics.cs b/Aaru.Core/Statistics.cs
index e09be8495..43759e3f2 100644
--- a/Aaru.Core/Statistics.cs
+++ b/Aaru.Core/Statistics.cs
@@ -88,8 +88,8 @@ public static class Statistics
         }
         catch(SqliteException ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
+            AaruConsole.Exception(ex);
         }
     }
 
@@ -104,8 +104,8 @@ public static class Statistics
         }
         catch(SqliteException ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
+            AaruConsole.Exception(ex);
         }
 
         if(Settings.Settings.Current.Stats is { ShareStats: true }) await SubmitStatsAsync();
@@ -431,8 +431,8 @@ public static class Statistics
         }
         catch(SqliteException ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
+            AaruConsole.Exception(ex);
         }
     }
 
@@ -459,8 +459,8 @@ public static class Statistics
         }
         catch(SqliteException ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
+            AaruConsole.Exception(ex);
         }
     }
 
@@ -487,8 +487,8 @@ public static class Statistics
         }
         catch(SqliteException ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
+            AaruConsole.Exception(ex);
         }
     }
 
@@ -515,8 +515,8 @@ public static class Statistics
         }
         catch(SqliteException ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
+            AaruConsole.Exception(ex);
         }
     }
 
@@ -543,8 +543,8 @@ public static class Statistics
         }
         catch(SqliteException ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
+            AaruConsole.Exception(ex);
         }
     }
 
@@ -586,8 +586,8 @@ public static class Statistics
         }
         catch(SqliteException ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
+            AaruConsole.Exception(ex);
         }
     }
 
@@ -614,8 +614,8 @@ public static class Statistics
         }
         catch(SqliteException ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
+            AaruConsole.Exception(ex);
         }
     }
 
@@ -656,8 +656,8 @@ public static class Statistics
         }
         catch(SqliteException ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Core.Exception_while_trying_to_save_statistics);
+            AaruConsole.Exception(ex);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Decoders/Bluray/BCA.cs b/Aaru.Decoders/Bluray/BCA.cs
index 5b27be904..52167702e 100644
--- a/Aaru.Decoders/Bluray/BCA.cs
+++ b/Aaru.Decoders/Bluray/BCA.cs
@@ -87,7 +87,7 @@ public static class BCA
 
         if(BCAResponse.Length != 68)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Found_incorrect_Blu_ray_BCA_size_0_bytes,
                                        BCAResponse.Length);
 
diff --git a/Aaru.Decoders/Bluray/Cartridge.cs b/Aaru.Decoders/Bluray/Cartridge.cs
index 9c3d4b26c..13a2980f3 100644
--- a/Aaru.Decoders/Bluray/Cartridge.cs
+++ b/Aaru.Decoders/Bluray/Cartridge.cs
@@ -102,7 +102,7 @@ public static class Cartridge
 
         if(CSResponse.Length != 8)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Found_incorrect_Blu_ray_Cartridge_Status_size_0_bytes,
                                        CSResponse.Length);
 
diff --git a/Aaru.Decoders/Bluray/DDS.cs b/Aaru.Decoders/Bluray/DDS.cs
index 464411e1c..e9250af91 100644
--- a/Aaru.Decoders/Bluray/DDS.cs
+++ b/Aaru.Decoders/Bluray/DDS.cs
@@ -143,7 +143,7 @@ public static class DDS
 
         if(decoded.Signature != DDSIdentifier)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_incorrect_DDS_signature_0, decoded.Signature);
+            AaruConsole.Debug(MODULE_NAME, Localization.Found_incorrect_DDS_signature_0, decoded.Signature);
 
             return null;
         }
diff --git a/Aaru.Decoders/Bluray/DI.cs b/Aaru.Decoders/Bluray/DI.cs
index fa83785e7..5e38c3ea3 100644
--- a/Aaru.Decoders/Bluray/DI.cs
+++ b/Aaru.Decoders/Bluray/DI.cs
@@ -119,7 +119,7 @@ public static class DI
 
         if(DIResponse.Length != 4100)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Found_incorrect_Blu_ray_Disc_Information_size_0_bytes,
                                        DIResponse.Length);
 
@@ -214,7 +214,7 @@ public static class DI
 
                 default:
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_unknown_disc_type_identifier_0,
                                                Encoding.ASCII.GetString(unit.DiscTypeIdentifier));
 
diff --git a/Aaru.Decoders/Bluray/Spare.cs b/Aaru.Decoders/Bluray/Spare.cs
index 7d9cd5e48..079234e97 100644
--- a/Aaru.Decoders/Bluray/Spare.cs
+++ b/Aaru.Decoders/Bluray/Spare.cs
@@ -90,7 +90,7 @@ public static class Spare
 
         if(SAIResponse.Length != 16)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization
                                           .Spare_Decode_Found_incorrect_Blu_ray_Spare_Area_Information_size_0_bytes,
                                        SAIResponse.Length);
diff --git a/Aaru.Decoders/CD/ATIP.cs b/Aaru.Decoders/CD/ATIP.cs
index 44aa2c894..68de31d38 100644
--- a/Aaru.Decoders/CD/ATIP.cs
+++ b/Aaru.Decoders/CD/ATIP.cs
@@ -67,7 +67,7 @@ public static class ATIP
 
         if(CDATIPResponse.Length != 32 && CDATIPResponse.Length != 28)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization
                                           .Expected_CD_ATIP_size_32_bytes_is_not_received_size_0_bytes_not_decoding,
                                        CDATIPResponse.Length);
diff --git a/Aaru.Decoders/CD/CDTextOnLeadIn.cs b/Aaru.Decoders/CD/CDTextOnLeadIn.cs
index 8b59ec26d..932eb9e95 100644
--- a/Aaru.Decoders/CD/CDTextOnLeadIn.cs
+++ b/Aaru.Decoders/CD/CDTextOnLeadIn.cs
@@ -118,7 +118,7 @@ public static class CDTextOnLeadIn
 
         if(decoded.DataLength + 2 != CDTextResponse.Length)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization
                                           .Expected_CD_TEXT_size_0_bytes_is_not_received_size_1_bytes_not_decoding,
                                        decoded.DataLength + 2,
diff --git a/Aaru.Decoders/CD/FullTOC.cs b/Aaru.Decoders/CD/FullTOC.cs
index 2cfa59bb2..2a68e74fd 100644
--- a/Aaru.Decoders/CD/FullTOC.cs
+++ b/Aaru.Decoders/CD/FullTOC.cs
@@ -78,7 +78,7 @@ public static class FullTOC
 
         if(decoded.DataLength + 2 != CDFullTOCResponse.Length)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization
                                           .Expected_CDFullTOC_size_0_bytes_is_not_received_size_1_bytes_not_decoding,
                                        decoded.DataLength + 2,
diff --git a/Aaru.Decoders/CD/PMA.cs b/Aaru.Decoders/CD/PMA.cs
index b5757094d..274d5254c 100644
--- a/Aaru.Decoders/CD/PMA.cs
+++ b/Aaru.Decoders/CD/PMA.cs
@@ -75,7 +75,7 @@ public static class PMA
 
         if(decoded.DataLength + 2 != CDPMAResponse.Length)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization
                                           .Expected_CD_PMA_size_0_bytes_is_not_received_size_1_bytes_not_decoding,
                                        decoded.DataLength + 2,
diff --git a/Aaru.Decoders/CD/Session.cs b/Aaru.Decoders/CD/Session.cs
index a0b1a416b..e4a97dd5e 100644
--- a/Aaru.Decoders/CD/Session.cs
+++ b/Aaru.Decoders/CD/Session.cs
@@ -71,7 +71,7 @@ public static class Session
 
         if(decoded.DataLength + 2 != CDSessionInfoResponse.Length)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization
                                           .Expected_CDSessionInfo_size_0_bytes_is_not_received_size_1_bytes_not_decoding,
                                        decoded.DataLength + 2,
diff --git a/Aaru.Decoders/CD/TOC.cs b/Aaru.Decoders/CD/TOC.cs
index 5f98e7071..57cc90ed4 100644
--- a/Aaru.Decoders/CD/TOC.cs
+++ b/Aaru.Decoders/CD/TOC.cs
@@ -74,7 +74,7 @@ public static class TOC
 
         if(decoded.DataLength + 2 != CDTOCResponse.Length)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization
                                           .Expected_CD_TOC_size_0_bytes_is_not_received_size_1_bytes_not_decoding,
                                        decoded.DataLength + 2,
diff --git a/Aaru.Decoders/Floppy/Apple2.cs b/Aaru.Decoders/Floppy/Apple2.cs
index 6b02b2f66..d7d149a91 100644
--- a/Aaru.Decoders/Floppy/Apple2.cs
+++ b/Aaru.Decoders/Floppy/Apple2.cs
@@ -265,7 +265,7 @@ public static class Apple2
                 // Prologue found
                 if(data[position] == 0xD5 && data[position + 1] == 0xAA)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Prologue_found_at_0, position);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Prologue_found_at_0, position);
 
                     // Epilogue not in correct position
                     if(data[position + 11] != 0xDE || data[position + 12] != 0xAA) return null;
@@ -283,31 +283,31 @@ public static class Apple2
                         }
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Volume_0,
                                                ((sector.addressField.volume[0] & 0x55) << 1 |
                                                 sector.addressField.volume[1] & 0x55) &
                                                0xFF);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Core.Track_0,
                                                ((sector.addressField.track[0] & 0x55) << 1 |
                                                 sector.addressField.track[1] & 0x55) &
                                                0xFF);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Sector_0,
                                                ((sector.addressField.sector[0] & 0x55) << 1 |
                                                 sector.addressField.sector[1] & 0x55) &
                                                0xFF);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Checksum_0,
                                                ((sector.addressField.checksum[0] & 0x55) << 1 |
                                                 sector.addressField.checksum[1] & 0x55) &
                                                0xFF);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Epilogue_0_1_2,
                                                sector.addressField.epilogue[0],
                                                sector.addressField.epilogue[1],
@@ -335,9 +335,9 @@ public static class Apple2
                     sector.innerGap  = gaps.ToArray();
                     sector.dataField = new RawDataField();
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Inner_gap_has_0_bytes, sector.innerGap.Length);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Inner_gap_has_0_bytes, sector.innerGap.Length);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Prologue_found_at_0, position);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Prologue_found_at_0, position);
                     sector.dataField.prologue    =  new byte[3];
                     sector.dataField.prologue[0] =  data[position];
                     sector.dataField.prologue[1] =  data[position + 1];
@@ -358,7 +358,7 @@ public static class Apple2
 
                     sector.dataField.data = gaps.ToArray();
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Data_has_0_bytes,
                                                sector.dataField.data.Length);
 
@@ -390,9 +390,9 @@ public static class Apple2
                     // Return current position to be able to read separate sectors
                     endOffset = position;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Got_0_bytes_of_gap, sector.gap.Length);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Got_0_bytes_of_gap, sector.gap.Length);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Finished_sector_at_0, position);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Finished_sector_at_0, position);
 
                     return sector;
                 }
@@ -495,7 +495,7 @@ public static class Apple2
                 break;
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Adding_sector_0_of_track_1,
                                        ((sector.addressField.sector[0] & 0x55) << 1 |
                                         sector.addressField.sector[1] & 0x55) &
diff --git a/Aaru.Decoders/Sega/CD.cs b/Aaru.Decoders/Sega/CD.cs
index ffccd7f3d..8e3365e9f 100644
--- a/Aaru.Decoders/Sega/CD.cs
+++ b/Aaru.Decoders/Sega/CD.cs
@@ -60,63 +60,63 @@ public static class CD
 
         IPBin ipbin = Marshal.ByteArrayToStructureLittleEndian<IPBin>(ipbin_sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "segacd_ipbin.volume_name = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.volume_name));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "segacd_ipbin.system_name = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.system_name));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.volume_version = \"{0:X}\"", ipbin.volume_version);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.volume_version = \"{0:X}\"", ipbin.volume_version);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.volume_type = 0x{0:X8}", ipbin.volume_type);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.volume_type = 0x{0:X8}", ipbin.volume_type);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.system_version = 0x{0:X8}", ipbin.system_version);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.system_version = 0x{0:X8}", ipbin.system_version);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.ip_address = 0x{0:X8}", ipbin.ip_address);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.ip_loadsize = {0}",     ipbin.ip_loadsize);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.ip_address = 0x{0:X8}", ipbin.ip_address);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.ip_loadsize = {0}",     ipbin.ip_loadsize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.ip_entry_address = 0x{0:X8}", ipbin.ip_entry_address);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.ip_entry_address = 0x{0:X8}", ipbin.ip_entry_address);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.ip_work_ram_size = {0}", ipbin.ip_work_ram_size);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.ip_work_ram_size = {0}", ipbin.ip_work_ram_size);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.sp_address = 0x{0:X8}", ipbin.sp_address);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.sp_loadsize = {0}",     ipbin.sp_loadsize);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.sp_address = 0x{0:X8}", ipbin.sp_address);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.sp_loadsize = {0}",     ipbin.sp_loadsize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.sp_entry_address = 0x{0:X8}", ipbin.sp_entry_address);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.sp_entry_address = 0x{0:X8}", ipbin.sp_entry_address);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "segacd_ipbin.sp_work_ram_size = {0}", ipbin.sp_work_ram_size);
+        AaruConsole.Debug(MODULE_NAME, "segacd_ipbin.sp_work_ram_size = {0}", ipbin.sp_work_ram_size);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "segacd_ipbin.release_date = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.release_date));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "segacd_ipbin.release_date2 = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.release_date2));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "segacd_ipbin.developer_code = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.developer_code));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "segacd_ipbin.domestic_title = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.domestic_title));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "segacd_ipbin.overseas_title = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.overseas_title));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "segacd_ipbin.product_code = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.product_code));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "segacd_ipbin.peripherals = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.peripherals));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "segacd_ipbin.region_codes = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.region_codes));
 
diff --git a/Aaru.Decoders/Sega/Dreamcast.cs b/Aaru.Decoders/Sega/Dreamcast.cs
index 1a2de102a..5b9652155 100644
--- a/Aaru.Decoders/Sega/Dreamcast.cs
+++ b/Aaru.Decoders/Sega/Dreamcast.cs
@@ -59,59 +59,59 @@ public static class Dreamcast
 
         IPBin ipbin = Marshal.ByteArrayToStructureLittleEndian<IPBin>(ipbin_sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.maker_id = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.maker_id));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dreamcast_ipbin.spare_space1 = \"{0}\"", (char)ipbin.spare_space1);
+        AaruConsole.Debug(MODULE_NAME, "dreamcast_ipbin.spare_space1 = \"{0}\"", (char)ipbin.spare_space1);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.dreamcast_media = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.dreamcast_media));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dreamcast_ipbin.disc_no = {0}", (char)ipbin.disc_no);
+        AaruConsole.Debug(MODULE_NAME, "dreamcast_ipbin.disc_no = {0}", (char)ipbin.disc_no);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.disc_no_separator = \"{0}\"",
                                    (char)ipbin.disc_no_separator);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dreamcast_ipbin.disc_total_nos = \"{0}\"", (char)ipbin.disc_total_nos);
+        AaruConsole.Debug(MODULE_NAME, "dreamcast_ipbin.disc_total_nos = \"{0}\"", (char)ipbin.disc_total_nos);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.spare_space2 = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.spare_space2));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.region_codes = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.region_codes));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.peripherals = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.peripherals));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.product_no = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.product_no));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.product_version = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.product_version));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.release_date = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.release_date));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dreamcast_ipbin.spare_space3 = \"{0}\"", (char)ipbin.spare_space3);
+        AaruConsole.Debug(MODULE_NAME, "dreamcast_ipbin.spare_space3 = \"{0}\"", (char)ipbin.spare_space3);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.boot_filename = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.boot_filename));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.producer = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.producer));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dreamcast_ipbin.product_name = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.product_name));
 
diff --git a/Aaru.Decoders/Sega/Saturn.cs b/Aaru.Decoders/Sega/Saturn.cs
index cae70b342..d477cff77 100644
--- a/Aaru.Decoders/Sega/Saturn.cs
+++ b/Aaru.Decoders/Sega/Saturn.cs
@@ -59,51 +59,51 @@ public static class Saturn
 
         IPBin ipbin = Marshal.ByteArrayToStructureLittleEndian<IPBin>(ipbin_sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.maker_id = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.maker_id));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.product_no = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.product_no));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.product_version = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.product_version));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.release_date = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.release_date));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.saturn_media = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.saturn_media));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "saturn_ipbin.disc_no = {0}", (char)ipbin.disc_no);
+        AaruConsole.Debug(MODULE_NAME, "saturn_ipbin.disc_no = {0}", (char)ipbin.disc_no);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.disc_no_separator = \"{0}\"",
                                    (char)ipbin.disc_no_separator);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "saturn_ipbin.disc_total_nos = {0}", (char)ipbin.disc_total_nos);
+        AaruConsole.Debug(MODULE_NAME, "saturn_ipbin.disc_total_nos = {0}", (char)ipbin.disc_total_nos);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.release_date = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.release_date));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.spare_space1 = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.spare_space1));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.region_codes = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.region_codes));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.peripherals = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.peripherals));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "saturn_ipbin.product_name = \"{0}\"",
                                    Encoding.ASCII.GetString(ipbin.product_name));
 
diff --git a/Aaru.Decryption/DVD/Dump.cs b/Aaru.Decryption/DVD/Dump.cs
index ae488b0cb..617300e3b 100644
--- a/Aaru.Decryption/DVD/Dump.cs
+++ b/Aaru.Decryption/DVD/Dump.cs
@@ -73,7 +73,7 @@ public sealed class Dump(Device dev)
 
         dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.REPORT_ASF_AGID_1_Sense_2_Last_Error_3_took_0_ms,
                                    duration,
                                    Agid,
@@ -105,7 +105,7 @@ public sealed class Dump(Device dev)
 
         dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.REPORT_ASF_AGID_1_Sense_2_Last_Error_3_took_0_ms,
                                    duration,
                                    Agid,
@@ -137,7 +137,7 @@ public sealed class Dump(Device dev)
 
         dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.INVALIDATE_AGID_AGID_1_Sense_2_Last_Error_3_took_0_ms,
                                    duration,
                                    Agid,
@@ -169,7 +169,7 @@ public sealed class Dump(Device dev)
 
         dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.REPORT_AGID_CSS_CPPM_AGID_1_Sense_2_Last_Error_3_took_0_ms,
                                    duration,
                                    Agid,
@@ -201,7 +201,7 @@ public sealed class Dump(Device dev)
 
         dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.REPORT_KEY1_AGID_1_Sense_2_Last_Error_3_took_0_ms,
                                    duration,
                                    Agid,
@@ -233,7 +233,7 @@ public sealed class Dump(Device dev)
 
         dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.REPORT_CHALLENGE_AGID_1_Sense_2_Last_Error_3_took_0_ms,
                                    duration,
                                    Agid,
@@ -278,7 +278,7 @@ public sealed class Dump(Device dev)
 
         dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration, out bool sense);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.SEND_CHALLENGE_AGID_1_Challenge_2_Sense_3_Last_Error_4_took_0_ms,
                                    duration,
                                    Agid,
@@ -319,7 +319,7 @@ public sealed class Dump(Device dev)
 
         dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration, out bool sense);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.SEND_CHALLENGE_AGID_1_KEY2_2_Sense_3_Last_Error_4_took_0_ms,
                                    duration,
                                    Agid,
@@ -493,7 +493,7 @@ public sealed class Dump(Device dev)
 
         dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.GET_TITLE_KEY_AGID_1_LBA_2_Sense_3_took_0_ms,
                                    duration,
                                    Agid,
diff --git a/Aaru.Devices/Device/AtaCommands/Ata28.cs b/Aaru.Devices/Device/AtaCommands/Ata28.cs
index 7492581c9..a7332f6fc 100644
--- a/Aaru.Devices/Device/AtaCommands/Ata28.cs
+++ b/Aaru.Devices/Device/AtaCommands/Ata28.cs
@@ -67,7 +67,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_BUFFER_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_BUFFER_took_0_ms, duration);
 
         return sense;
     }
@@ -100,7 +100,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_BUFFER_DMA_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_BUFFER_DMA_took_0_ms, duration);
 
         return sense;
     }
@@ -155,7 +155,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_DMA_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_DMA_took_0_ms, duration);
 
         return sense;
     }
@@ -200,7 +200,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_MULTIPLE_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_MULTIPLE_took_0_ms, duration);
 
         return sense;
     }
@@ -245,7 +245,7 @@ public partial class Device
             lba += statusRegisters.LbaLow;
         }
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_NATIVE_MAX_ADDRESS_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_NATIVE_MAX_ADDRESS_took_0_ms, duration);
 
         return sense;
     }
@@ -300,7 +300,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_SECTORS_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_SECTORS_took_0_ms, duration);
 
         return sense;
     }
@@ -355,7 +355,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_LONG_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_LONG_took_0_ms, duration);
 
         return sense;
     }
@@ -393,7 +393,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SEEK_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SEEK_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/AtaCommands/Ata48.cs b/Aaru.Devices/Device/AtaCommands/Ata48.cs
index e11a09754..fd660c50b 100644
--- a/Aaru.Devices/Device/AtaCommands/Ata48.cs
+++ b/Aaru.Devices/Device/AtaCommands/Ata48.cs
@@ -80,7 +80,7 @@ public partial class Device
                            statusRegisters.LbaLowPrevious);
         }
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.GET_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.GET_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration);
 
         return sense;
     }
@@ -124,7 +124,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_DMA_EXT_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_DMA_EXT_took_0_ms, duration);
 
         return sense;
     }
@@ -164,7 +164,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_LOG_EXT_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_LOG_EXT_took_0_ms, duration);
 
         return sense;
     }
@@ -204,7 +204,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_LOG_DMA_EXT_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_LOG_DMA_EXT_took_0_ms, duration);
 
         return sense;
     }
@@ -251,7 +251,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_MULTIPLE_EXT_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_MULTIPLE_EXT_took_0_ms, duration);
 
         return sense;
     }
@@ -300,7 +300,7 @@ public partial class Device
                            statusRegisters.LbaLowPrevious);
         }
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_NATIVE_MAX_ADDRESS_EXT_took_0_ms, duration);
 
         return sense;
     }
@@ -344,7 +344,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_SECTORS_EXT_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_SECTORS_EXT_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/AtaCommands/AtaCHS.cs b/Aaru.Devices/Device/AtaCommands/AtaCHS.cs
index 7c8d5911f..2a1201325 100644
--- a/Aaru.Devices/Device/AtaCommands/AtaCHS.cs
+++ b/Aaru.Devices/Device/AtaCommands/AtaCHS.cs
@@ -94,7 +94,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, "IDENTIFY DEVICE took {0} ms.", duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, "IDENTIFY DEVICE took {0} ms.", duration);
 
         return sense;
     }
@@ -151,7 +151,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_DMA_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_DMA_took_0_ms, duration);
 
         return sense;
     }
@@ -196,7 +196,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_MULTIPLE_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_MULTIPLE_took_0_ms, duration);
 
         return sense;
     }
@@ -253,7 +253,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_SECTORS_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_SECTORS_took_0_ms, duration);
 
         return sense;
     }
@@ -310,7 +310,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.READ_LONG_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.READ_LONG_took_0_ms, duration);
 
         return sense;
     }
@@ -349,7 +349,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SEEK_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SEEK_took_0_ms, duration);
 
         return sense;
     }
@@ -402,7 +402,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SET_FEATURES_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SET_FEATURES_took_0_ms, duration);
 
         return sense;
     }
@@ -433,7 +433,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.DOOR_LOCK_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.DOOR_LOCK_took_0_ms, duration);
 
         return sense;
     }
@@ -464,7 +464,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.DOOR_UNLOCK_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.DOOR_UNLOCK_took_0_ms, duration);
 
         return sense;
     }
@@ -495,7 +495,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.MEDIA_EJECT_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.MEDIA_EJECT_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/AtaCommands/Atapi.cs b/Aaru.Devices/Device/AtaCommands/Atapi.cs
index 5fb7ad8de..dc62e7773 100644
--- a/Aaru.Devices/Device/AtaCommands/Atapi.cs
+++ b/Aaru.Devices/Device/AtaCommands/Atapi.cs
@@ -89,7 +89,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.IDENTIFY_PACKET_DEVICE_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.IDENTIFY_PACKET_DEVICE_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/AtaCommands/Cfa.cs b/Aaru.Devices/Device/AtaCommands/Cfa.cs
index 35f2e178b..e1d65e1a7 100644
--- a/Aaru.Devices/Device/AtaCommands/Cfa.cs
+++ b/Aaru.Devices/Device/AtaCommands/Cfa.cs
@@ -72,7 +72,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration);
 
         return sense;
     }
@@ -112,7 +112,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.CFA_TRANSLATE_SECTOR_took_0_ms, duration);
 
         return sense;
     }
@@ -147,7 +147,7 @@ public partial class Device
 
         errorCode = statusRegisters.Error;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.CFA_REQUEST_EXTENDED_ERROR_CODE_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.CFA_REQUEST_EXTENDED_ERROR_CODE_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/AtaCommands/MCPT.cs b/Aaru.Devices/Device/AtaCommands/MCPT.cs
index 05445ef60..f34e618bf 100644
--- a/Aaru.Devices/Device/AtaCommands/MCPT.cs
+++ b/Aaru.Devices/Device/AtaCommands/MCPT.cs
@@ -90,7 +90,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.CHECK_MEDIA_CARD_TYPE_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.CHECK_MEDIA_CARD_TYPE_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/AtaCommands/Smart.cs b/Aaru.Devices/Device/AtaCommands/Smart.cs
index 5789a2f62..3ab656256 100644
--- a/Aaru.Devices/Device/AtaCommands/Smart.cs
+++ b/Aaru.Devices/Device/AtaCommands/Smart.cs
@@ -66,7 +66,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_DISABLE_OPERATIONS_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_DISABLE_OPERATIONS_took_0_ms, duration);
 
         return sense;
     }
@@ -102,7 +102,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_ENABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_ENABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration);
 
         return sense;
     }
@@ -137,7 +137,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_DISABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_DISABLE_ATTRIBUTE_AUTOSAVE_took_0_ms, duration);
 
         return sense;
     }
@@ -171,7 +171,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_ENABLE_OPERATIONS_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_ENABLE_OPERATIONS_took_0_ms, duration);
 
         return sense;
     }
@@ -208,7 +208,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_EXECUTE_OFF_LINE_IMMEDIATE_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_EXECUTE_OFF_LINE_IMMEDIATE_took_0_ms, duration);
 
         return sense;
     }
@@ -244,7 +244,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_READ_DATA_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_READ_DATA_took_0_ms, duration);
 
         return sense;
     }
@@ -282,7 +282,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_READ_LOG_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_READ_LOG_took_0_ms, duration);
 
         return sense;
     }
@@ -316,7 +316,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(ATA_MODULE_NAME, Localization.SMART_RETURN_STATUS_took_0_ms, duration);
+        AaruConsole.Debug(ATA_MODULE_NAME, Localization.SMART_RETURN_STATUS_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/List.cs b/Aaru.Devices/Device/List.cs
index 228a2caad..b86a1ea12 100644
--- a/Aaru.Devices/Device/List.cs
+++ b/Aaru.Devices/Device/List.cs
@@ -116,7 +116,7 @@ public partial class Device
 
             if(aaruUri.Scheme != "aaru" && aaruUri.Scheme != "dic")
             {
-                AaruConsole.ErrorWriteLine(Localization.Invalid_remote_URI);
+                AaruConsole.Error(Localization.Invalid_remote_URI);
 
                 return [];
             }
@@ -134,7 +134,7 @@ public partial class Device
         }
         catch(Exception)
         {
-            AaruConsole.ErrorWriteLine(Localization.Error_connecting_to_host);
+            AaruConsole.Error(Localization.Error_connecting_to_host);
 
             return [];
         }
diff --git a/Aaru.Devices/Device/MmcCommands/MMC.cs b/Aaru.Devices/Device/MmcCommands/MMC.cs
index b8cb07a5d..ec892da0f 100644
--- a/Aaru.Devices/Device/MmcCommands/MMC.cs
+++ b/Aaru.Devices/Device/MmcCommands/MMC.cs
@@ -68,7 +68,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SEND_CSD_took_0_ms, duration);
+        AaruConsole.Debug(MMC_MODULE_NAME, Localization.SEND_CSD_took_0_ms, duration);
 
         return sense;
     }
@@ -98,7 +98,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SEND_CID_took_0_ms, duration);
+        AaruConsole.Debug(MMC_MODULE_NAME, Localization.SEND_CID_took_0_ms, duration);
 
         return sense;
     }
@@ -128,7 +128,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SEND_OP_COND_took_0_ms, duration);
+        AaruConsole.Debug(MMC_MODULE_NAME, Localization.SEND_OP_COND_took_0_ms, duration);
 
         return sense;
     }
@@ -158,7 +158,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SEND_EXT_CSD_took_0_ms, duration);
+        AaruConsole.Debug(MMC_MODULE_NAME, Localization.SEND_EXT_CSD_took_0_ms, duration);
 
         return sense;
     }
@@ -188,7 +188,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SET_BLOCKLEN_took_0_ms, duration);
+        AaruConsole.Debug(MMC_MODULE_NAME, Localization.SET_BLOCKLEN_took_0_ms, duration);
 
         return sense;
     }
@@ -277,7 +277,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.READ_SINGLE_BLOCK_took_0_ms, duration);
+        AaruConsole.Debug(MMC_MODULE_NAME, Localization.READ_SINGLE_BLOCK_took_0_ms, duration);
 
         return sense;
     }
@@ -319,7 +319,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(MMC_MODULE_NAME,
+        AaruConsole.Debug(MMC_MODULE_NAME,
                                    transferLength > 1
                                        ? Localization.READ_MULTIPLE_BLOCK_took_0_ms
                                        : Localization.READ_SINGLE_BLOCK_took_0_ms,
@@ -378,7 +378,7 @@ public partial class Device
             Array.Copy(blockBuffer, 0, buffer, i * blockSize, blockSize);
         }
 
-        AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.Multiple_READ_SINGLE_BLOCKs_took_0_ms, duration);
+        AaruConsole.Debug(MMC_MODULE_NAME, Localization.Multiple_READ_SINGLE_BLOCKs_took_0_ms, duration);
 
         return sense;
     }
@@ -408,7 +408,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.SEND_STATUS_took_0_ms, duration);
+        AaruConsole.Debug(MMC_MODULE_NAME, Localization.SEND_STATUS_took_0_ms, duration);
 
         return sense;
     }
@@ -473,7 +473,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(MMC_MODULE_NAME, Localization.READ_MULTIPLE_BLOCK_took_0_ms, duration);
+        AaruConsole.Debug(MMC_MODULE_NAME, Localization.READ_MULTIPLE_BLOCK_took_0_ms, duration);
 
         buffer   = commands[1].buffer;
         response = commands[1].response;
diff --git a/Aaru.Devices/Device/MmcCommands/SecureDigital.cs b/Aaru.Devices/Device/MmcCommands/SecureDigital.cs
index 3102aa71a..7567dda5e 100644
--- a/Aaru.Devices/Device/MmcCommands/SecureDigital.cs
+++ b/Aaru.Devices/Device/MmcCommands/SecureDigital.cs
@@ -61,7 +61,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SD_MODULE_NAME, Localization.SD_STATUS_took_0_ms, duration);
+        AaruConsole.Debug(SD_MODULE_NAME, Localization.SD_STATUS_took_0_ms, duration);
 
         return sense;
     }
@@ -91,7 +91,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SD_MODULE_NAME, Localization.SD_SEND_OP_COND_took_0_ms, duration);
+        AaruConsole.Debug(SD_MODULE_NAME, Localization.SD_SEND_OP_COND_took_0_ms, duration);
 
         return sense;
     }
@@ -121,7 +121,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SD_MODULE_NAME, Localization.SEND_SCR_took_0_ms, duration);
+        AaruConsole.Debug(SD_MODULE_NAME, Localization.SEND_SCR_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/Adaptec.cs b/Aaru.Devices/Device/ScsiCommands/Adaptec.cs
index e7a91f986..b286e1b73 100644
--- a/Aaru.Devices/Device/ScsiCommands/Adaptec.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Adaptec.cs
@@ -81,7 +81,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ADAPTEC_TRANSLATE_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_TRANSLATE_took_0_ms, duration);
 
         return sense;
     }
@@ -126,7 +126,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ADAPTEC_SET_ERROR_THRESHOLD_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_SET_ERROR_THRESHOLD_took_0_ms, duration);
 
         return sense;
     }
@@ -168,7 +168,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ADAPTEC_READ_RESET_USAGE_COUNTER_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_READ_RESET_USAGE_COUNTER_took_0_ms, duration);
 
         return sense;
     }
@@ -198,7 +198,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ADAPTEC_WRITE_DATA_BUFFER_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_WRITE_DATA_BUFFER_took_0_ms, duration);
 
         return sense;
     }
@@ -226,7 +226,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ADAPTEC_READ_DATA_BUFFER_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ADAPTEC_READ_DATA_BUFFER_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs b/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs
index df1930583..72d2bfe55 100644
--- a/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs
+++ b/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs
@@ -67,7 +67,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization.ARCHIVE_CORP_REQUEST_BLOCK_ADDRESS_took_0_ms,
                                    duration);
 
@@ -112,7 +112,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.ARCHIVE_CORP_SEEK_BLOCK_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.ARCHIVE_CORP_SEEK_BLOCK_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/Certance.cs b/Aaru.Devices/Device/ScsiCommands/Certance.cs
index 82712e135..26ccb5493 100644
--- a/Aaru.Devices/Device/ScsiCommands/Certance.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Certance.cs
@@ -77,7 +77,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.CERTANCE_PARK_UNPARK_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.CERTANCE_PARK_UNPARK_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
index eae90c75f..d15e2e540 100644
--- a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
@@ -107,7 +107,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.FUJITSU_DISPLAY_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.FUJITSU_DISPLAY_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs b/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs
index b80558dfe..9b89f0a88 100644
--- a/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs
+++ b/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs
@@ -87,7 +87,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.HL_DT_ST_READ_DVD_RAW_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.HL_DT_ST_READ_DVD_RAW_took_0_ms, duration);
 
         if(!CheckSectorNumber(buffer, lba, transferLength, layerbreak, otp)) return true;
 
diff --git a/Aaru.Devices/Device/ScsiCommands/HP.cs b/Aaru.Devices/Device/ScsiCommands/HP.cs
index ee8c5b725..223e00a8d 100644
--- a/Aaru.Devices/Device/ScsiCommands/HP.cs
+++ b/Aaru.Devices/Device/ScsiCommands/HP.cs
@@ -100,7 +100,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.HP_READ_LONG_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.HP_READ_LONG_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/Kreon.cs b/Aaru.Devices/Device/ScsiCommands/Kreon.cs
index 63dc944ba..e2d184916 100644
--- a/Aaru.Devices/Device/ScsiCommands/Kreon.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Kreon.cs
@@ -63,7 +63,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.KREON_DEPRECATED_UNLOCK_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.KREON_DEPRECATED_UNLOCK_took_0_ms, duration);
 
         return sense;
     }
@@ -120,7 +120,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.KREON_SET_LOCK_STATE_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.KREON_SET_LOCK_STATE_took_0_ms, duration);
 
         return sense || Error;
     }
@@ -154,7 +154,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.KREON_GET_FEATURE_LIST_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.KREON_GET_FEATURE_LIST_took_0_ms, duration);
 
         if(sense) return true;
 
@@ -251,7 +251,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.KREON_EXTRACT_SS_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.KREON_EXTRACT_SS_took_0_ms, duration);
 
         return sense || Error;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/LiteOn.cs b/Aaru.Devices/Device/ScsiCommands/LiteOn.cs
index 6db3b6eb5..11859bb90 100644
--- a/Aaru.Devices/Device/ScsiCommands/LiteOn.cs
+++ b/Aaru.Devices/Device/ScsiCommands/LiteOn.cs
@@ -91,7 +91,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.LiteOn_READ_DVD_RAW_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.LiteOn_READ_DVD_RAW_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/MMC.cs b/Aaru.Devices/Device/ScsiCommands/MMC.cs
index 524525ae1..35bccc171 100644
--- a/Aaru.Devices/Device/ScsiCommands/MMC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/MMC.cs
@@ -118,7 +118,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization
                                       .GET_CONFIGURATION_Starting_Feature_Number_1_Return_Type_2_Sense_3_Last_Error_4_took_0_ms,
                                    duration,
@@ -205,7 +205,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization
                                       .READ_DISC_STRUCTURE_Media_Type_1_Address_2_Layer_Number_3_Format_4_AGID_5_Sense_6_Last_Error_7_took_0_ms,
                                    duration,
@@ -343,7 +343,7 @@ public partial class Device
         {
             Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length);
 
-            AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+            AaruConsole.Debug(SCSI_MODULE_NAME,
                                        Localization
                                           .READ_TOC_PMA_ATIP_took_MSF_1_Format_2_Track_Session_Number_3_Sense_4_LastError_5_0_ms,
                                        duration,
@@ -370,7 +370,7 @@ public partial class Device
 
         duration += tmpDuration;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization
                                       .READ_TOC_PMA_ATIP_took_MSF_1_Format_2_Track_Session_Number_3_Sense_4_LastError_5_0_ms,
                                    duration,
@@ -432,7 +432,7 @@ public partial class Device
         buffer = new byte[strctLength];
         Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length);
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization.READ_DISC_INFORMATION_Data_Type_1_Sense_2_Last_Error_3_took_0_ms,
                                    duration,
                                    dataType,
@@ -505,7 +505,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization
                                       .READ_CD_LBA_1_Block_Size_2_Transfer_Length_3_Expected_Sector_Type_4_DAP_5_Relative_Address_6_Sync_7_Headers_8_User_Data_9_ECC_EDC_10_C2_11_Subchannel_12_Sense_13_Last_Error_14_took_0_ms,
                                    duration,
@@ -588,7 +588,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization
                                       .READ_CD_MSF_Start_MSF_1_End_MSF_2_Block_Size_3_Expected_Sector_Type_4_DAP_5_Sync_6_Headers_7_User_Data_8_ECC_EDC_9_C2_10_Subchannel_11_Sense_12_LastError_13_took_0_ms,
                                    duration,
@@ -655,7 +655,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization
                                       .PREVENT_ALLOW_MEDIUM_REMOVAL_Persistent_1_Prevent_2_Sense_3_LastError_4_took_0_ms,
                                    duration,
@@ -745,7 +745,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization
                                       .START_STOP_UNIT_Immediate_1_FormatLayer_2_Power_Conditions_3_Change_Format_Layer_4_Load_Eject_5_Start_6_Sense_7_Last_Error_8_took_0_ms,
                                    duration,
@@ -794,7 +794,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization.READ_READ_SUB_CHANNEL_MCN_Sense_1_Last_Error_2_took_0_ms,
                                    duration,
                                    sense,
@@ -841,7 +841,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization
                                       .READ_READ_SUB_CHANNEL_ISRC_Track_Number_1_Sense_2_Last_Error_3_took_0_ms,
                                    duration,
@@ -886,7 +886,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization
                                       .SET_CD_SPEED_Rotational_Control_1_Read_Speed_2_Write_Speed_3_Sense_4_Last_Error_5_took_0_ms,
                                    duration,
@@ -936,7 +936,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization.READ_TRACK_INFORMATION_Data_Type_1_Sense_2_Last_Error_3_took_0_ms,
                                    duration,
                                    type,
diff --git a/Aaru.Devices/Device/ScsiCommands/MediaTek.cs b/Aaru.Devices/Device/ScsiCommands/MediaTek.cs
index 1536ce320..1decdd336 100644
--- a/Aaru.Devices/Device/ScsiCommands/MediaTek.cs
+++ b/Aaru.Devices/Device/ScsiCommands/MediaTek.cs
@@ -72,7 +72,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MediaTek_READ_DRAM_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MediaTek_READ_DRAM_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs b/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs
index 245df33a4..c74f5da1b 100644
--- a/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs
+++ b/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs
@@ -69,7 +69,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_READ_DTOC_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_READ_DTOC_took_0_ms, duration);
 
         return sense;
     }
@@ -109,7 +109,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_READ_UTOC_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_READ_UTOC_took_0_ms, duration);
 
         return sense;
     }
@@ -143,7 +143,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_command_D5h_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_command_D5h_took_0_ms, duration);
 
         return sense;
     }
@@ -173,7 +173,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_STOP_PLAY_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_STOP_PLAY_took_0_ms, duration);
 
         return sense;
     }
@@ -207,7 +207,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_READ_POSITION_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_READ_POSITION_took_0_ms, duration);
 
         return sense;
     }
@@ -241,7 +241,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MINIDISC_GET_TYPE_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MINIDISC_GET_TYPE_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/NEC.cs b/Aaru.Devices/Device/ScsiCommands/NEC.cs
index 45f3f298c..f9fd1a8d1 100644
--- a/Aaru.Devices/Device/ScsiCommands/NEC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/NEC.cs
@@ -70,7 +70,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.NEC_READ_CD_DA_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.NEC_READ_CD_DA_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/Optical.cs b/Aaru.Devices/Device/ScsiCommands/Optical.cs
index 148edc230..a07c22a99 100644
--- a/Aaru.Devices/Device/ScsiCommands/Optical.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Optical.cs
@@ -108,7 +108,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MEDIUM_SCAN_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MEDIUM_SCAN_took_0_ms, duration);
 
         if(Error) return sense;
 
diff --git a/Aaru.Devices/Device/ScsiCommands/Pioneer.cs b/Aaru.Devices/Device/ScsiCommands/Pioneer.cs
index c4f44e1bb..d415d2170 100644
--- a/Aaru.Devices/Device/ScsiCommands/Pioneer.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Pioneer.cs
@@ -74,7 +74,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_DA_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_DA_took_0_ms, duration);
 
         return sense;
     }
@@ -117,7 +117,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_DA_MSF_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_DA_MSF_took_0_ms, duration);
 
         return sense;
     }
@@ -176,7 +176,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_XA_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PIONEER_READ_CD_XA_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/Plasmon.cs b/Aaru.Devices/Device/ScsiCommands/Plasmon.cs
index 85725bfdd..a561afbf9 100644
--- a/Aaru.Devices/Device/ScsiCommands/Plasmon.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Plasmon.cs
@@ -114,7 +114,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLASMON_READ_SECTOR_LOCATION_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLASMON_READ_SECTOR_LOCATION_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/Plextor.cs b/Aaru.Devices/Device/ScsiCommands/Plextor.cs
index 7fb29044a..45ccd2a12 100644
--- a/Aaru.Devices/Device/ScsiCommands/Plextor.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Plextor.cs
@@ -76,7 +76,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization
                                       .Plextor_READ_CD_DA_LBA_1_Block_Size_2_Transfer_Length_3_Subchannel_4_Sense_5_Last_Error_6_took_0_ms,
                                    duration,
@@ -124,7 +124,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.Plextor_READ_DVD_RAW_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.Plextor_READ_DVD_RAW_took_0_ms, duration);
 
         return sense;
     }
@@ -154,7 +154,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
 
         return sense;
     }
@@ -184,7 +184,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
 
         return sense;
     }
@@ -220,7 +220,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_READ_EEPROM_took_0_ms, duration);
 
         return sense;
     }
@@ -257,7 +257,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration);
 
         if(sense || Error) return sense;
 
@@ -299,7 +299,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_POWEREC_GET_SPEEDS_took_0_ms, duration);
 
         if(sense || Error) return sense;
 
@@ -337,7 +337,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SILENT_MODE_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SILENT_MODE_took_0_ms, duration);
 
         return sense;
     }
@@ -369,7 +369,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_GIGAREC_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_GIGAREC_took_0_ms, duration);
 
         return sense;
     }
@@ -408,7 +408,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_VARIREC_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_VARIREC_took_0_ms, duration);
 
         return sense;
     }
@@ -439,7 +439,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SECUREC_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SECUREC_took_0_ms, duration);
 
         return sense;
     }
@@ -471,7 +471,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SPEEDREAD_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_SPEEDREAD_took_0_ms, duration);
 
         return sense;
     }
@@ -503,7 +503,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME,
+        AaruConsole.Debug(SCSI_MODULE_NAME,
                                    Localization.PLEXTOR_GET_SINGLE_SESSION_HIDE_CD_R_took_0_ms,
                                    duration);
 
@@ -544,7 +544,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_BOOK_BITSETTING_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_BOOK_BITSETTING_took_0_ms, duration);
 
         return sense;
     }
@@ -576,7 +576,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_TEST_WRITE_DVD_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PLEXTOR_GET_TEST_WRITE_DVD_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/SBC.cs b/Aaru.Devices/Device/ScsiCommands/SBC.cs
index 42d9cf688..43498c224 100644
--- a/Aaru.Devices/Device/ScsiCommands/SBC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SBC.cs
@@ -82,7 +82,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_6_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_6_took_0_ms, duration);
 
         return sense;
     }
@@ -146,7 +146,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_10_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_10_took_0_ms, duration);
 
         return sense;
     }
@@ -215,7 +215,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_12_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_12_took_0_ms, duration);
 
         return sense;
     }
@@ -286,7 +286,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_16_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_16_took_0_ms, duration);
 
         return sense;
     }
@@ -335,7 +335,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_LONG_10_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_LONG_10_took_0_ms, duration);
 
         return sense;
     }
@@ -386,7 +386,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_LONG_16_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_LONG_16_took_0_ms, duration);
 
         return sense;
     }
@@ -417,7 +417,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.SEEK_6_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.SEEK_6_took_0_ms, duration);
 
         return sense;
     }
@@ -449,7 +449,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.SEEK_10_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.SEEK_10_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/SMC.cs b/Aaru.Devices/Device/ScsiCommands/SMC.cs
index a88d775c3..44c55325e 100644
--- a/Aaru.Devices/Device/ScsiCommands/SMC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SMC.cs
@@ -102,7 +102,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_ATTRIBUTE_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_ATTRIBUTE_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/SPC.cs b/Aaru.Devices/Device/ScsiCommands/SPC.cs
index 139dc185d..384a8f8ba 100644
--- a/Aaru.Devices/Device/ScsiCommands/SPC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SPC.cs
@@ -108,7 +108,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.INQUIRY_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.INQUIRY_took_0_ms, duration);
 
         return sense;
     }
@@ -191,7 +191,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.INQUIRY_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.INQUIRY_took_0_ms, duration);
 
         return sense;
     }
@@ -219,7 +219,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.TEST_UNIT_READY_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.TEST_UNIT_READY_took_0_ms, duration);
 
         return sense;
     }
@@ -302,7 +302,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MODE_SENSE_6_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MODE_SENSE_6_took_0_ms, duration);
 
         return sense;
     }
@@ -396,7 +396,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MODE_SENSE_10_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MODE_SENSE_10_took_0_ms, duration);
 
         return sense;
     }
@@ -454,7 +454,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.PREVENT_ALLOW_MEDIUM_REMOVAL_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.PREVENT_ALLOW_MEDIUM_REMOVAL_took_0_ms, duration);
 
         return sense;
     }
@@ -508,7 +508,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_CAPACITY_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_CAPACITY_took_0_ms, duration);
 
         return sense;
     }
@@ -569,7 +569,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_CAPACITY_16_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_CAPACITY_16_took_0_ms, duration);
 
         return sense;
     }
@@ -623,7 +623,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_MEDIA_SERIAL_NUMBER_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_MEDIA_SERIAL_NUMBER_took_0_ms, duration);
 
         return sense;
     }
@@ -795,7 +795,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MODE_SELECT_6_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MODE_SELECT_6_took_0_ms, duration);
 
         return sense;
     }
@@ -853,7 +853,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.MODE_SELECT_10_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.MODE_SELECT_10_took_0_ms, duration);
 
         return sense;
     }
@@ -890,7 +890,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.REQUEST_SENSE_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.REQUEST_SENSE_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/SSC.cs b/Aaru.Devices/Device/ScsiCommands/SSC.cs
index 88c13fc00..e1f4801ad 100644
--- a/Aaru.Devices/Device/ScsiCommands/SSC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SSC.cs
@@ -99,7 +99,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.LOAD_UNLOAD_6_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.LOAD_UNLOAD_6_took_0_ms, duration);
 
         return sense;
     }
@@ -187,7 +187,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.LOCATE_10_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.LOCATE_10_took_0_ms, duration);
 
         return sense;
     }
@@ -292,7 +292,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.LOCATE_16_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.LOCATE_16_took_0_ms, duration);
 
         return sense;
     }
@@ -371,7 +371,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_6_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_6_took_0_ms, duration);
 
         return sense;
     }
@@ -490,7 +490,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_16_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_16_took_0_ms, duration);
 
         return sense;
     }
@@ -518,7 +518,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_BLOCK_LIMITS_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_BLOCK_LIMITS_took_0_ms, duration);
 
         return sense;
     }
@@ -606,7 +606,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_POSITION_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_POSITION_took_0_ms, duration);
 
         return sense;
     }
@@ -686,7 +686,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_REVERSE_6_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_REVERSE_6_took_0_ms, duration);
 
         return sense;
     }
@@ -841,7 +841,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.READ_REVERSE_16_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.READ_REVERSE_16_took_0_ms, duration);
 
         return sense;
     }
@@ -911,7 +911,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.RECOVER_BUFFERED_DATA_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.RECOVER_BUFFERED_DATA_took_0_ms, duration);
 
         return sense;
     }
@@ -985,7 +985,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.REPORT_DENSITY_SUPPORT_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.REPORT_DENSITY_SUPPORT_took_0_ms, duration);
 
         return sense;
     }
@@ -1022,7 +1022,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.REWIND_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.REWIND_took_0_ms, duration);
 
         return sense;
     }
@@ -1052,7 +1052,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.TRACK_SELECT_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.TRACK_SELECT_took_0_ms, duration);
 
         return sense;
     }
@@ -1087,7 +1087,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.SPACE_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.SPACE_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs
index 81c3a7b7a..7338c416b 100644
--- a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs
@@ -130,7 +130,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.SYQUEST_READ_6_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.SYQUEST_READ_6_took_0_ms, duration);
 
         return sense;
     }
@@ -218,7 +218,7 @@ public partial class Device
 
         Error = LastError != 0;
 
-        AaruConsole.DebugWriteLine(SCSI_MODULE_NAME, Localization.SYQUEST_READ_10_took_0_ms, duration);
+        AaruConsole.Debug(SCSI_MODULE_NAME, Localization.SYQUEST_READ_10_took_0_ms, duration);
 
         return sense;
     }
diff --git a/Aaru.Devices/Remote/Remote.cs b/Aaru.Devices/Remote/Remote.cs
index 58b3199f8..f1a80fff0 100644
--- a/Aaru.Devices/Remote/Remote.cs
+++ b/Aaru.Devices/Remote/Remote.cs
@@ -76,7 +76,7 @@ public class Remote : IDisposable
 
         if(ipAddress is null)
         {
-            AaruConsole.ErrorWriteLine(Localization.Host_not_found);
+            AaruConsole.Error(Localization.Host_not_found);
 
             throw new SocketException(11001);
         }
@@ -94,7 +94,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             throw new IOException();
         }
@@ -103,7 +103,7 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             throw new ArgumentException();
         }
@@ -114,7 +114,7 @@ public class Remote : IDisposable
         {
             if(hdr.packetType != AaruPacketType.Nop)
             {
-                AaruConsole.ErrorWriteLine(Localization.Expected_Hello_Packet_got_packet_type_0, hdr.packetType);
+                AaruConsole.Error(Localization.Expected_Hello_Packet_got_packet_type_0, hdr.packetType);
 
                 throw new ArgumentException();
             }
@@ -124,21 +124,21 @@ public class Remote : IDisposable
 
             if(len < buf.Length)
             {
-                AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+                AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
                 throw new IOException();
             }
 
             AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
 
-            AaruConsole.ErrorWriteLine($"{nop.reason}");
+            AaruConsole.Error($"{nop.reason}");
 
             throw new ArgumentException();
         }
 
         if(hdr.version != Consts.PACKET_VERSION)
         {
-            AaruConsole.ErrorWriteLine(Localization.Unrecognized_packet_version);
+            AaruConsole.Error(Localization.Unrecognized_packet_version);
 
             throw new ArgumentException();
         }
@@ -148,7 +148,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             throw new IOException();
         }
@@ -186,7 +186,7 @@ public class Remote : IDisposable
 
         if(len >= buf.Length) return;
 
-        AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+        AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
         throw new IOException();
     }
@@ -232,7 +232,7 @@ public class Remote : IDisposable
 
             if(len != buf.Length)
             {
-                AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+                AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
                 return false;
             }
@@ -243,7 +243,7 @@ public class Remote : IDisposable
 
             if(len < hdrBuf.Length)
             {
-                AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+                AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
                 return false;
             }
@@ -252,14 +252,14 @@ public class Remote : IDisposable
 
             if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
             {
-                AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+                AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
                 return false;
             }
 
             if(hdr.packetType != AaruPacketType.ResponseAmIRoot)
             {
-                AaruConsole.ErrorWriteLine(Localization
+                AaruConsole.Error(Localization
                                               .Remote_IsRoot_Expected_Am_I_Root_Response_Packet_got_packet_type_0,
                                            hdr.packetType);
 
@@ -271,7 +271,7 @@ public class Remote : IDisposable
 
             if(len < buf.Length)
             {
-                AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+                AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
                 return false;
             }
@@ -325,7 +325,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return [];
         }
@@ -336,7 +336,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return [];
         }
@@ -345,7 +345,7 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return [];
         }
@@ -354,7 +354,7 @@ public class Remote : IDisposable
         {
             if(hdr.packetType != AaruPacketType.Nop)
             {
-                AaruConsole.ErrorWriteLine(Localization
+                AaruConsole.Error(Localization
                                               .Remote_ListDevices_Expected_List_Devices_Response_Packet_got_packet_type_0,
                                            hdr.packetType);
 
@@ -366,21 +366,21 @@ public class Remote : IDisposable
 
             if(len < buf.Length)
             {
-                AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+                AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
                 return [];
             }
 
             AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
 
-            AaruConsole.ErrorWriteLine($"{nop.reason}");
+            AaruConsole.Error($"{nop.reason}");
 
             return [];
         }
 
         if(hdr.version != Consts.PACKET_VERSION)
         {
-            AaruConsole.ErrorWriteLine(Localization.Unrecognized_packet_version);
+            AaruConsole.Error(Localization.Unrecognized_packet_version);
 
             return [];
         }
@@ -390,7 +390,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return [];
         }
@@ -444,7 +444,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
             lastError = -1;
 
             return false;
@@ -456,7 +456,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
             lastError = -1;
 
             return false;
@@ -466,7 +466,7 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
             lastError = -1;
 
             return false;
@@ -474,7 +474,7 @@ public class Remote : IDisposable
 
         if(hdr.packetType != AaruPacketType.Nop)
         {
-            AaruConsole.ErrorWriteLine(Localization
+            AaruConsole.Error(Localization
                                           .Remote_ListDevices_Expected_List_Devices_Response_Packet_got_packet_type_0,
                                        hdr.packetType);
 
@@ -488,7 +488,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
             lastError = -1;
 
             return false;
@@ -504,7 +504,7 @@ public class Remote : IDisposable
                 throw new NotImplementedException($"{nop.reason}");
         }
 
-        AaruConsole.ErrorWriteLine($"{nop.reason}");
+        AaruConsole.Error($"{nop.reason}");
         lastError = nop.errno;
 
         return false;
@@ -562,7 +562,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return -1;
         }
@@ -573,7 +573,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -582,14 +582,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return -1;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseScsi)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_SCSI_Response_Packet_got_packet_type_0, hdr.packetType);
+            AaruConsole.Error(Localization.Expected_SCSI_Response_Packet_got_packet_type_0, hdr.packetType);
 
             return -1;
         }
@@ -599,7 +599,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -669,7 +669,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return -1;
         }
@@ -680,7 +680,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -689,14 +689,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return -1;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseAtaChs)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_ATA_CHS_Response_Packet_got_packet_type_0, hdr.packetType);
+            AaruConsole.Error(Localization.Expected_ATA_CHS_Response_Packet_got_packet_type_0, hdr.packetType);
 
             return -1;
         }
@@ -706,7 +706,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -775,7 +775,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return -1;
         }
@@ -786,7 +786,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -795,14 +795,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return -1;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseAtaLba28)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_ATA_LBA28_Response_Packet_got_packet_type_0,
+            AaruConsole.Error(Localization.Expected_ATA_LBA28_Response_Packet_got_packet_type_0,
                                        hdr.packetType);
 
             return -1;
@@ -813,7 +813,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -882,7 +882,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return -1;
         }
@@ -893,7 +893,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -902,14 +902,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return -1;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseAtaLba48)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_ATA_LBA48_Response_Packet_got_packet_type_0,
+            AaruConsole.Error(Localization.Expected_ATA_LBA48_Response_Packet_got_packet_type_0,
                                        hdr.packetType);
 
             return -1;
@@ -920,7 +920,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -995,7 +995,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return -1;
         }
@@ -1006,7 +1006,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -1015,14 +1015,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return -1;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseSdhci)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_SDHCI_Response_Packet_got_packet_type_0, hdr.packetType);
+            AaruConsole.Error(Localization.Expected_SDHCI_Response_Packet_got_packet_type_0, hdr.packetType);
 
             return -1;
         }
@@ -1032,7 +1032,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -1076,7 +1076,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return DeviceType.Unknown;
         }
@@ -1087,7 +1087,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return DeviceType.Unknown;
         }
@@ -1096,14 +1096,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return DeviceType.Unknown;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseGetType)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_Device_Type_Response_Packet_got_packet_type_0,
+            AaruConsole.Error(Localization.Expected_Device_Type_Response_Packet_got_packet_type_0,
                                        hdr.packetType);
 
             return DeviceType.Unknown;
@@ -1114,7 +1114,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return DeviceType.Unknown;
         }
@@ -1155,7 +1155,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return false;
         }
@@ -1166,7 +1166,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1175,14 +1175,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return false;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseGetSdhciRegisters)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_Device_Type_Response_Packet_got_packet_type_0,
+            AaruConsole.Error(Localization.Expected_Device_Type_Response_Packet_got_packet_type_0,
                                        hdr.packetType);
 
             return false;
@@ -1193,7 +1193,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1281,7 +1281,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return false;
         }
@@ -1292,7 +1292,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1301,14 +1301,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return false;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseGetUsbData)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_USB_Data_Response_Packet_got_packet_type_0,
+            AaruConsole.Error(Localization.Expected_USB_Data_Response_Packet_got_packet_type_0,
                                        hdr.packetType);
 
             return false;
@@ -1319,7 +1319,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1373,7 +1373,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return false;
         }
@@ -1384,7 +1384,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1393,14 +1393,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return false;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseGetFireWireData)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_FireWire_Data_Response_Packet_got_packet_type_0,
+            AaruConsole.Error(Localization.Expected_FireWire_Data_Response_Packet_got_packet_type_0,
                                        hdr.packetType);
 
             return false;
@@ -1411,7 +1411,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1454,7 +1454,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return false;
         }
@@ -1465,7 +1465,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1474,14 +1474,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return false;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseGetPcmciaData)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_PCMCIA_Data_Response_Packet_got_packet_type_0,
+            AaruConsole.Error(Localization.Expected_PCMCIA_Data_Response_Packet_got_packet_type_0,
                                        hdr.packetType);
 
             return false;
@@ -1492,7 +1492,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1629,7 +1629,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return -1;
         }
@@ -1640,7 +1640,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -1649,14 +1649,14 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return -1;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseMultiSdhci)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_multi_MMC_SD_command_Response_Packet_got_packet_type_0,
+            AaruConsole.Error(Localization.Expected_multi_MMC_SD_command_Response_Packet_got_packet_type_0,
                                        hdr.packetType);
 
             return -1;
@@ -1667,7 +1667,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return -1;
         }
@@ -1676,7 +1676,7 @@ public class Remote : IDisposable
 
         if(res.cmd_count != (ulong)commands.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_the_response_to_0_SD_MMC_commands_but_got_1_responses,
+            AaruConsole.Error(Localization.Expected_the_response_to_0_SD_MMC_commands_but_got_1_responses,
                                        commands.Length,
                                        res.cmd_count);
 
@@ -1776,7 +1776,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return false;
         }
@@ -1787,7 +1787,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1796,21 +1796,21 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return false;
         }
 
         if(hdr.packetType != AaruPacketType.Nop)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_NOP_Packet_got_packet_type_0, hdr.packetType);
+            AaruConsole.Error(Localization.Expected_NOP_Packet_got_packet_type_0, hdr.packetType);
 
             return false;
         }
 
         if(hdr.version != Consts.PACKET_VERSION)
         {
-            AaruConsole.ErrorWriteLine(Localization.Unrecognized_packet_version);
+            AaruConsole.Error(Localization.Unrecognized_packet_version);
 
             return false;
         }
@@ -1820,7 +1820,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1833,11 +1833,11 @@ public class Remote : IDisposable
                 return true;
             case AaruNopReason.CloseError:
             case AaruNopReason.OpenError:
-                AaruConsole.ErrorWriteLine(Localization.ReOpen_error_closing_device);
+                AaruConsole.Error(Localization.ReOpen_error_closing_device);
 
                 break;
             default:
-                AaruConsole.ErrorWriteLine(Localization.ReOpen_error_0_with_reason_1, nop.errno, nop.reason);
+                AaruConsole.Error(Localization.ReOpen_error_0_with_reason_1, nop.errno, nop.reason);
 
                 break;
         }
@@ -1878,7 +1878,7 @@ public class Remote : IDisposable
 
         if(len != buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_write_to_the_network);
+            AaruConsole.Error(Localization.Could_not_write_to_the_network);
 
             return false;
         }
@@ -1889,7 +1889,7 @@ public class Remote : IDisposable
 
         if(len < hdrBuf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1898,21 +1898,21 @@ public class Remote : IDisposable
 
         if(hdr.remote_id != Consts.REMOTE_ID || hdr.packet_id != Consts.PACKET_ID)
         {
-            AaruConsole.ErrorWriteLine(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
+            AaruConsole.Error(Localization.Received_data_is_not_an_Aaru_Remote_Packet);
 
             return false;
         }
 
         if(hdr.packetType != AaruPacketType.ResponseOsRead)
         {
-            AaruConsole.ErrorWriteLine(Localization.Expected_OS_Read_Response_Packet_got_packet_type_0, hdr.packetType);
+            AaruConsole.Error(Localization.Expected_OS_Read_Response_Packet_got_packet_type_0, hdr.packetType);
 
             return false;
         }
 
         if(hdr.version != Consts.PACKET_VERSION)
         {
-            AaruConsole.ErrorWriteLine(Localization.Unrecognized_packet_version);
+            AaruConsole.Error(Localization.Unrecognized_packet_version);
 
             return false;
         }
@@ -1922,7 +1922,7 @@ public class Remote : IDisposable
 
         if(len < buf.Length)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_read_from_the_network);
+            AaruConsole.Error(Localization.Could_not_read_from_the_network);
 
             return false;
         }
@@ -1933,7 +1933,7 @@ public class Remote : IDisposable
 
         if(osRead.errno != 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.Remote_error_0_in_OS_Read, osRead.errno);
+            AaruConsole.Error(Localization.Remote_error_0_in_OS_Read, osRead.errno);
 
             return false;
         }
diff --git a/Aaru.Filesystems/Acorn/Info.cs b/Aaru.Filesystems/Acorn/Info.cs
index 5d2891034..4a9732e4e 100644
--- a/Aaru.Filesystems/Acorn/Info.cs
+++ b/Aaru.Filesystems/Acorn/Info.cs
@@ -74,8 +74,8 @@ public sealed partial class AcornADFS
             byte          oldChk1 = AcornMapChecksum(sector, 255);
             OldMapSector1 oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(sector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "oldMap0.checksum = {0}", oldMap0.checksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "oldChk0 = {0}",          oldChk0);
+            AaruConsole.Debug(MODULE_NAME, "oldMap0.checksum = {0}", oldMap0.checksum);
+            AaruConsole.Debug(MODULE_NAME, "oldChk0 = {0}",          oldChk0);
 
             // According to documentation map1 MUST start on sector 1. On ADFS-D it starts at 0x100, not on sector 1 (0x400)
             if(oldMap0.checksum == oldChk0 && oldMap1.checksum != oldChk1 && sector.Length >= 512)
@@ -90,8 +90,8 @@ public sealed partial class AcornADFS
                 oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(tmp);
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "oldMap1.checksum = {0}", oldMap1.checksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "oldChk1 = {0}",          oldChk1);
+            AaruConsole.Debug(MODULE_NAME, "oldMap1.checksum = {0}", oldMap1.checksum);
+            AaruConsole.Debug(MODULE_NAME, "oldChk1 = {0}",          oldChk1);
 
             if(oldMap0.checksum == oldChk0 &&
                oldMap1.checksum == oldChk1 &&
@@ -118,15 +118,15 @@ public sealed partial class AcornADFS
                 OldDirectory oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
                 byte         dirChk  = AcornDirectoryChecksum(sector, (int)OLD_DIRECTORY_SIZE - 1);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "oldRoot.header.magic at 0x200 = {0}", oldRoot.header.magic);
+                AaruConsole.Debug(MODULE_NAME, "oldRoot.header.magic at 0x200 = {0}", oldRoot.header.magic);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "oldRoot.tail.magic at 0x200 = {0}", oldRoot.tail.magic);
+                AaruConsole.Debug(MODULE_NAME, "oldRoot.tail.magic at 0x200 = {0}", oldRoot.tail.magic);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "oldRoot.tail.checkByte at 0x200 = {0}",
                                            oldRoot.tail.checkByte);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "dirChk at 0x200 = {0}", dirChk);
+                AaruConsole.Debug(MODULE_NAME, "dirChk at 0x200 = {0}", dirChk);
 
                 if(oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC ||
                    oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC)
@@ -153,15 +153,15 @@ public sealed partial class AcornADFS
                 oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
                 dirChk  = AcornDirectoryChecksum(sector, (int)OLD_DIRECTORY_SIZE - 1);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "oldRoot.header.magic at 0x400 = {0}", oldRoot.header.magic);
+                AaruConsole.Debug(MODULE_NAME, "oldRoot.header.magic at 0x400 = {0}", oldRoot.header.magic);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "oldRoot.tail.magic at 0x400 = {0}", oldRoot.tail.magic);
+                AaruConsole.Debug(MODULE_NAME, "oldRoot.tail.magic at 0x400 = {0}", oldRoot.tail.magic);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "oldRoot.tail.checkByte at 0x400 = {0}",
                                            oldRoot.tail.checkByte);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "dirChk at 0x400 = {0}", dirChk);
+                AaruConsole.Debug(MODULE_NAME, "dirChk at 0x400 = {0}", dirChk);
 
                 if(oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC ||
                    oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC)
@@ -177,8 +177,8 @@ public sealed partial class AcornADFS
         if(errno != ErrorNumber.NoError) return false;
 
         byte newChk = NewMapChecksum(sector);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "newChk = {0}",           newChk);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "map.zoneChecksum = {0}", sector[0]);
+        AaruConsole.Debug(MODULE_NAME, "newChk = {0}",           newChk);
+        AaruConsole.Debug(MODULE_NAME, "map.zoneChecksum = {0}", sector[0]);
 
         sbSector      = BOOT_BLOCK_LOCATION / imagePlugin.Info.SectorSize;
         sectorsToRead = BOOT_BLOCK_SIZE     / imagePlugin.Info.SectorSize;
@@ -197,8 +197,8 @@ public sealed partial class AcornADFS
 
         for(int i = 0; i < 0x1FF; i++) bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bootChk = {0}",         bootChk);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bBlock.checksum = {0}", bootSector[0x1FF]);
+        AaruConsole.Debug(MODULE_NAME, "bootChk = {0}",         bootChk);
+        AaruConsole.Debug(MODULE_NAME, "bBlock.checksum = {0}", bootSector[0x1FF]);
 
         if(newChk == sector[0] && newChk != 0)
         {
@@ -213,12 +213,12 @@ public sealed partial class AcornADFS
         else
             return false;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.log2secsize = {0}",    drSb.log2secsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.idlen = {0}",          drSb.idlen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.disc_size_high = {0}", drSb.disc_size_high);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.disc_size = {0}",      drSb.disc_size);
+        AaruConsole.Debug(MODULE_NAME, "drSb.log2secsize = {0}",    drSb.log2secsize);
+        AaruConsole.Debug(MODULE_NAME, "drSb.idlen = {0}",          drSb.idlen);
+        AaruConsole.Debug(MODULE_NAME, "drSb.disc_size_high = {0}", drSb.disc_size_high);
+        AaruConsole.Debug(MODULE_NAME, "drSb.disc_size = {0}",      drSb.disc_size);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "IsNullOrEmpty(drSb.reserved) = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved));
 
@@ -411,8 +411,8 @@ public sealed partial class AcornADFS
         if(errno != ErrorNumber.NoError) return;
 
         byte newChk = NewMapChecksum(sector);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "newChk = {0}",           newChk);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "map.zoneChecksum = {0}", sector[0]);
+        AaruConsole.Debug(MODULE_NAME, "newChk = {0}",           newChk);
+        AaruConsole.Debug(MODULE_NAME, "map.zoneChecksum = {0}", sector[0]);
 
         sbSector      = BOOT_BLOCK_LOCATION / imagePlugin.Info.SectorSize;
         sectorsToRead = BOOT_BLOCK_SIZE     / imagePlugin.Info.SectorSize;
@@ -427,8 +427,8 @@ public sealed partial class AcornADFS
 
         for(int i = 0; i < 0x1FF; i++) bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bootChk = {0}",         bootChk);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bBlock.checksum = {0}", bootSector[0x1FF]);
+        AaruConsole.Debug(MODULE_NAME, "bootChk = {0}",         bootChk);
+        AaruConsole.Debug(MODULE_NAME, "bBlock.checksum = {0}", bootSector[0x1FF]);
 
         if(newChk == sector[0] && newChk != 0)
         {
@@ -443,31 +443,31 @@ public sealed partial class AcornADFS
         else
             return;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.log2secsize = {0}", drSb.log2secsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.spt = {0}",         drSb.spt);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.heads = {0}",       drSb.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.density = {0}",     drSb.density);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.idlen = {0}",       drSb.idlen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.log2bpmb = {0}",    drSb.log2bpmb);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.skew = {0}",        drSb.skew);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.bootoption = {0}",  drSb.bootoption);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.lowsector = {0}",   drSb.lowsector);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.nzones = {0}",      drSb.nzones);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.zone_spare = {0}",  drSb.zone_spare);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.root = {0}",        drSb.root);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.disc_size = {0}",   drSb.disc_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.disc_id = {0}",     drSb.disc_id);
+        AaruConsole.Debug(MODULE_NAME, "drSb.log2secsize = {0}", drSb.log2secsize);
+        AaruConsole.Debug(MODULE_NAME, "drSb.spt = {0}",         drSb.spt);
+        AaruConsole.Debug(MODULE_NAME, "drSb.heads = {0}",       drSb.heads);
+        AaruConsole.Debug(MODULE_NAME, "drSb.density = {0}",     drSb.density);
+        AaruConsole.Debug(MODULE_NAME, "drSb.idlen = {0}",       drSb.idlen);
+        AaruConsole.Debug(MODULE_NAME, "drSb.log2bpmb = {0}",    drSb.log2bpmb);
+        AaruConsole.Debug(MODULE_NAME, "drSb.skew = {0}",        drSb.skew);
+        AaruConsole.Debug(MODULE_NAME, "drSb.bootoption = {0}",  drSb.bootoption);
+        AaruConsole.Debug(MODULE_NAME, "drSb.lowsector = {0}",   drSb.lowsector);
+        AaruConsole.Debug(MODULE_NAME, "drSb.nzones = {0}",      drSb.nzones);
+        AaruConsole.Debug(MODULE_NAME, "drSb.zone_spare = {0}",  drSb.zone_spare);
+        AaruConsole.Debug(MODULE_NAME, "drSb.root = {0}",        drSb.root);
+        AaruConsole.Debug(MODULE_NAME, "drSb.disc_size = {0}",   drSb.disc_size);
+        AaruConsole.Debug(MODULE_NAME, "drSb.disc_id = {0}",     drSb.disc_id);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "drSb.disc_name = {0}",
                                    StringHandlers.CToString(drSb.disc_name, encoding));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.disc_type = {0}",      drSb.disc_type);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.disc_size_high = {0}", drSb.disc_size_high);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.flags = {0}",          drSb.flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.nzones_high = {0}",    drSb.nzones_high);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.format_version = {0}", drSb.format_version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "drSb.root_size = {0}",      drSb.root_size);
+        AaruConsole.Debug(MODULE_NAME, "drSb.disc_type = {0}",      drSb.disc_type);
+        AaruConsole.Debug(MODULE_NAME, "drSb.disc_size_high = {0}", drSb.disc_size_high);
+        AaruConsole.Debug(MODULE_NAME, "drSb.flags = {0}",          drSb.flags);
+        AaruConsole.Debug(MODULE_NAME, "drSb.nzones_high = {0}",    drSb.nzones_high);
+        AaruConsole.Debug(MODULE_NAME, "drSb.format_version = {0}", drSb.format_version);
+        AaruConsole.Debug(MODULE_NAME, "drSb.root_size = {0}",      drSb.root_size);
 
         if(drSb.log2secsize is < 8 or > 10) return;
 
diff --git a/Aaru.Filesystems/AmigaDOS/Info.cs b/Aaru.Filesystems/AmigaDOS/Info.cs
index b41cc86ea..ab7167ac2 100644
--- a/Aaru.Filesystems/AmigaDOS/Info.cs
+++ b/Aaru.Filesystems/AmigaDOS/Info.cs
@@ -83,8 +83,8 @@ public sealed partial class AmigaDOSPlugin
         sector[4] = sector[5] = sector[6] = sector[7] = 0;
         uint bsum             = AmigaBootChecksum(sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bblk.checksum = 0x{0:X8}", bblk.checksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bsum = 0x{0:X8}",          bsum);
+        AaruConsole.Debug(MODULE_NAME, "bblk.checksum = 0x{0:X8}", bblk.checksum);
+        AaruConsole.Debug(MODULE_NAME, "bsum = 0x{0:X8}",          bsum);
 
         ulong bRootPtr = 0;
 
@@ -92,7 +92,7 @@ public sealed partial class AmigaDOSPlugin
         if(bsum == bblk.checksum)
         {
             bRootPtr = bblk.root_ptr + partition.Start;
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Bootblock_points_to_0_as_Rootblock, bRootPtr);
+            AaruConsole.Debug(MODULE_NAME, Localization.Bootblock_points_to_0_as_Rootblock, bRootPtr);
         }
 
         ulong[] rootPtrs =
@@ -108,26 +108,26 @@ public sealed partial class AmigaDOSPlugin
         // So to handle even number of sectors
         foreach(ulong rootPtr in rootPtrs.Where(rootPtr => rootPtr < partition.End && rootPtr >= partition.Start))
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Searching_for_Rootblock_in_sector_0, rootPtr);
+            AaruConsole.Debug(MODULE_NAME, Localization.Searching_for_Rootblock_in_sector_0, rootPtr);
 
             errno = imagePlugin.ReadSector(rootPtr, out sector);
 
             if(errno != ErrorNumber.NoError) continue;
 
             rblk.type = BigEndianBitConverter.ToUInt32(sector, 0x00);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "rblk.type = {0}", rblk.type);
+            AaruConsole.Debug(MODULE_NAME, "rblk.type = {0}", rblk.type);
 
             if(rblk.type != TYPE_HEADER) continue;
 
             rblk.hashTableSize = BigEndianBitConverter.ToUInt32(sector, 0x0C);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "rblk.hashTableSize = {0}", rblk.hashTableSize);
+            AaruConsole.Debug(MODULE_NAME, "rblk.hashTableSize = {0}", rblk.hashTableSize);
 
             uint blockSize       = (rblk.hashTableSize + 56) * 4;
             uint sectorsPerBlock = (uint)(blockSize / sector.Length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "blockSize = {0}",       blockSize);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "sectorsPerBlock = {0}", sectorsPerBlock);
+            AaruConsole.Debug(MODULE_NAME, "blockSize = {0}",       blockSize);
+            AaruConsole.Debug(MODULE_NAME, "sectorsPerBlock = {0}", sectorsPerBlock);
 
             if(blockSize % sector.Length > 0) sectorsPerBlock++;
 
@@ -142,11 +142,11 @@ public sealed partial class AmigaDOSPlugin
             sector[20]    = sector[21] = sector[22] = sector[23] = 0;
             uint rsum                  = AmigaChecksum(sector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "rblk.checksum = 0x{0:X8}", rblk.checksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "rsum = 0x{0:X8}",          rsum);
+            AaruConsole.Debug(MODULE_NAME, "rblk.checksum = 0x{0:X8}", rblk.checksum);
+            AaruConsole.Debug(MODULE_NAME, "rsum = 0x{0:X8}",          rsum);
 
             rblk.sec_type = BigEndianBitConverter.ToUInt32(sector, sector.Length - 4);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "rblk.sec_type = {0}", rblk.sec_type);
+            AaruConsole.Debug(MODULE_NAME, "rblk.sec_type = {0}", rblk.sec_type);
 
             if(rblk.sec_type == SUBTYPE_ROOT && rblk.checksum == rsum) return true;
         }
@@ -178,7 +178,7 @@ public sealed partial class AmigaDOSPlugin
         if(bsum == bootBlk.checksum)
         {
             bRootPtr = bootBlk.root_ptr + partition.Start;
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Bootblock_points_to_0_as_Rootblock, bRootPtr);
+            AaruConsole.Debug(MODULE_NAME, Localization.Bootblock_points_to_0_as_Rootblock, bRootPtr);
         }
 
         ulong[] rootPtrs =
@@ -198,26 +198,26 @@ public sealed partial class AmigaDOSPlugin
         // So to handle even number of sectors
         foreach(ulong rootPtr in rootPtrs.Where(rootPtr => rootPtr < partition.End && rootPtr >= partition.Start))
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Searching_for_Rootblock_in_sector_0, rootPtr);
+            AaruConsole.Debug(MODULE_NAME, Localization.Searching_for_Rootblock_in_sector_0, rootPtr);
 
             errno = imagePlugin.ReadSector(rootPtr, out rootBlockSector);
 
             if(errno != ErrorNumber.NoError) continue;
 
             rootBlk.type = BigEndianBitConverter.ToUInt32(rootBlockSector, 0x00);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "rootBlk.type = {0}", rootBlk.type);
+            AaruConsole.Debug(MODULE_NAME, "rootBlk.type = {0}", rootBlk.type);
 
             if(rootBlk.type != TYPE_HEADER) continue;
 
             rootBlk.hashTableSize = BigEndianBitConverter.ToUInt32(rootBlockSector, 0x0C);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "rootBlk.hashTableSize = {0}", rootBlk.hashTableSize);
+            AaruConsole.Debug(MODULE_NAME, "rootBlk.hashTableSize = {0}", rootBlk.hashTableSize);
 
             blockSize = (rootBlk.hashTableSize + 56) * 4;
             uint sectorsPerBlock = (uint)(blockSize / rootBlockSector.Length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "blockSize = {0}",       blockSize);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "sectorsPerBlock = {0}", sectorsPerBlock);
+            AaruConsole.Debug(MODULE_NAME, "blockSize = {0}",       blockSize);
+            AaruConsole.Debug(MODULE_NAME, "sectorsPerBlock = {0}", sectorsPerBlock);
 
             if(blockSize % rootBlockSector.Length > 0) sectorsPerBlock++;
 
@@ -232,11 +232,11 @@ public sealed partial class AmigaDOSPlugin
             rootBlockSector[20] = rootBlockSector[21] = rootBlockSector[22] = rootBlockSector[23] = 0;
             uint rsum                                 = AmigaChecksum(rootBlockSector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "rootBlk.checksum = 0x{0:X8}", rootBlk.checksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "rsum = 0x{0:X8}",             rsum);
+            AaruConsole.Debug(MODULE_NAME, "rootBlk.checksum = 0x{0:X8}", rootBlk.checksum);
+            AaruConsole.Debug(MODULE_NAME, "rsum = 0x{0:X8}",             rsum);
 
             rootBlk.sec_type = BigEndianBitConverter.ToUInt32(rootBlockSector, rootBlockSector.Length - 4);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "rootBlk.sec_type = {0}", rootBlk.sec_type);
+            AaruConsole.Debug(MODULE_NAME, "rootBlk.sec_type = {0}", rootBlk.sec_type);
 
             if(rootBlk.sec_type != SUBTYPE_ROOT || rootBlk.checksum != rsum) continue;
 
diff --git a/Aaru.Filesystems/AppleDOS/Super.cs b/Aaru.Filesystems/AppleDOS/Super.cs
index a4be175cc..a0c64cca2 100644
--- a/Aaru.Filesystems/AppleDOS/Super.cs
+++ b/Aaru.Filesystems/AppleDOS/Super.cs
@@ -53,21 +53,21 @@ public sealed partial class AppleDOS
 
         if(_device.Info.Sectors != 455 && _device.Info.Sectors != 560)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_device_size);
+            AaruConsole.Debug(MODULE_NAME, Localization.Incorrect_device_size);
 
             return ErrorNumber.InOutError;
         }
 
         if(_start > 0)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Partitions_are_not_supported);
+            AaruConsole.Debug(MODULE_NAME, Localization.Partitions_are_not_supported);
 
             return ErrorNumber.InOutError;
         }
 
         if(_device.Info.SectorSize != 256)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_sector_size);
+            AaruConsole.Debug(MODULE_NAME, Localization.Incorrect_sector_size);
 
             return ErrorNumber.InOutError;
         }
@@ -89,7 +89,7 @@ public sealed partial class AppleDOS
 
         if(error != ErrorNumber.NoError)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Unable_to_read_catalog);
+            AaruConsole.Debug(MODULE_NAME, Localization.Unable_to_read_catalog);
 
             return error;
         }
@@ -100,7 +100,7 @@ public sealed partial class AppleDOS
 
         if(error != ErrorNumber.NoError)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Unable_cache_all_files);
+            AaruConsole.Debug(MODULE_NAME, Localization.Unable_cache_all_files);
 
             return error;
         }
diff --git a/Aaru.Filesystems/AppleMFS/Dir.cs b/Aaru.Filesystems/AppleMFS/Dir.cs
index 1dc122ca1..ddf00d15e 100644
--- a/Aaru.Filesystems/AppleMFS/Dir.cs
+++ b/Aaru.Filesystems/AppleMFS/Dir.cs
@@ -155,25 +155,25 @@ public sealed partial class AppleMFS
 
                 _filenameToId.Add(lowerFilename, entry.flFlNum);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "entry.flFlags = {0}",  entry.flFlags);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "entry.flTyp = {0}",    entry.flTyp);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "entry.flFlNum = {0}",  entry.flFlNum);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "entry.flStBlk = {0}",  entry.flStBlk);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "entry.flLgLen = {0}",  entry.flLgLen);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "entry.flPyLen = {0}",  entry.flPyLen);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "entry.flRStBlk = {0}", entry.flRStBlk);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "entry.flRLgLen = {0}", entry.flRLgLen);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "entry.flRPyLen = {0}", entry.flRPyLen);
+                AaruConsole.Debug(MODULE_NAME, "entry.flFlags = {0}",  entry.flFlags);
+                AaruConsole.Debug(MODULE_NAME, "entry.flTyp = {0}",    entry.flTyp);
+                AaruConsole.Debug(MODULE_NAME, "entry.flFlNum = {0}",  entry.flFlNum);
+                AaruConsole.Debug(MODULE_NAME, "entry.flStBlk = {0}",  entry.flStBlk);
+                AaruConsole.Debug(MODULE_NAME, "entry.flLgLen = {0}",  entry.flLgLen);
+                AaruConsole.Debug(MODULE_NAME, "entry.flPyLen = {0}",  entry.flPyLen);
+                AaruConsole.Debug(MODULE_NAME, "entry.flRStBlk = {0}", entry.flRStBlk);
+                AaruConsole.Debug(MODULE_NAME, "entry.flRLgLen = {0}", entry.flRLgLen);
+                AaruConsole.Debug(MODULE_NAME, "entry.flRPyLen = {0}", entry.flRPyLen);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "entry.flCrDat = {0}",
                                            DateHandlers.MacToDateTime(entry.flCrDat));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "entry.flMdDat = {0}",
                                            DateHandlers.MacToDateTime(entry.flMdDat));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "entry.flNam0 = {0}",
                                            StringHandlers.PascalToString(entry.flNam, _encoding));
             }
diff --git a/Aaru.Filesystems/AppleMFS/File.cs b/Aaru.Filesystems/AppleMFS/File.cs
index 332edfa34..4c4e5a5e3 100644
--- a/Aaru.Filesystems/AppleMFS/File.cs
+++ b/Aaru.Filesystems/AppleMFS/File.cs
@@ -339,7 +339,7 @@ public sealed partial class AppleMFS
 
             if(_blockMap[nextBlock] == BMAP_FREE)
             {
-                AaruConsole.ErrorWriteLine(Localization.File_truncated_at_block_0, nextBlock);
+                AaruConsole.Error(Localization.File_truncated_at_block_0, nextBlock);
 
                 break;
             }
diff --git a/Aaru.Filesystems/BTRFS/Info.cs b/Aaru.Filesystems/BTRFS/Info.cs
index 6b608d429..f976b596a 100644
--- a/Aaru.Filesystems/BTRFS/Info.cs
+++ b/Aaru.Filesystems/BTRFS/Info.cs
@@ -71,10 +71,10 @@ public sealed partial class BTRFS
             return false;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sbSectorOff = {0}",                    sbSectorOff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sbSectorSize = {0}",                   sbSectorSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "partition.PartitionStartSector = {0}", partition.Start);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.magic = 0x{0:X16}",            btrfsSb.magic);
+        AaruConsole.Debug(MODULE_NAME, "sbSectorOff = {0}",                    sbSectorOff);
+        AaruConsole.Debug(MODULE_NAME, "sbSectorSize = {0}",                   sbSectorSize);
+        AaruConsole.Debug(MODULE_NAME, "partition.PartitionStartSector = {0}", partition.Start);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.magic = 0x{0:X16}",            btrfsSb.magic);
 
         return btrfsSb.magic == BTRFS_MAGIC;
     }
@@ -96,61 +96,61 @@ public sealed partial class BTRFS
 
         SuperBlock btrfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.checksum = {0}",          btrfsSb.checksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.uuid = {0}",              btrfsSb.uuid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.pba = {0}",               btrfsSb.pba);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.flags = {0}",             btrfsSb.flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.magic = {0}",             btrfsSb.magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.generation = {0}",        btrfsSb.generation);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.root_lba = {0}",          btrfsSb.root_lba);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.chunk_lba = {0}",         btrfsSb.chunk_lba);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.log_lba = {0}",           btrfsSb.log_lba);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.log_root_transid = {0}",  btrfsSb.log_root_transid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.total_bytes = {0}",       btrfsSb.total_bytes);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.bytes_used = {0}",        btrfsSb.bytes_used);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.root_dir_objectid = {0}", btrfsSb.root_dir_objectid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.num_devices = {0}",       btrfsSb.num_devices);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.sectorsize = {0}",        btrfsSb.sectorsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.nodesize = {0}",          btrfsSb.nodesize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.leafsize = {0}",          btrfsSb.leafsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.stripesize = {0}",        btrfsSb.stripesize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.n = {0}",                 btrfsSb.n);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.checksum = {0}",          btrfsSb.checksum);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.uuid = {0}",              btrfsSb.uuid);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.pba = {0}",               btrfsSb.pba);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.flags = {0}",             btrfsSb.flags);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.magic = {0}",             btrfsSb.magic);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.generation = {0}",        btrfsSb.generation);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.root_lba = {0}",          btrfsSb.root_lba);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.chunk_lba = {0}",         btrfsSb.chunk_lba);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.log_lba = {0}",           btrfsSb.log_lba);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.log_root_transid = {0}",  btrfsSb.log_root_transid);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.total_bytes = {0}",       btrfsSb.total_bytes);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.bytes_used = {0}",        btrfsSb.bytes_used);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.root_dir_objectid = {0}", btrfsSb.root_dir_objectid);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.num_devices = {0}",       btrfsSb.num_devices);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.sectorsize = {0}",        btrfsSb.sectorsize);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.nodesize = {0}",          btrfsSb.nodesize);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.leafsize = {0}",          btrfsSb.leafsize);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.stripesize = {0}",        btrfsSb.stripesize);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.n = {0}",                 btrfsSb.n);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.chunk_root_generation = {0}", btrfsSb.chunk_root_generation);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.chunk_root_generation = {0}", btrfsSb.chunk_root_generation);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.compat_flags = 0x{0:X16}",    btrfsSb.compat_flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.compat_ro_flags = 0x{0:X16}", btrfsSb.compat_ro_flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.incompat_flags = 0x{0:X16}",  btrfsSb.incompat_flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.csum_type = {0}",             btrfsSb.csum_type);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.root_level = {0}",            btrfsSb.root_level);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.chunk_root_level = {0}",      btrfsSb.chunk_root_level);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.log_root_level = {0}",        btrfsSb.log_root_level);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.id = 0x{0:X16}",     btrfsSb.dev_item.id);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.bytes = {0}",        btrfsSb.dev_item.bytes);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.used = {0}",         btrfsSb.dev_item.used);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.compat_flags = 0x{0:X16}",    btrfsSb.compat_flags);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.compat_ro_flags = 0x{0:X16}", btrfsSb.compat_ro_flags);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.incompat_flags = 0x{0:X16}",  btrfsSb.incompat_flags);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.csum_type = {0}",             btrfsSb.csum_type);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.root_level = {0}",            btrfsSb.root_level);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.chunk_root_level = {0}",      btrfsSb.chunk_root_level);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.log_root_level = {0}",        btrfsSb.log_root_level);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.id = 0x{0:X16}",     btrfsSb.dev_item.id);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.bytes = {0}",        btrfsSb.dev_item.bytes);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.used = {0}",         btrfsSb.dev_item.used);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.optimal_align = {0}", btrfsSb.dev_item.optimal_align);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.optimal_align = {0}", btrfsSb.dev_item.optimal_align);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.optimal_width = {0}", btrfsSb.dev_item.optimal_width);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.optimal_width = {0}", btrfsSb.dev_item.optimal_width);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.minimal_size = {0}", btrfsSb.dev_item.minimal_size);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.minimal_size = {0}", btrfsSb.dev_item.minimal_size);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.type = {0}", btrfsSb.dev_item.type);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.type = {0}", btrfsSb.dev_item.type);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.generation = {0}", btrfsSb.dev_item.generation);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.generation = {0}", btrfsSb.dev_item.generation);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.start_offset = {0}", btrfsSb.dev_item.start_offset);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.start_offset = {0}", btrfsSb.dev_item.start_offset);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.dev_group = {0}", btrfsSb.dev_item.dev_group);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.dev_group = {0}", btrfsSb.dev_item.dev_group);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.seek_speed = {0}", btrfsSb.dev_item.seek_speed);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.seek_speed = {0}", btrfsSb.dev_item.seek_speed);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.bandwidth = {0}", btrfsSb.dev_item.bandwidth);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.bandwidth = {0}", btrfsSb.dev_item.bandwidth);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.device_uuid = {0}", btrfsSb.dev_item.device_uuid);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.device_uuid = {0}", btrfsSb.dev_item.device_uuid);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.dev_item.uuid = {0}", btrfsSb.dev_item.uuid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "btrfsSb.label = {0}",         btrfsSb.label);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.dev_item.uuid = {0}", btrfsSb.dev_item.uuid);
+        AaruConsole.Debug(MODULE_NAME, "btrfsSb.label = {0}",         btrfsSb.label);
 
         sbInformation.AppendLine(Localization.B_tree_filesystem);
         sbInformation.AppendFormat(Localization.UUID_0, btrfsSb.uuid).AppendLine();
diff --git a/Aaru.Filesystems/CPM/Info.cs b/Aaru.Filesystems/CPM/Info.cs
index 495490737..485bfff84 100644
--- a/Aaru.Filesystems/CPM/Info.cs
+++ b/Aaru.Filesystems/CPM/Info.cs
@@ -299,7 +299,7 @@ public sealed partial class CPM
                             _workingDefinition.skew = 2;
                             _workingDefinition.sofs = 0;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Amstrad_superblock);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_Amstrad_superblock);
                         }
                     }
                 }
@@ -367,7 +367,7 @@ public sealed partial class CPM
                                                     directoryLength,
                                                     out directory);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_CPM_86_hard_disk_superblock);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_CPM_86_hard_disk_superblock);
 
                             // Build a CP/M disk definition
                             _workingDefinition = new CpmDefinition
@@ -874,7 +874,7 @@ public sealed partial class CPM
                                                 directoryLength,
                                                 out directory);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_CPM_86_floppy_identifier);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_CPM_86_floppy_identifier);
                     }
                 }
             }
@@ -884,7 +884,7 @@ public sealed partial class CPM
             {
                 if(CheckDir(directory))
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.First_directory_block_seems_correct);
+                    AaruConsole.Debug(MODULE_NAME, Localization.First_directory_block_seems_correct);
 
                     return true;
                 }
@@ -896,11 +896,11 @@ public sealed partial class CPM
             if(!_cpmFound)
             {
                 // Load all definitions
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Trying_to_load_definitions);
+                AaruConsole.Debug(MODULE_NAME, Localization.Trying_to_load_definitions);
 
                 if(LoadDefinitions() && _definitions?.definitions is { Count: > 0 })
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Trying_all_known_definitions);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Trying_all_known_definitions);
 
                     foreach(CpmDefinition def in from def in _definitions.definitions
                                                  let sectors = (ulong)(def.cylinders * def.sides * def.sectorsPerTrack)
@@ -909,7 +909,7 @@ public sealed partial class CPM
                                                  select def)
                     {
                         // Definition seems to describe current disk, at least, same number of volume sectors and bytes per sector
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Trying_definition_0, def.comment);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Trying_definition_0, def.comment);
                         ulong offset;
 
                         if(def.sofs != 0)
@@ -970,7 +970,7 @@ public sealed partial class CPM
                                                    StringComparison.InvariantCultureIgnoreCase) ==
                                     0)
                             {
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization
                                                               .Dont_know_how_to_handle_COLUMBIA_ordering_not_proceeding_with_this_definition);
 
@@ -981,7 +981,7 @@ public sealed partial class CPM
                             else if(string.Compare(def.order, "EAGLE", StringComparison.InvariantCultureIgnoreCase) ==
                                     0)
                             {
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization
                                                               .Don_know_how_to_handle_EAGLE_ordering_not_proceeding_with_this_definition);
 
@@ -989,7 +989,7 @@ public sealed partial class CPM
                             }
                             else
                             {
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization
                                                               .Unknown_order_type_0_not_proceeding_with_this_definition,
                                                            def.order);
@@ -1018,7 +1018,7 @@ public sealed partial class CPM
 
                         if(def.evenOdd)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .Definition_contains_EVEN_ODD_field_with_unknown_meaning_detection_may_be_wrong);
                         }
@@ -1032,7 +1032,7 @@ public sealed partial class CPM
                         // Check the directory
                         if(CheckDir(directory))
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Definition_0_has_a_correct_directory,
                                                        def.comment);
 
diff --git a/Aaru.Filesystems/CPM/Super.cs b/Aaru.Filesystems/CPM/Super.cs
index 6eb0e06fe..740791726 100644
--- a/Aaru.Filesystems/CPM/Super.cs
+++ b/Aaru.Filesystems/CPM/Super.cs
@@ -113,7 +113,7 @@ public sealed partial class CPM
                 }
 
                 // TODO: Implement CYLINDERS ordering
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.CYLINDERS_ordering_not_yet_implemented);
+                AaruConsole.Debug(MODULE_NAME, Localization.CYLINDERS_ordering_not_yet_implemented);
 
                 return ErrorNumber.NotImplemented;
             }
@@ -122,7 +122,7 @@ public sealed partial class CPM
             else if(string.Compare(_workingDefinition.order, "COLUMBIA", StringComparison.InvariantCultureIgnoreCase) ==
                     0)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization
                                               .Dont_know_how_to_handle_COLUMBIA_ordering_not_proceeding_with_this_definition);
 
@@ -132,7 +132,7 @@ public sealed partial class CPM
             // TODO: Implement EAGLE ordering
             else if(string.Compare(_workingDefinition.order, "EAGLE", StringComparison.InvariantCultureIgnoreCase) == 0)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization
                                               .Don_know_how_to_handle_EAGLE_ordering_not_proceeding_with_this_definition);
 
@@ -140,7 +140,7 @@ public sealed partial class CPM
             }
             else
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Unknown_order_type_0_not_proceeding_with_this_definition,
                                            _workingDefinition.order);
 
@@ -154,7 +154,7 @@ public sealed partial class CPM
         if(_workingDefinition.sides                                                                       == 1 ||
            string.Compare(_workingDefinition.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Deinterleaving_whole_volume);
+            AaruConsole.Debug(MODULE_NAME, Localization.Deinterleaving_whole_volume);
 
             for(int p = 0; p <= (int)(partition.End - partition.Start); p++)
             {
@@ -180,7 +180,7 @@ public sealed partial class CPM
         int                       sectorsPerBlock  = 0;
         Dictionary<ulong, byte[]> allocationBlocks = new();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Creating_allocation_blocks);
+        AaruConsole.Debug(MODULE_NAME, Localization.Creating_allocation_blocks);
 
         // For each volume sector
         for(ulong a = 0; a < (ulong)deinterleavedSectors.Count; a++)
@@ -216,7 +216,7 @@ public sealed partial class CPM
                 allocationBlocks.Add(blockNo++, sector);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_directory);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_directory);
 
         int dirOff;
         int dirSectors = (_dpb.drm + 1) * 32 / _workingDefinition.bytesPerSector;
@@ -254,7 +254,7 @@ public sealed partial class CPM
         _labelUpdateDate   = null;
         _passwordCache     = new Dictionary<string, byte[]>();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Traversing_directory);
+        AaruConsole.Debug(MODULE_NAME, Localization.Traversing_directory);
 
         // For each directory entry
         for(int dOff = 0; dOff < directory.Length; dOff += 32)
@@ -716,7 +716,7 @@ public sealed partial class CPM
 
         // Cache all files. As CP/M maximum volume size is 8 Mib
         // this should not be a problem
-        AaruConsole.DebugWriteLine(MODULE_NAME, "Reading files.");
+        AaruConsole.Debug(MODULE_NAME, "Reading files.");
         long usedBlocks = 0;
         _fileCache = new Dictionary<string, byte[]>();
 
diff --git a/Aaru.Filesystems/EFS/Info.cs b/Aaru.Filesystems/EFS/Info.cs
index 96bb876e5..42f73d1a3 100644
--- a/Aaru.Filesystems/EFS/Info.cs
+++ b/Aaru.Filesystems/EFS/Info.cs
@@ -67,7 +67,7 @@ public sealed partial class EFS
 
             Superblock sb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.magic_at_0_equals_1_expected_2_or_3,
                                        0x200,
                                        sb.sb_magic,
@@ -90,7 +90,7 @@ public sealed partial class EFS
 
             Superblock sb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.magic_at_0_equals_1_expected_2_or_3,
                                        1,
                                        sb.sb_magic,
@@ -134,7 +134,7 @@ public sealed partial class EFS
 
             efsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.magic_at_0_X3_equals_1_expected_2_or_3,
                                        0x200,
                                        efsSb.sb_magic,
@@ -155,7 +155,7 @@ public sealed partial class EFS
 
             efsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.magic_at_0_equals_1_expected_2_or_3,
                                        1,
                                        efsSb.sb_magic,
diff --git a/Aaru.Filesystems/FAT/BPB.cs b/Aaru.Filesystems/FAT/BPB.cs
index 1703ea797..804f7562a 100644
--- a/Aaru.Filesystems/FAT/BPB.cs
+++ b/Aaru.Filesystems/FAT/BPB.cs
@@ -80,16 +80,16 @@ public sealed partial class FAT
         // Check correct branch for Human68k
         bool humanBranchCorrect = bpbSector[0] == 0x60 && bpbSector[1] >= 0x1C && bpbSector[1] < 0xFE;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "humanClustersCorrect = {0}", humanClustersCorrect);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "humanOemCorrect = {0}",      humanOemCorrect);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "humanBranchCorrect = {0}",   humanBranchCorrect);
+        AaruConsole.Debug(MODULE_NAME, "humanClustersCorrect = {0}", humanClustersCorrect);
+        AaruConsole.Debug(MODULE_NAME, "humanOemCorrect = {0}",      humanOemCorrect);
+        AaruConsole.Debug(MODULE_NAME, "humanBranchCorrect = {0}",   humanBranchCorrect);
 
         // If all Human68k checks are correct, it is a Human68k FAT16
         bool useHumanBpb = humanClustersCorrect && humanOemCorrect && humanBranchCorrect && expectedClusters > 0;
 
         if(useHumanBpb)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_Human68k_BPB);
+            AaruConsole.Debug(MODULE_NAME, Localization.Using_Human68k_BPB);
 
             fakeBpb.jump        = humanBpb.jump;
             fakeBpb.oem_name    = humanBpb.oem_name;
@@ -198,7 +198,7 @@ public sealed partial class FAT
                fat32Bpb is { spfat: 0, signature: 0x29 } &&
                Encoding.ASCII.GetString(fat32Bpb.fs_type) == "FAT32   ")
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_FAT32_BPB);
+                AaruConsole.Debug(MODULE_NAME, Localization.Using_FAT32_BPB);
                 minBootNearJump = 0x58;
 
                 return BpbKind.LongFat32;
@@ -208,7 +208,7 @@ public sealed partial class FAT
                correctSpcFat32Short     &&
                shortFat32Bpb is { fats_no: <= 2, sectors: 0 } and { spfat: 0, signature: 0x28 })
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_short_FAT32_BPB);
+                AaruConsole.Debug(MODULE_NAME, Localization.Using_short_FAT32_BPB);
 
                 minBootNearJump = 0x57;
 
@@ -222,7 +222,7 @@ public sealed partial class FAT
                msxBpb.spfat                            > 0                                    &&
                Encoding.ASCII.GetString(msxBpb.vol_id) == "VOL_ID")
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_MSX_BPB);
+                AaruConsole.Debug(MODULE_NAME, Localization.Using_MSX_BPB);
                 useMsxBpb = true;
             }
             else if(bitsInBpsApricot == 1                                             &&
@@ -232,7 +232,7 @@ public sealed partial class FAT
                     apricotBpb.mainBPB.spfat   > 0                                    &&
                     apricotBpb.partitionCount  == 0)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_Apricot_BPB);
+                AaruConsole.Debug(MODULE_NAME, Localization.Using_Apricot_BPB);
                 useApricotBpb = true;
             }
             else if(bitsInBpsDos40 == 1                   &&
@@ -247,13 +247,13 @@ public sealed partial class FAT
                     {
                         if(ebpb.signature == 0x29 || andosOemCorrect)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_DOS_4_0_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_DOS_4_0_BPB);
                             useExtendedBpb  = true;
                             minBootNearJump = 0x3C;
                         }
                         else
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_DOS_3_4_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_DOS_3_4_BPB);
                             userShortExtendedBpb = true;
                             minBootNearJump      = 0x29;
                         }
@@ -263,13 +263,13 @@ public sealed partial class FAT
                 {
                     if(ebpb.signature == 0x29 || andosOemCorrect)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_DOS_4_0_BPB);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Using_DOS_4_0_BPB);
                         useExtendedBpb  = true;
                         minBootNearJump = 0x3C;
                     }
                     else
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_DOS_3_4_BPB);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Using_DOS_3_4_BPB);
                         userShortExtendedBpb = true;
                         minBootNearJump      = 0x29;
                     }
@@ -286,7 +286,7 @@ public sealed partial class FAT
                    dos33Bpb.big_sectors > 0                &&
                    dos33Bpb.big_sectors <= partition.End - partition.Start + 1)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_DOS_3_3_BPB);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Using_DOS_3_3_BPB);
                     useDos33Bpb     = true;
                     minBootNearJump = 0x22;
                 }
@@ -301,12 +301,12 @@ public sealed partial class FAT
                        Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    " ||
                        partition.Type is "GEM" or "BGM")
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_Atari_BPB);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Using_Atari_BPB);
                         useAtariBpb = true;
                     }
                     else
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_DOS_3_3_BPB);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Using_DOS_3_3_BPB);
                         useDos33Bpb     = true;
                         minBootNearJump = 0x22;
                     }
@@ -316,7 +316,7 @@ public sealed partial class FAT
                     if(dos32Bpb.hsectors                    <= partition.Start &&
                        dos32Bpb.hsectors + dos32Bpb.sectors == dos32Bpb.total_sectors)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_DOS_3_2_BPB);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Using_DOS_3_2_BPB);
                         useDos32Bpb     = true;
                         minBootNearJump = 0x1E;
                     }
@@ -327,12 +327,12 @@ public sealed partial class FAT
                            atariBpb.jump[1]                            == 0x00 &&
                            Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    ")
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_Atari_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_Atari_BPB);
                             useAtariBpb = true;
                         }
                         else
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_DOS_3_0_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_DOS_3_0_BPB);
                             useDos3Bpb      = true;
                             minBootNearJump = 0x1C;
                         }
@@ -344,12 +344,12 @@ public sealed partial class FAT
                            atariBpb.jump[1]                            == 0x00 &&
                            Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    ")
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_Atari_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_Atari_BPB);
                             useAtariBpb = true;
                         }
                         else
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_DOS_2_0_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_DOS_2_0_BPB);
                             useDos2Bpb      = true;
                             minBootNearJump = 0x16;
                         }
@@ -419,7 +419,7 @@ public sealed partial class FAT
                fat1Sector0[1]          == 0xFF &&
                validRootDir)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_DEC_Rainbow_hardcoded_BPB);
+                AaruConsole.Debug(MODULE_NAME, Localization.Using_DEC_Rainbow_hardcoded_BPB);
                 fakeBpb.bps       = 512;
                 fakeBpb.spc       = 1;
                 fakeBpb.rsectors  = 20;
@@ -456,7 +456,7 @@ public sealed partial class FAT
                 case 0xE5:
                     if(imagePlugin.Info is { Sectors: 2002, SectorSize: 128 })
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_hardcoded_BPB);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Using_hardcoded_BPB);
                         fakeBpb.bps      = 128;
                         fakeBpb.spc      = 4;
                         fakeBpb.rsectors = 1;
@@ -475,7 +475,7 @@ public sealed partial class FAT
                     switch(imagePlugin.Info.Sectors)
                     {
                         case 4004 when imagePlugin.Info.SectorSize == 128:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_hardcoded_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_hardcoded_BPB);
                             fakeBpb.bps      = 128;
                             fakeBpb.spc      = 4;
                             fakeBpb.rsectors = 4;
@@ -490,7 +490,7 @@ public sealed partial class FAT
 
                             break;
                         case 2002 when imagePlugin.Info.SectorSize == 128:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_hardcoded_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_hardcoded_BPB);
                             fakeBpb.bps      = 128;
                             fakeBpb.spc      = 4;
                             fakeBpb.rsectors = 4;
@@ -511,7 +511,7 @@ public sealed partial class FAT
                     switch(imagePlugin.Info.Sectors)
                     {
                         case 320 when imagePlugin.Info.SectorSize == 512:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_hardcoded_BPB_for_5_25_SSDD);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_hardcoded_BPB_for_5_25_SSDD);
                             fakeBpb.bps      = 512;
                             fakeBpb.spc      = 1;
                             fakeBpb.rsectors = 1;
@@ -526,7 +526,7 @@ public sealed partial class FAT
 
                             break;
                         case 2002 when imagePlugin.Info.SectorSize == 128:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_hardcoded_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_hardcoded_BPB);
                             fakeBpb.bps      = 128;
                             fakeBpb.spc      = 4;
                             fakeBpb.rsectors = 1;
@@ -541,7 +541,7 @@ public sealed partial class FAT
 
                             break;
                         case 1232 when imagePlugin.Info.SectorSize == 1024:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_hardcoded_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_hardcoded_BPB);
                             fakeBpb.bps      = 1024;
                             fakeBpb.spc      = 1;
                             fakeBpb.rsectors = 1;
@@ -556,7 +556,7 @@ public sealed partial class FAT
 
                             break;
                         case 616 when imagePlugin.Info.SectorSize == 1024:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_hardcoded_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_hardcoded_BPB);
                             fakeBpb.bps      = 1024;
                             fakeBpb.spc      = 1;
                             fakeBpb.rsectors = 1;
@@ -570,7 +570,7 @@ public sealed partial class FAT
 
                             break;
                         case 720 when imagePlugin.Info.SectorSize == 128:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_hardcoded_BPB);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_hardcoded_BPB);
                             fakeBpb.bps      = 128;
                             fakeBpb.spc      = 2;
                             fakeBpb.rsectors = 54;
@@ -585,7 +585,7 @@ public sealed partial class FAT
 
                             break;
                         case 640 when imagePlugin.Info.SectorSize == 512:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_hardcoded_BPB_for_5_25_DSDD);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Using_hardcoded_BPB_for_5_25_DSDD);
                             fakeBpb.bps      = 512;
                             fakeBpb.spc      = 2;
                             fakeBpb.rsectors = 1;
@@ -605,7 +605,7 @@ public sealed partial class FAT
                 case 0xFF:
                     if(imagePlugin.Info is { Sectors: 640, SectorSize: 512 })
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Using_hardcoded_BPB_for_5_25_DSDD);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Using_hardcoded_BPB_for_5_25_DSDD);
                         fakeBpb.bps      = 512;
                         fakeBpb.spc      = 2;
                         fakeBpb.rsectors = 1;
diff --git a/Aaru.Filesystems/FAT/Dir.cs b/Aaru.Filesystems/FAT/Dir.cs
index 7a350608a..52a8492b1 100644
--- a/Aaru.Filesystems/FAT/Dir.cs
+++ b/Aaru.Filesystems/FAT/Dir.cs
@@ -239,7 +239,7 @@ public sealed partial class FAT
 
                 if(name == "" && extension == "")
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_empty_filename_in_0, path);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_empty_filename_in_0, path);
 
                     if(!_debug || dirent is { size: > 0, start_cluster: 0 }) continue; // Skip invalid name
 
diff --git a/Aaru.Filesystems/FAT/Info.cs b/Aaru.Filesystems/FAT/Info.cs
index f8635f69d..baf3f0bf6 100644
--- a/Aaru.Filesystems/FAT/Info.cs
+++ b/Aaru.Filesystems/FAT/Info.cs
@@ -86,10 +86,10 @@ public sealed partial class FAT
 
         ulong expectedClusters = humanBpb.bpc > 0 ? partition.Size / humanBpb.bpc : 0;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "Human bpc = {0}",               humanBpb.bpc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "Human clusters = {0}",          humanBpb.clusters);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "Human big_clusters = {0}",      humanBpb.big_clusters);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "Human expected clusters = {0}", expectedClusters);
+        AaruConsole.Debug(MODULE_NAME, "Human bpc = {0}",               humanBpb.bpc);
+        AaruConsole.Debug(MODULE_NAME, "Human clusters = {0}",          humanBpb.clusters);
+        AaruConsole.Debug(MODULE_NAME, "Human big_clusters = {0}",      humanBpb.big_clusters);
+        AaruConsole.Debug(MODULE_NAME, "Human expected clusters = {0}", expectedClusters);
 
         // Check clusters for Human68k are correct
         bool humanClustersCorrect = humanBpb.clusters           == 0
@@ -117,9 +117,9 @@ public sealed partial class FAT
         // Check correct branch for Human68k
         bool humanBranchCorrect = bpbSector[0] == 0x60 && bpbSector[1] >= 0x20 && bpbSector[1] < 0xFE;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "humanClustersCorrect = {0}", humanClustersCorrect);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "humanOemCorrect = {0}",      humanOemCorrect);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "humanBranchCorrect = {0}",   humanBranchCorrect);
+        AaruConsole.Debug(MODULE_NAME, "humanClustersCorrect = {0}", humanClustersCorrect);
+        AaruConsole.Debug(MODULE_NAME, "humanOemCorrect = {0}",      humanOemCorrect);
+        AaruConsole.Debug(MODULE_NAME, "humanBranchCorrect = {0}",   humanBranchCorrect);
 
         // If all Human68k checks are correct, it is a Human68k FAT16
         if(humanClustersCorrect && humanOemCorrect && humanBranchCorrect && expectedClusters > 0) return true;
@@ -167,25 +167,25 @@ public sealed partial class FAT
 
         string oemString = Encoding.ASCII.GetString(dosOem);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "atari_oem_correct = {0}",     atariOemCorrect);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dos_oem_correct = {0}",       dosOemCorrect);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bps = {0}",                   bps);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bits in bps = {0}",           bitsInBps);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "spc = {0}",                   spc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "correct_spc = {0}",           correctSpc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "reserved_secs = {0}",         reservedSecs);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fats_no = {0}",               numberOfFats);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "root_entries = {0}",          rootEntries);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sectors = {0}",               sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "media_descriptor = 0x{0:X2}", mediaDescriptor);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fat_sectors = {0}",           fatSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "msx_id = \"{0}\"",            msxString);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "big_sectors = {0}",           bigSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb_signature = 0x{0:X2}",    bpbSignature);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fat32_signature = 0x{0:X2}",  fat32Signature);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fat32_id = \"{0}\"",          fat32String);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "huge_sectors = {0}",          hugeSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fat_id = 0x{0:X2}",           fatId);
+        AaruConsole.Debug(MODULE_NAME, "atari_oem_correct = {0}",     atariOemCorrect);
+        AaruConsole.Debug(MODULE_NAME, "dos_oem_correct = {0}",       dosOemCorrect);
+        AaruConsole.Debug(MODULE_NAME, "bps = {0}",                   bps);
+        AaruConsole.Debug(MODULE_NAME, "bits in bps = {0}",           bitsInBps);
+        AaruConsole.Debug(MODULE_NAME, "spc = {0}",                   spc);
+        AaruConsole.Debug(MODULE_NAME, "correct_spc = {0}",           correctSpc);
+        AaruConsole.Debug(MODULE_NAME, "reserved_secs = {0}",         reservedSecs);
+        AaruConsole.Debug(MODULE_NAME, "fats_no = {0}",               numberOfFats);
+        AaruConsole.Debug(MODULE_NAME, "root_entries = {0}",          rootEntries);
+        AaruConsole.Debug(MODULE_NAME, "sectors = {0}",               sectors);
+        AaruConsole.Debug(MODULE_NAME, "media_descriptor = 0x{0:X2}", mediaDescriptor);
+        AaruConsole.Debug(MODULE_NAME, "fat_sectors = {0}",           fatSectors);
+        AaruConsole.Debug(MODULE_NAME, "msx_id = \"{0}\"",            msxString);
+        AaruConsole.Debug(MODULE_NAME, "big_sectors = {0}",           bigSectors);
+        AaruConsole.Debug(MODULE_NAME, "bpb_signature = 0x{0:X2}",    bpbSignature);
+        AaruConsole.Debug(MODULE_NAME, "fat32_signature = 0x{0:X2}",  fat32Signature);
+        AaruConsole.Debug(MODULE_NAME, "fat32_id = \"{0}\"",          fat32String);
+        AaruConsole.Debug(MODULE_NAME, "huge_sectors = {0}",          hugeSectors);
+        AaruConsole.Debug(MODULE_NAME, "fat_id = 0x{0:X2}",           fatId);
 
         ushort apricotBps             = BitConverter.ToUInt16(bpbSector, 0x50);
         byte   apricotSpc             = bpbSector[0x52];
@@ -201,15 +201,15 @@ public sealed partial class FAT
         int  bitsInApricotBps  = CountBits.Count(apricotBps);
         byte apricotPartitions = bpbSector[0x0C];
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "apricot_bps = {0}",                   apricotBps);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "apricot_spc = {0}",                   apricotSpc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "apricot_correct_spc = {0}",           apricotCorrectSpc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "apricot_reserved_secs = {0}",         apricotReservedSecs);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "apricot_fats_no = {0}",               apricotFatsNo);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "apricot_root_entries = {0}",          apricotRootEntries);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "apricot_sectors = {0}",               apricotSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "apricot_media_descriptor = 0x{0:X2}", apricotMediaDescriptor);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "apricot_fat_sectors = {0}",           apricotFatSectors);
+        AaruConsole.Debug(MODULE_NAME, "apricot_bps = {0}",                   apricotBps);
+        AaruConsole.Debug(MODULE_NAME, "apricot_spc = {0}",                   apricotSpc);
+        AaruConsole.Debug(MODULE_NAME, "apricot_correct_spc = {0}",           apricotCorrectSpc);
+        AaruConsole.Debug(MODULE_NAME, "apricot_reserved_secs = {0}",         apricotReservedSecs);
+        AaruConsole.Debug(MODULE_NAME, "apricot_fats_no = {0}",               apricotFatsNo);
+        AaruConsole.Debug(MODULE_NAME, "apricot_root_entries = {0}",          apricotRootEntries);
+        AaruConsole.Debug(MODULE_NAME, "apricot_sectors = {0}",               apricotSectors);
+        AaruConsole.Debug(MODULE_NAME, "apricot_media_descriptor = 0x{0:X2}", apricotMediaDescriptor);
+        AaruConsole.Debug(MODULE_NAME, "apricot_fat_sectors = {0}",           apricotFatSectors);
 
         // This is to support FAT partitions on hybrid ISO/USB images
         if(imagePlugin.Info.MetadataMediaType == MetadataMediaType.OpticalDisc)
@@ -376,7 +376,7 @@ public sealed partial class FAT
         byte   fat3        = fatSector[2];
         ushort fatCluster2 = (ushort)((fat2 << 8) + fat3 & 0xFFF);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "1st fat cluster 1 = {0:X3}", fatCluster2);
+        AaruConsole.Debug(MODULE_NAME, "1st fat cluster 1 = {0:X3}", fatCluster2);
 
         if(fatCluster2 < 0xFF0) return false;
 
@@ -426,7 +426,7 @@ public sealed partial class FAT
 
         if(fat2SectorNo > partition.End || fat2SectorNo == 0) return false;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Second_fat_starts_at_0, fat2SectorNo);
+        AaruConsole.Debug(MODULE_NAME, Localization.Second_fat_starts_at_0, fat2SectorNo);
 
         errno = imagePlugin.ReadSector(fat2SectorNo, out byte[] fat2Sector);
 
diff --git a/Aaru.Filesystems/FAT/Super.cs b/Aaru.Filesystems/FAT/Super.cs
index 625ee9b35..e32973c94 100644
--- a/Aaru.Filesystems/FAT/Super.cs
+++ b/Aaru.Filesystems/FAT/Super.cs
@@ -92,7 +92,7 @@ public sealed partial class FAT
                 return ErrorNumber.InvalidArgument;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_BPB);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_BPB);
 
         uint sectorsPerBpb = imagePlugin.Info.SectorSize < 512 ? 512 / imagePlugin.Info.SectorSize : 1;
 
@@ -686,7 +686,7 @@ public sealed partial class FAT
 
             if(name == "" && extension == "")
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_empty_filename_in_root_directory);
+                AaruConsole.Debug(MODULE_NAME, Localization.Found_empty_filename_in_root_directory);
 
                 if(!_debug || entry is { size: > 0, start_cluster: 0 }) continue; // Skip invalid name
 
@@ -768,7 +768,7 @@ public sealed partial class FAT
 
         if(_fat12)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_FAT12);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_FAT12);
 
             errno = imagePlugin.ReadSectors(_fatFirstSector, _sectorsPerFat, out byte[] fatBytes);
 
@@ -817,20 +817,20 @@ public sealed partial class FAT
         }
         else if(_fat16)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_FAT16);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_FAT16);
 
             errno = imagePlugin.ReadSectors(_fatFirstSector, _sectorsPerFat, out byte[] fatBytes);
 
             if(errno != ErrorNumber.NoError) return errno;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Casting_FAT);
+            AaruConsole.Debug(MODULE_NAME, Localization.Casting_FAT);
             firstFatEntries = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
 
             errno = imagePlugin.ReadSectors(_fatFirstSector + _sectorsPerFat, _sectorsPerFat, out fatBytes);
 
             if(errno != ErrorNumber.NoError) return errno;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Casting_FAT);
+            AaruConsole.Debug(MODULE_NAME, Localization.Casting_FAT);
             secondFatEntries = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
 
             if(firstFatEntries.Any(entry => entry < FAT16_RESERVED && entry > _statfs.Blocks + 2))
diff --git a/Aaru.Filesystems/FATX/Super.cs b/Aaru.Filesystems/FATX/Super.cs
index f18109e14..6ffc0a8e8 100644
--- a/Aaru.Filesystems/FATX/Super.cs
+++ b/Aaru.Filesystems/FATX/Super.cs
@@ -59,7 +59,7 @@ public sealed partial class XboxFatPlugin
 
         if(imagePlugin.Info.SectorSize < 512) return ErrorNumber.InvalidArgument;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_superblock);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_superblock);
 
         ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
 
@@ -75,14 +75,14 @@ public sealed partial class XboxFatPlugin
 
         if(_superblock.magic != FATX_MAGIC) return ErrorNumber.InvalidArgument;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    _littleEndian
                                        ? Localization.Filesystem_is_little_endian
                                        : Localization.Filesystem_is_big_endian);
 
         int logicalSectorsPerPhysicalSectors = partition.Offset == 0 && _littleEndian ? 8 : 1;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "logicalSectorsPerPhysicalSectors = {0}",
                                    logicalSectorsPerPhysicalSectors);
 
@@ -118,23 +118,23 @@ public sealed partial class XboxFatPlugin
             FreeBlocks = 0 // Requires traversing the FAT
         };
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "XmlFsType.ClusterSize: {0}",  Metadata.ClusterSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "XmlFsType.VolumeName: {0}",   Metadata.VolumeName);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "XmlFsType.VolumeSerial: {0}", Metadata.VolumeSerial);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "stat.Blocks: {0}",            _statfs.Blocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "stat.FilenameLength: {0}",    _statfs.FilenameLength);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "stat.Id: {0}",                _statfs.Id.Serial32);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "stat.Type: {0}",              _statfs.Type);
+        AaruConsole.Debug(MODULE_NAME, "XmlFsType.ClusterSize: {0}",  Metadata.ClusterSize);
+        AaruConsole.Debug(MODULE_NAME, "XmlFsType.VolumeName: {0}",   Metadata.VolumeName);
+        AaruConsole.Debug(MODULE_NAME, "XmlFsType.VolumeSerial: {0}", Metadata.VolumeSerial);
+        AaruConsole.Debug(MODULE_NAME, "stat.Blocks: {0}",            _statfs.Blocks);
+        AaruConsole.Debug(MODULE_NAME, "stat.FilenameLength: {0}",    _statfs.FilenameLength);
+        AaruConsole.Debug(MODULE_NAME, "stat.Id: {0}",                _statfs.Id.Serial32);
+        AaruConsole.Debug(MODULE_NAME, "stat.Type: {0}",              _statfs.Type);
 
         byte[] buffer;
         _fatStartSector = FAT_START / imagePlugin.Info.SectorSize + partition.Start;
         uint fatSize;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fatStartSector: {0}", _fatStartSector);
+        AaruConsole.Debug(MODULE_NAME, "fatStartSector: {0}", _fatStartSector);
 
         if(_statfs.Blocks > MAX_XFAT16_CLUSTERS)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_FAT32);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_FAT32);
 
             fatSize = (uint)((_statfs.Blocks + 1) * sizeof(uint) / imagePlugin.Info.SectorSize);
 
@@ -146,26 +146,26 @@ public sealed partial class XboxFatPlugin
 
             fatSize = (uint)(fatClusters * 4096 / imagePlugin.Info.SectorSize);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.FAT_is_0_sectors, fatSize);
+            AaruConsole.Debug(MODULE_NAME, Localization.FAT_is_0_sectors, fatSize);
 
             errno = imagePlugin.ReadSectors(_fatStartSector, fatSize, out buffer);
 
             if(errno != ErrorNumber.NoError) return errno;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Casting_FAT);
+            AaruConsole.Debug(MODULE_NAME, Localization.Casting_FAT);
             _fat32 = MemoryMarshal.Cast<byte, uint>(buffer).ToArray();
 
             if(!_littleEndian)
                 for(int i = 0; i < _fat32.Length; i++)
                     _fat32[i] = Swapping.Swap(_fat32[i]);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "fat32[0] == FATX32_ID = {0}", _fat32[0] == FATX32_ID);
+            AaruConsole.Debug(MODULE_NAME, "fat32[0] == FATX32_ID = {0}", _fat32[0] == FATX32_ID);
 
             if(_fat32[0] != FATX32_ID) return ErrorNumber.InvalidArgument;
         }
         else
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_FAT16);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_FAT16);
 
             fatSize = (uint)((_statfs.Blocks + 1) * sizeof(ushort) / imagePlugin.Info.SectorSize);
 
@@ -177,20 +177,20 @@ public sealed partial class XboxFatPlugin
 
             fatSize = (uint)(fatClusters * 4096 / imagePlugin.Info.SectorSize);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.FAT_is_0_sectors, fatSize);
+            AaruConsole.Debug(MODULE_NAME, Localization.FAT_is_0_sectors, fatSize);
 
             errno = imagePlugin.ReadSectors(_fatStartSector, fatSize, out buffer);
 
             if(errno != ErrorNumber.NoError) return errno;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Casting_FAT);
+            AaruConsole.Debug(MODULE_NAME, Localization.Casting_FAT);
             _fat16 = MemoryMarshal.Cast<byte, ushort>(buffer).ToArray();
 
             if(!_littleEndian)
                 for(int i = 0; i < _fat16.Length; i++)
                     _fat16[i] = Swapping.Swap(_fat16[i]);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "fat16[0] == FATX16_ID = {0}", _fat16[0] == FATX16_ID);
+            AaruConsole.Debug(MODULE_NAME, "fat16[0] == FATX16_ID = {0}", _fat16[0] == FATX16_ID);
 
             if(_fat16[0] != FATX16_ID) return ErrorNumber.InvalidArgument;
         }
@@ -200,9 +200,9 @@ public sealed partial class XboxFatPlugin
         _firstClusterSector = _fatStartSector + fatSize;
         _bytesPerCluster    = _sectorsPerCluster * imagePlugin.Info.SectorSize;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sectorsPerCluster = {0}",  _sectorsPerCluster);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bytesPerCluster = {0}",    _bytesPerCluster);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "firstClusterSector = {0}", _firstClusterSector);
+        AaruConsole.Debug(MODULE_NAME, "sectorsPerCluster = {0}",  _sectorsPerCluster);
+        AaruConsole.Debug(MODULE_NAME, "bytesPerCluster = {0}",    _bytesPerCluster);
+        AaruConsole.Debug(MODULE_NAME, "firstClusterSector = {0}", _firstClusterSector);
 
         uint[] rootDirectoryClusters = GetClusters(_superblock.rootDirectoryCluster);
 
@@ -210,7 +210,7 @@ public sealed partial class XboxFatPlugin
 
         byte[] rootDirectoryBuffer = new byte[_bytesPerCluster * rootDirectoryClusters.Length];
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_root_directory);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_root_directory);
 
         for(int i = 0; i < rootDirectoryClusters.Length; i++)
         {
diff --git a/Aaru.Filesystems/FFS/Info.cs b/Aaru.Filesystems/FFS/Info.cs
index 8d7a8a7da..aec053704 100644
--- a/Aaru.Filesystems/FFS/Info.cs
+++ b/Aaru.Filesystems/FFS/Info.cs
@@ -239,45 +239,45 @@ public sealed partial class FFSPlugin
             sb.fs_cstotal.cs_spare[2]    = Swapping.Swap(sb.fs_cstotal.cs_spare[2]);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sb offset: 0x{0:X8}",    sb_offset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_rlink: 0x{0:X8}",     sb.fs_rlink);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_sblkno: 0x{0:X8}",    sb.fs_sblkno);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_cblkno: 0x{0:X8}",    sb.fs_cblkno);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_iblkno: 0x{0:X8}",    sb.fs_iblkno);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_dblkno: 0x{0:X8}",    sb.fs_dblkno);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_size: 0x{0:X8}",      sb.fs_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_dsize: 0x{0:X8}",     sb.fs_dsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_ncg: 0x{0:X8}",       sb.fs_ncg);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_bsize: 0x{0:X8}",     sb.fs_bsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_fsize: 0x{0:X8}",     sb.fs_fsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_frag: 0x{0:X8}",      sb.fs_frag);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_minfree: 0x{0:X8}",   sb.fs_minfree);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_bmask: 0x{0:X8}",     sb.fs_bmask);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_fmask: 0x{0:X8}",     sb.fs_fmask);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_bshift: 0x{0:X8}",    sb.fs_bshift);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_fshift: 0x{0:X8}",    sb.fs_fshift);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_maxcontig: 0x{0:X8}", sb.fs_maxcontig);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_maxbpg: 0x{0:X8}",    sb.fs_maxbpg);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_fragshift: 0x{0:X8}", sb.fs_fragshift);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_fsbtodb: 0x{0:X8}",   sb.fs_fsbtodb);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_sbsize: 0x{0:X8}",    sb.fs_sbsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_csmask: 0x{0:X8}",    sb.fs_csmask);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_csshift: 0x{0:X8}",   sb.fs_csshift);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_nindir: 0x{0:X8}",    sb.fs_nindir);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_inopb: 0x{0:X8}",     sb.fs_inopb);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_optim: 0x{0:X8}",     sb.fs_optim);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_id_1: 0x{0:X8}",      sb.fs_id_1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_id_2: 0x{0:X8}",      sb.fs_id_2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_csaddr: 0x{0:X8}",    sb.fs_csaddr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_cssize: 0x{0:X8}",    sb.fs_cssize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_cgsize: 0x{0:X8}",    sb.fs_cgsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_ipg: 0x{0:X8}",       sb.fs_ipg);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_fpg: 0x{0:X8}",       sb.fs_fpg);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_fmod: 0x{0:X2}",      sb.fs_fmod);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_clean: 0x{0:X2}",     sb.fs_clean);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_ronly: 0x{0:X2}",     sb.fs_ronly);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_flags: 0x{0:X2}",     sb.fs_flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fs_magic: 0x{0:X8}",     sb.fs_magic);
+        AaruConsole.Debug(MODULE_NAME, "sb offset: 0x{0:X8}",    sb_offset);
+        AaruConsole.Debug(MODULE_NAME, "fs_rlink: 0x{0:X8}",     sb.fs_rlink);
+        AaruConsole.Debug(MODULE_NAME, "fs_sblkno: 0x{0:X8}",    sb.fs_sblkno);
+        AaruConsole.Debug(MODULE_NAME, "fs_cblkno: 0x{0:X8}",    sb.fs_cblkno);
+        AaruConsole.Debug(MODULE_NAME, "fs_iblkno: 0x{0:X8}",    sb.fs_iblkno);
+        AaruConsole.Debug(MODULE_NAME, "fs_dblkno: 0x{0:X8}",    sb.fs_dblkno);
+        AaruConsole.Debug(MODULE_NAME, "fs_size: 0x{0:X8}",      sb.fs_size);
+        AaruConsole.Debug(MODULE_NAME, "fs_dsize: 0x{0:X8}",     sb.fs_dsize);
+        AaruConsole.Debug(MODULE_NAME, "fs_ncg: 0x{0:X8}",       sb.fs_ncg);
+        AaruConsole.Debug(MODULE_NAME, "fs_bsize: 0x{0:X8}",     sb.fs_bsize);
+        AaruConsole.Debug(MODULE_NAME, "fs_fsize: 0x{0:X8}",     sb.fs_fsize);
+        AaruConsole.Debug(MODULE_NAME, "fs_frag: 0x{0:X8}",      sb.fs_frag);
+        AaruConsole.Debug(MODULE_NAME, "fs_minfree: 0x{0:X8}",   sb.fs_minfree);
+        AaruConsole.Debug(MODULE_NAME, "fs_bmask: 0x{0:X8}",     sb.fs_bmask);
+        AaruConsole.Debug(MODULE_NAME, "fs_fmask: 0x{0:X8}",     sb.fs_fmask);
+        AaruConsole.Debug(MODULE_NAME, "fs_bshift: 0x{0:X8}",    sb.fs_bshift);
+        AaruConsole.Debug(MODULE_NAME, "fs_fshift: 0x{0:X8}",    sb.fs_fshift);
+        AaruConsole.Debug(MODULE_NAME, "fs_maxcontig: 0x{0:X8}", sb.fs_maxcontig);
+        AaruConsole.Debug(MODULE_NAME, "fs_maxbpg: 0x{0:X8}",    sb.fs_maxbpg);
+        AaruConsole.Debug(MODULE_NAME, "fs_fragshift: 0x{0:X8}", sb.fs_fragshift);
+        AaruConsole.Debug(MODULE_NAME, "fs_fsbtodb: 0x{0:X8}",   sb.fs_fsbtodb);
+        AaruConsole.Debug(MODULE_NAME, "fs_sbsize: 0x{0:X8}",    sb.fs_sbsize);
+        AaruConsole.Debug(MODULE_NAME, "fs_csmask: 0x{0:X8}",    sb.fs_csmask);
+        AaruConsole.Debug(MODULE_NAME, "fs_csshift: 0x{0:X8}",   sb.fs_csshift);
+        AaruConsole.Debug(MODULE_NAME, "fs_nindir: 0x{0:X8}",    sb.fs_nindir);
+        AaruConsole.Debug(MODULE_NAME, "fs_inopb: 0x{0:X8}",     sb.fs_inopb);
+        AaruConsole.Debug(MODULE_NAME, "fs_optim: 0x{0:X8}",     sb.fs_optim);
+        AaruConsole.Debug(MODULE_NAME, "fs_id_1: 0x{0:X8}",      sb.fs_id_1);
+        AaruConsole.Debug(MODULE_NAME, "fs_id_2: 0x{0:X8}",      sb.fs_id_2);
+        AaruConsole.Debug(MODULE_NAME, "fs_csaddr: 0x{0:X8}",    sb.fs_csaddr);
+        AaruConsole.Debug(MODULE_NAME, "fs_cssize: 0x{0:X8}",    sb.fs_cssize);
+        AaruConsole.Debug(MODULE_NAME, "fs_cgsize: 0x{0:X8}",    sb.fs_cgsize);
+        AaruConsole.Debug(MODULE_NAME, "fs_ipg: 0x{0:X8}",       sb.fs_ipg);
+        AaruConsole.Debug(MODULE_NAME, "fs_fpg: 0x{0:X8}",       sb.fs_fpg);
+        AaruConsole.Debug(MODULE_NAME, "fs_fmod: 0x{0:X2}",      sb.fs_fmod);
+        AaruConsole.Debug(MODULE_NAME, "fs_clean: 0x{0:X2}",     sb.fs_clean);
+        AaruConsole.Debug(MODULE_NAME, "fs_ronly: 0x{0:X2}",     sb.fs_ronly);
+        AaruConsole.Debug(MODULE_NAME, "fs_flags: 0x{0:X2}",     sb.fs_flags);
+        AaruConsole.Debug(MODULE_NAME, "fs_magic: 0x{0:X8}",     sb.fs_magic);
 
         if(sb.fs_magic == UFS2_MAGIC)
             fs_type_ufs2 = true;
diff --git a/Aaru.Filesystems/Fossil/Info.cs b/Aaru.Filesystems/Fossil/Info.cs
index 5a544e557..b1b984924 100644
--- a/Aaru.Filesystems/Fossil/Info.cs
+++ b/Aaru.Filesystems/Fossil/Info.cs
@@ -55,7 +55,7 @@ public sealed partial class Fossil
 
         Header hdr = Marshal.ByteArrayToStructureBigEndian<Header>(sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.magic_at_0_expected_1, hdr.magic, FOSSIL_HDR_MAGIC);
+        AaruConsole.Debug(MODULE_NAME, Localization.magic_at_0_expected_1, hdr.magic, FOSSIL_HDR_MAGIC);
 
         return hdr.magic == FOSSIL_HDR_MAGIC;
     }
@@ -79,7 +79,7 @@ public sealed partial class Fossil
 
         Header hdr = Marshal.ByteArrayToStructureBigEndian<Header>(sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.magic_at_0_expected_1, hdr.magic, FOSSIL_HDR_MAGIC);
+        AaruConsole.Debug(MODULE_NAME, Localization.magic_at_0_expected_1, hdr.magic, FOSSIL_HDR_MAGIC);
 
         var sb = new StringBuilder();
 
@@ -105,7 +105,7 @@ public sealed partial class Fossil
             imagePlugin.ReadSector(sbLocation, out sector);
             SuperBlock fsb = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.magic_0_expected_1, fsb.magic, FOSSIL_SB_MAGIC);
+            AaruConsole.Debug(MODULE_NAME, Localization.magic_0_expected_1, fsb.magic, FOSSIL_SB_MAGIC);
 
             if(fsb.magic == FOSSIL_SB_MAGIC)
             {
diff --git a/Aaru.Filesystems/HPOFS/Info.cs b/Aaru.Filesystems/HPOFS/Info.cs
index b3b0ed9b9..12493aae9 100644
--- a/Aaru.Filesystems/HPOFS/Info.cs
+++ b/Aaru.Filesystems/HPOFS/Info.cs
@@ -94,95 +94,95 @@ public sealed partial class HPOFS
         MediaInformationBlock  mib = Marshal.ByteArrayToStructureBigEndian<MediaInformationBlock>(medInfoSector);
         VolumeInformationBlock vib = Marshal.ByteArrayToStructureBigEndian<VolumeInformationBlock>(volInfoSector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.oem_name = \"{0}\"", StringHandlers.CToString(bpb.oem_name));
+        AaruConsole.Debug(MODULE_NAME, "bpb.oem_name = \"{0}\"", StringHandlers.CToString(bpb.oem_name));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.bps = {0}",            bpb.bps);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.spc = {0}",            bpb.spc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.rsectors = {0}",       bpb.rsectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.fats_no = {0}",        bpb.fats_no);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.root_ent = {0}",       bpb.root_ent);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.sectors = {0}",        bpb.sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.media = 0x{0:X2}",     bpb.media);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.spfat = {0}",          bpb.spfat);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.sptrk = {0}",          bpb.sptrk);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.heads = {0}",          bpb.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.hsectors = {0}",       bpb.hsectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.big_sectors = {0}",    bpb.big_sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.drive_no = 0x{0:X2}",  bpb.drive_no);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.nt_flags = {0}",       bpb.nt_flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.signature = 0x{0:X2}", bpb.signature);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.serial_no = 0x{0:X8}", bpb.serial_no);
+        AaruConsole.Debug(MODULE_NAME, "bpb.bps = {0}",            bpb.bps);
+        AaruConsole.Debug(MODULE_NAME, "bpb.spc = {0}",            bpb.spc);
+        AaruConsole.Debug(MODULE_NAME, "bpb.rsectors = {0}",       bpb.rsectors);
+        AaruConsole.Debug(MODULE_NAME, "bpb.fats_no = {0}",        bpb.fats_no);
+        AaruConsole.Debug(MODULE_NAME, "bpb.root_ent = {0}",       bpb.root_ent);
+        AaruConsole.Debug(MODULE_NAME, "bpb.sectors = {0}",        bpb.sectors);
+        AaruConsole.Debug(MODULE_NAME, "bpb.media = 0x{0:X2}",     bpb.media);
+        AaruConsole.Debug(MODULE_NAME, "bpb.spfat = {0}",          bpb.spfat);
+        AaruConsole.Debug(MODULE_NAME, "bpb.sptrk = {0}",          bpb.sptrk);
+        AaruConsole.Debug(MODULE_NAME, "bpb.heads = {0}",          bpb.heads);
+        AaruConsole.Debug(MODULE_NAME, "bpb.hsectors = {0}",       bpb.hsectors);
+        AaruConsole.Debug(MODULE_NAME, "bpb.big_sectors = {0}",    bpb.big_sectors);
+        AaruConsole.Debug(MODULE_NAME, "bpb.drive_no = 0x{0:X2}",  bpb.drive_no);
+        AaruConsole.Debug(MODULE_NAME, "bpb.nt_flags = {0}",       bpb.nt_flags);
+        AaruConsole.Debug(MODULE_NAME, "bpb.signature = 0x{0:X2}", bpb.signature);
+        AaruConsole.Debug(MODULE_NAME, "bpb.serial_no = 0x{0:X8}", bpb.serial_no);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "bpb.volume_label = \"{0}\"",
                                    StringHandlers.SpacePaddedToString(bpb.volume_label));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.fs_type = \"{0}\"", StringHandlers.CToString(bpb.fs_type));
+        AaruConsole.Debug(MODULE_NAME, "bpb.fs_type = \"{0}\"", StringHandlers.CToString(bpb.fs_type));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "bpb.boot_code is empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(bpb.boot_code));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.unknown = {0}",     bpb.unknown);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.unknown2 = {0}",    bpb.unknown2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bpb.signature2 = {0}",  bpb.signature2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.blockId = \"{0}\"", StringHandlers.CToString(mib.blockId));
+        AaruConsole.Debug(MODULE_NAME, "bpb.unknown = {0}",     bpb.unknown);
+        AaruConsole.Debug(MODULE_NAME, "bpb.unknown2 = {0}",    bpb.unknown2);
+        AaruConsole.Debug(MODULE_NAME, "bpb.signature2 = {0}",  bpb.signature2);
+        AaruConsole.Debug(MODULE_NAME, "mib.blockId = \"{0}\"", StringHandlers.CToString(mib.blockId));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "mib.volumeLabel = \"{0}\"",
                                    StringHandlers.SpacePaddedToString(mib.volumeLabel));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "mib.comment = \"{0}\"",
                                    StringHandlers.SpacePaddedToString(mib.comment));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.serial = 0x{0:X8}", mib.serial);
+        AaruConsole.Debug(MODULE_NAME, "mib.serial = 0x{0:X8}", mib.serial);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "mib.creationTimestamp = {0}",
                                    DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.codepageType = {0}", mib.codepageType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.codepage = {0}",     mib.codepage);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.rps = {0}",          mib.rps);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.bps = {0}",          mib.bps);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.bpc = {0}",          mib.bpc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.unknown2 = {0}",     mib.unknown2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.sectors = {0}",      mib.sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.unknown3 = {0}",     mib.unknown3);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.unknown4 = {0}",     mib.unknown4);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.major = {0}",        mib.major);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.minor = {0}",        mib.minor);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.unknown5 = {0}",     mib.unknown5);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mib.unknown6 = {0}",     mib.unknown6);
+        AaruConsole.Debug(MODULE_NAME, "mib.codepageType = {0}", mib.codepageType);
+        AaruConsole.Debug(MODULE_NAME, "mib.codepage = {0}",     mib.codepage);
+        AaruConsole.Debug(MODULE_NAME, "mib.rps = {0}",          mib.rps);
+        AaruConsole.Debug(MODULE_NAME, "mib.bps = {0}",          mib.bps);
+        AaruConsole.Debug(MODULE_NAME, "mib.bpc = {0}",          mib.bpc);
+        AaruConsole.Debug(MODULE_NAME, "mib.unknown2 = {0}",     mib.unknown2);
+        AaruConsole.Debug(MODULE_NAME, "mib.sectors = {0}",      mib.sectors);
+        AaruConsole.Debug(MODULE_NAME, "mib.unknown3 = {0}",     mib.unknown3);
+        AaruConsole.Debug(MODULE_NAME, "mib.unknown4 = {0}",     mib.unknown4);
+        AaruConsole.Debug(MODULE_NAME, "mib.major = {0}",        mib.major);
+        AaruConsole.Debug(MODULE_NAME, "mib.minor = {0}",        mib.minor);
+        AaruConsole.Debug(MODULE_NAME, "mib.unknown5 = {0}",     mib.unknown5);
+        AaruConsole.Debug(MODULE_NAME, "mib.unknown6 = {0}",     mib.unknown6);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "mib.filler is empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(mib.filler));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vib.blockId = \"{0}\"", StringHandlers.CToString(vib.blockId));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vib.unknown = {0}",     vib.unknown);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vib.unknown2 = {0}",    vib.unknown2);
+        AaruConsole.Debug(MODULE_NAME, "vib.blockId = \"{0}\"", StringHandlers.CToString(vib.blockId));
+        AaruConsole.Debug(MODULE_NAME, "vib.unknown = {0}",     vib.unknown);
+        AaruConsole.Debug(MODULE_NAME, "vib.unknown2 = {0}",    vib.unknown2);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "vib.unknown3 is empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(vib.unknown3));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "vib.unknown4 = \"{0}\"",
                                    StringHandlers.SpacePaddedToString(vib.unknown4));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vib.owner = \"{0}\"", StringHandlers.SpacePaddedToString(vib.owner));
+        AaruConsole.Debug(MODULE_NAME, "vib.owner = \"{0}\"", StringHandlers.SpacePaddedToString(vib.owner));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "vib.unknown5 = \"{0}\"",
                                    StringHandlers.SpacePaddedToString(vib.unknown5));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vib.unknown6 = {0}",    vib.unknown6);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vib.percentFull = {0}", vib.percentFull);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vib.unknown7 = {0}",    vib.unknown7);
+        AaruConsole.Debug(MODULE_NAME, "vib.unknown6 = {0}",    vib.unknown6);
+        AaruConsole.Debug(MODULE_NAME, "vib.percentFull = {0}", vib.percentFull);
+        AaruConsole.Debug(MODULE_NAME, "vib.unknown7 = {0}",    vib.unknown7);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "vib.filler is empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(vib.filler));
 
diff --git a/Aaru.Filesystems/ISO9660/File.cs b/Aaru.Filesystems/ISO9660/File.cs
index ebfaf4854..1de0118fb 100644
--- a/Aaru.Filesystems/ISO9660/File.cs
+++ b/Aaru.Filesystems/ISO9660/File.cs
@@ -170,8 +170,8 @@ public sealed partial class ISO9660
         }
         catch(Exception ex)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Exception_reading_CD_i_audio_file);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Debug(MODULE_NAME, Localization.Exception_reading_CD_i_audio_file);
+            AaruConsole.Exception(ex);
 
             read = 0;
 
diff --git a/Aaru.Filesystems/ISO9660/Info.cs b/Aaru.Filesystems/ISO9660/Info.cs
index cba8ddc3d..95cf9b39f 100644
--- a/Aaru.Filesystems/ISO9660/Info.cs
+++ b/Aaru.Filesystems/ISO9660/Info.cs
@@ -73,8 +73,8 @@ public sealed partial class ISO9660
         Array.Copy(vdSector, 0x001 + xaOff, vdMagic, 0, 5);
         Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "VDMagic = {0}", Encoding.ASCII.GetString(vdMagic));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "HSMagic = {0}", Encoding.ASCII.GetString(hsMagic));
+        AaruConsole.Debug(MODULE_NAME, "VDMagic = {0}", Encoding.ASCII.GetString(vdMagic));
+        AaruConsole.Debug(MODULE_NAME, "HSMagic = {0}", Encoding.ASCII.GetString(hsMagic));
 
         return Encoding.ASCII.GetString(vdMagic) == ISO_MAGIC         ||
                Encoding.ASCII.GetString(hsMagic) == HIGH_SIERRA_MAGIC ||
@@ -126,10 +126,10 @@ public sealed partial class ISO9660
 
         while(true)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Processing_VD_loop_no_0, counter);
+            AaruConsole.Debug(MODULE_NAME, Localization.Processing_VD_loop_no_0, counter);
 
             // Seek to Volume Descriptor
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_sector_0, 16 + counter + partition.Start);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_sector_0, 16 + counter + partition.Start);
             errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSectorTmp);
 
             if(errno != ErrorNumber.NoError) return;
@@ -138,7 +138,7 @@ public sealed partial class ISO9660
             Array.Copy(vdSectorTmp, xaOff, vdSector, 0, vdSector.Length);
 
             byte vdType = vdSector[0 + hsOff]; // Volume Descriptor Type, should be 1 or 2.
-            AaruConsole.DebugWriteLine(MODULE_NAME, "VDType = {0}", vdType);
+            AaruConsole.Debug(MODULE_NAME, "VDType = {0}", vdType);
 
             if(vdType == 255) // Supposedly we are in the PVD.
             {
@@ -704,9 +704,9 @@ public sealed partial class ISO9660
 
             initialEntry.boot_type = (ElToritoEmulation)((byte)initialEntry.boot_type & 0xF);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "initialEntry.load_rba = {0}", initialEntry.load_rba);
+            AaruConsole.Debug(MODULE_NAME, "initialEntry.load_rba = {0}", initialEntry.load_rba);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "initialEntry.sector_count = {0}", initialEntry.sector_count);
+            AaruConsole.Debug(MODULE_NAME, "initialEntry.sector_count = {0}", initialEntry.sector_count);
 
             byte[] bootImage = null;
 
diff --git a/Aaru.Filesystems/ISO9660/Mode2.cs b/Aaru.Filesystems/ISO9660/Mode2.cs
index 782dcfa9b..e0abb9c73 100644
--- a/Aaru.Filesystems/ISO9660/Mode2.cs
+++ b/Aaru.Filesystems/ISO9660/Mode2.cs
@@ -69,19 +69,19 @@ public sealed partial class ISO9660
                 switch(data.Length)
                 {
                     case 2048:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.tor_Sector_0_Cooked_Mode_zero_one_Mode_two_Form_one,
                                                    realSector);
 
                         break;
                     case 2324:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.tor_Sector_0_Cooked_Mode_two_Form_two,
                                                    realSector);
 
                         break;
                     case 2336:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .tor_Sector_0_Cooked_Mode_two_Form_1_File_Number_2_Channel_Number_3_Submode_4_Coding_Information_5,
                                                    realSector,
@@ -104,11 +104,11 @@ public sealed partial class ISO9660
                                    data[9]  != 0xFF ||
                                    data[10] != 0xFF ||
                                    data[11] != 0x00:
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.tor_Sector_0_Raw_Audio, realSector);
+                        AaruConsole.Debug(MODULE_NAME, Localization.tor_Sector_0_Raw_Audio, realSector);
 
                         break;
                     case 2352 when data[15] != 2:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.tor_Sector_0_1_2_3_Raw_Mode_4,
                                                    realSector,
                                                    data[12],
@@ -118,7 +118,7 @@ public sealed partial class ISO9660
 
                         break;
                     case 2352:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .tor_Sector_0_1_2_3_Raw_Mode_two_Form_4_File_Number_5_Channel_Number_6_Submode_7_Coding_Information_8,
                                                    realSector,
@@ -168,19 +168,19 @@ public sealed partial class ISO9660
                     switch(data.Length)
                     {
                         case 2048:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.tor_Sector_0_Cooked_Mode_zero_one_Mode_two_Form_one,
                                                        dstSector);
 
                             break;
                         case 2324:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.tor_Sector_0_Cooked_Mode_two_Form_two,
                                                        dstSector);
 
                             break;
                         case 2336:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .tor_Sector_0_Cooked_Mode_two_Form_1_File_Number_2_Channel_Number_3_Submode_4_Coding_Information_5,
                                                        dstSector,
@@ -203,11 +203,11 @@ public sealed partial class ISO9660
                                        data[9]  != 0xFF ||
                                        data[10] != 0xFF ||
                                        data[11] != 0x00:
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.tor_Sector_0_Raw_Audio, dstSector);
+                            AaruConsole.Debug(MODULE_NAME, Localization.tor_Sector_0_Raw_Audio, dstSector);
 
                             break;
                         case 2352 when data[15] != 2:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.tor_Sector_0_1_2_3_Raw_Mode_4,
                                                        dstSector,
                                                        data[12],
@@ -217,7 +217,7 @@ public sealed partial class ISO9660
 
                             break;
                         case 2352:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .tor_Sector_0_1_2_3_Raw_Mode_two_Form_4_File_Number_5_Channel_Number_6_Submode_7_Coding_Information_8,
                                                        dstSector,
diff --git a/Aaru.Filesystems/ISO9660/Super.cs b/Aaru.Filesystems/ISO9660/Super.cs
index 121348130..4ff5b02b9 100644
--- a/Aaru.Filesystems/ISO9660/Super.cs
+++ b/Aaru.Filesystems/ISO9660/Super.cs
@@ -132,10 +132,10 @@ public sealed partial class ISO9660
 
         while(true)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Processing_VD_loop_no_0, counter);
+            AaruConsole.Debug(MODULE_NAME, Localization.Processing_VD_loop_no_0, counter);
 
             // Seek to Volume Descriptor
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_sector_0, 16 + counter + partition.Start);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_sector_0, 16 + counter + partition.Start);
             errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSectorTmp);
 
             if(errno != ErrorNumber.NoError) return errno;
@@ -144,7 +144,7 @@ public sealed partial class ISO9660
             Array.Copy(vdSectorTmp, xaOff, vdSector, 0, vdSector.Length);
 
             byte vdType = vdSector[0 + hsOff]; // Volume Descriptor Type, should be 1 or 2.
-            AaruConsole.DebugWriteLine(MODULE_NAME, "VDType = {0}", vdType);
+            AaruConsole.Debug(MODULE_NAME, "VDType = {0}", vdType);
 
             if(vdType == 255) // Supposedly we are in the PVD.
             {
@@ -207,7 +207,7 @@ public sealed partial class ISO9660
                                 jolietvd = svd;
                             else
                             {
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Found_unknown_supplementary_volume_descriptor);
                             }
                         }
@@ -248,7 +248,7 @@ public sealed partial class ISO9660
 
         if(pvd == null && hsvd == null && fsvd == null)
         {
-            AaruConsole.ErrorWriteLine(Localization.ERROR_Could_not_find_primary_volume_descriptor);
+            AaruConsole.Error(Localization.ERROR_Could_not_find_primary_volume_descriptor);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -351,7 +351,7 @@ public sealed partial class ISO9660
 
             if(_pathTable?.Length > 1 && rootLocation != _pathTable[0].Extent)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization
                                               .Path_table_and_PVD_do_not_point_to_the_same_location_for_the_root_directory);
 
@@ -378,7 +378,7 @@ public sealed partial class ISO9660
 
                 if(pvdWrongRoot)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization
                                                   .PVD_does_not_point_to_correct_root_directory_checking_path_table);
 
@@ -405,7 +405,7 @@ public sealed partial class ISO9660
 
                     if(pathTableWrongRoot)
                     {
-                        AaruConsole.ErrorWriteLine(Localization.Cannot_find_root_directory);
+                        AaruConsole.Error(Localization.Cannot_find_root_directory);
 
                         return ErrorNumber.InvalidArgument;
                     }
diff --git a/Aaru.Filesystems/LIF/Info.cs b/Aaru.Filesystems/LIF/Info.cs
index 42120cbe7..67d04401c 100644
--- a/Aaru.Filesystems/LIF/Info.cs
+++ b/Aaru.Filesystems/LIF/Info.cs
@@ -53,7 +53,7 @@ public sealed partial class LIF
         if(errno != ErrorNumber.NoError) return false;
 
         SystemBlock lifSb = Marshal.ByteArrayToStructureBigEndian<SystemBlock>(sector);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.magic_0_expected_1, lifSb.magic, LIF_MAGIC);
+        AaruConsole.Debug(MODULE_NAME, Localization.magic_0_expected_1, lifSb.magic, LIF_MAGIC);
 
         return lifSb.magic == LIF_MAGIC;
     }
diff --git a/Aaru.Filesystems/LisaFS/Extent.cs b/Aaru.Filesystems/LisaFS/Extent.cs
index bd3c6db94..366d9ad49 100644
--- a/Aaru.Filesystems/LisaFS/Extent.cs
+++ b/Aaru.Filesystems/LisaFS/Extent.cs
@@ -190,34 +190,34 @@ public sealed partial class LisaFS
 
         if(_printedExtents.Contains(fileId)) return ErrorNumber.NoError;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].filenameLen = {1}", fileId, file.filenameLen);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].filenameLen = {1}", fileId, file.filenameLen);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ExtentFile[{0}].filename = {1}",
                                    fileId,
                                    StringHandlers.CToString(file.filename, _encoding));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].unknown1 = 0x{1:X4}",  fileId, file.unknown1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].file_uid = 0x{1:X16}", fileId, file.file_uid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].unknown2 = 0x{1:X2}",  fileId, file.unknown2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].etype = 0x{1:X2}",     fileId, file.etype);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].ftype = {1}",          fileId, file.ftype);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].unknown3 = 0x{1:X2}",  fileId, file.unknown3);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].dtc = {1}",            fileId, file.dtc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].dta = {1}",            fileId, file.dta);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].dtm = {1}",            fileId, file.dtm);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].dtb = {1}",            fileId, file.dtb);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].dts = {1}",            fileId, file.dts);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].serial = {1}",         fileId, file.serial);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].unknown4 = 0x{1:X2}",  fileId, file.unknown4);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].locked = {1}",         fileId, file.locked    > 0);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].protect = {1}",        fileId, file.protect   > 0);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].master = {1}",         fileId, file.master    > 0);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].scavenged = {1}",      fileId, file.scavenged > 0);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].closed = {1}",         fileId, file.closed    > 0);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].open = {1}",           fileId, file.open      > 0);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].unknown1 = 0x{1:X4}",  fileId, file.unknown1);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].file_uid = 0x{1:X16}", fileId, file.file_uid);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].unknown2 = 0x{1:X2}",  fileId, file.unknown2);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].etype = 0x{1:X2}",     fileId, file.etype);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].ftype = {1}",          fileId, file.ftype);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].unknown3 = 0x{1:X2}",  fileId, file.unknown3);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].dtc = {1}",            fileId, file.dtc);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].dta = {1}",            fileId, file.dta);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].dtm = {1}",            fileId, file.dtm);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].dtb = {1}",            fileId, file.dtb);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].dts = {1}",            fileId, file.dts);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].serial = {1}",         fileId, file.serial);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].unknown4 = 0x{1:X2}",  fileId, file.unknown4);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].locked = {1}",         fileId, file.locked    > 0);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].protect = {1}",        fileId, file.protect   > 0);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].master = {1}",         fileId, file.master    > 0);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].scavenged = {1}",      fileId, file.scavenged > 0);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].closed = {1}",         fileId, file.closed    > 0);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].open = {1}",           fileId, file.open      > 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ExtentFile[{0}].unknown5 = 0x{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}" +
                                    "{10:X2}{11:X2}",
                                    fileId,
@@ -233,34 +233,34 @@ public sealed partial class LisaFS
                                    file.unknown5[9],
                                    file.unknown5[10]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].release = {1}", fileId, file.release);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].build = {1}",   fileId, file.build);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].release = {1}", fileId, file.release);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].build = {1}",   fileId, file.build);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].compatibility = {1}", fileId, file.compatibility);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].compatibility = {1}", fileId, file.compatibility);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].revision = {1}",      fileId, file.revision);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].unknown6 = 0x{1:X4}", fileId, file.unknown6);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].revision = {1}",      fileId, file.revision);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].unknown6 = 0x{1:X4}", fileId, file.unknown6);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ExtentFile[{0}].password_valid = {1}",
                                    fileId,
                                    file.password_valid > 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ExtentFile[{0}].password = {1}",
                                    fileId,
                                    _encoding.GetString(file.password));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ExtentFile[{0}].unknown7 = 0x{1:X2}{2:X2}{3:X2}",
                                    fileId,
                                    file.unknown7[0],
                                    file.unknown7[1],
                                    file.unknown7[2]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].overhead = {1}", fileId, file.overhead);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].overhead = {1}", fileId, file.overhead);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ExtentFile[{0}].unknown8 = 0x{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}" +
                                    "{10:X2}{11:X2}{12:X2}{13:X2}{14:X2}{15:X2}{16:X2}",
                                    fileId,
@@ -281,25 +281,25 @@ public sealed partial class LisaFS
                                    file.unknown8[14],
                                    file.unknown8[15]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].length = {1}",        fileId, file.length);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].unknown9 = 0x{1:X8}", fileId, file.unknown9);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].length = {1}",        fileId, file.length);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].unknown9 = 0x{1:X8}", fileId, file.unknown9);
 
         for(int ext = 0; ext < file.extents.Length; ext++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "ExtentFile[{0}].extents[{1}].start = {2}",
                                        fileId,
                                        ext,
                                        file.extents[ext].start);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "ExtentFile[{0}].extents[{1}].length = {2}",
                                        fileId,
                                        ext,
                                        file.extents[ext].length);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ExtentFile[{0}].unknown10 = 0x{1:X4}", fileId, file.unknown10);
+        AaruConsole.Debug(MODULE_NAME, "ExtentFile[{0}].unknown10 = 0x{1:X4}", fileId, file.unknown10);
 
         _printedExtents.Add(fileId);
 
diff --git a/Aaru.Filesystems/LisaFS/File.cs b/Aaru.Filesystems/LisaFS/File.cs
index fe00f0a60..c58f24b95 100644
--- a/Aaru.Filesystems/LisaFS/File.cs
+++ b/Aaru.Filesystems/LisaFS/File.cs
@@ -437,7 +437,7 @@ public sealed partial class LisaFS
         {
             if(_fileSizeCache.TryGetValue(fileId, out int realSize))
                 if(realSize > temp.Length)
-                    AaruConsole.ErrorWriteLine(Localization.File_0_gets_truncated, fileId);
+                    AaruConsole.Error(Localization.File_0_gets_truncated, fileId);
 
             buf = temp;
 
diff --git a/Aaru.Filesystems/LisaFS/Info.cs b/Aaru.Filesystems/LisaFS/Info.cs
index fd7de6452..3b5c6ee53 100644
--- a/Aaru.Filesystems/LisaFS/Info.cs
+++ b/Aaru.Filesystems/LisaFS/Info.cs
@@ -63,7 +63,7 @@ public sealed partial class LisaFS
 
             DecodeTag(tag, out LisaTag.PriamTag searchTag);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Sector_0_file_ID_1, i, searchTag.FileId);
+            AaruConsole.Debug(MODULE_NAME, Localization.Sector_0_file_ID_1, i, searchTag.FileId);
 
             if(beforeMddf == -1 && searchTag.FileId == FILEID_LOADER_SIGNED) beforeMddf = i - 1;
 
@@ -83,19 +83,19 @@ public sealed partial class LisaFS
                 datasize                     = BigEndianBitConverter.ToUInt16(sector, 0x7E)
             };
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Current_sector_0, i);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.mddf_block = {0}",       infoMddf.mddf_block);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "Disk size = {0} sectors",     imagePlugin.Info.Sectors);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.vol_size = {0} sectors", infoMddf.vol_size);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.vol_size - 1 = {0}",     infoMddf.volsize_minus_one);
+            AaruConsole.Debug(MODULE_NAME, Localization.Current_sector_0, i);
+            AaruConsole.Debug(MODULE_NAME, "mddf.mddf_block = {0}",       infoMddf.mddf_block);
+            AaruConsole.Debug(MODULE_NAME, "Disk size = {0} sectors",     imagePlugin.Info.Sectors);
+            AaruConsole.Debug(MODULE_NAME, "mddf.vol_size = {0} sectors", infoMddf.vol_size);
+            AaruConsole.Debug(MODULE_NAME, "mddf.vol_size - 1 = {0}",     infoMddf.volsize_minus_one);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "mddf.vol_size - mddf.mddf_block -1 = {0}",
                                        infoMddf.volsize_minus_mddf_minus_one);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "Disk sector = {0} bytes",    imagePlugin.Info.SectorSize);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.blocksize = {0} bytes", infoMddf.blocksize);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.datasize = {0} bytes",  infoMddf.datasize);
+            AaruConsole.Debug(MODULE_NAME, "Disk sector = {0} bytes",    imagePlugin.Info.SectorSize);
+            AaruConsole.Debug(MODULE_NAME, "mddf.blocksize = {0} bytes", infoMddf.blocksize);
+            AaruConsole.Debug(MODULE_NAME, "mddf.datasize = {0} bytes",  infoMddf.datasize);
 
             if(infoMddf.mddf_block != i - beforeMddf) return false;
 
@@ -140,7 +140,7 @@ public sealed partial class LisaFS
 
             DecodeTag(tag, out LisaTag.PriamTag searchTag);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Sector_0_file_ID_1, i, searchTag.FileId);
+            AaruConsole.Debug(MODULE_NAME, Localization.Sector_0_file_ID_1, i, searchTag.FileId);
 
             if(beforeMddf == -1 && searchTag.FileId == FILEID_LOADER_SIGNED) beforeMddf = i - 1;
 
@@ -233,45 +233,45 @@ public sealed partial class LisaFS
             infoMddf.vol_sequence                 = BigEndianBitConverter.ToUInt16(sector, 0x136);
             infoMddf.vol_left_mounted             = sector[0x138];
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown1 = 0x{0:X2} ({0})",  infoMddf.unknown1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown2 = 0x{0:X2} ({0})",  infoMddf.unknown2);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown3 = 0x{0:X8} ({0})",  infoMddf.unknown3);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown4 = 0x{0:X4} ({0})",  infoMddf.unknown4);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown5 = 0x{0:X8} ({0})",  infoMddf.unknown5);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown6 = 0x{0:X8} ({0})",  infoMddf.unknown6);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown7 = 0x{0:X8} ({0})",  infoMddf.unknown7);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown9 = 0x{0:X4} ({0})",  infoMddf.unknown9);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown10 = 0x{0:X8} ({0})", infoMddf.unknown10);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown11 = 0x{0:X8} ({0})", infoMddf.unknown11);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown12 = 0x{0:X8} ({0})", infoMddf.unknown12);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown13 = 0x{0:X8} ({0})", infoMddf.unknown13);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown14 = 0x{0:X8} ({0})", infoMddf.unknown14);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown15 = 0x{0:X8} ({0})", infoMddf.unknown15);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown16 = 0x{0:X8} ({0})", infoMddf.unknown16);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown17 = 0x{0:X4} ({0})", infoMddf.unknown17);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown18 = 0x{0:X8} ({0})", infoMddf.unknown18);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown19 = 0x{0:X8} ({0})", infoMddf.unknown19);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown20 = 0x{0:X8} ({0})", infoMddf.unknown20);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown21 = 0x{0:X8} ({0})", infoMddf.unknown21);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown22 = 0x{0:X8} ({0})", infoMddf.unknown22);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown23 = 0x{0:X8} ({0})", infoMddf.unknown23);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown24 = 0x{0:X8} ({0})", infoMddf.unknown24);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown25 = 0x{0:X8} ({0})", infoMddf.unknown25);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown26 = 0x{0:X8} ({0})", infoMddf.unknown26);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown27 = 0x{0:X8} ({0})", infoMddf.unknown27);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown28 = 0x{0:X8} ({0})", infoMddf.unknown28);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown29 = 0x{0:X8} ({0})", infoMddf.unknown29);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown30 = 0x{0:X8} ({0})", infoMddf.unknown30);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown31 = 0x{0:X8} ({0})", infoMddf.unknown31);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown32 = 0x{0:X8} ({0})", infoMddf.unknown32);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown33 = 0x{0:X8} ({0})", infoMddf.unknown33);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown34 = 0x{0:X8} ({0})", infoMddf.unknown34);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown35 = 0x{0:X8} ({0})", infoMddf.unknown35);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown36 = 0x{0:X8} ({0})", infoMddf.unknown36);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown37 = 0x{0:X8} ({0})", infoMddf.unknown37);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mddf.unknown38 = 0x{0:X8} ({0})", infoMddf.unknown38);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown1 = 0x{0:X2} ({0})",  infoMddf.unknown1);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown2 = 0x{0:X2} ({0})",  infoMddf.unknown2);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown3 = 0x{0:X8} ({0})",  infoMddf.unknown3);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown4 = 0x{0:X4} ({0})",  infoMddf.unknown4);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown5 = 0x{0:X8} ({0})",  infoMddf.unknown5);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown6 = 0x{0:X8} ({0})",  infoMddf.unknown6);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown7 = 0x{0:X8} ({0})",  infoMddf.unknown7);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown9 = 0x{0:X4} ({0})",  infoMddf.unknown9);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown10 = 0x{0:X8} ({0})", infoMddf.unknown10);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown11 = 0x{0:X8} ({0})", infoMddf.unknown11);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown12 = 0x{0:X8} ({0})", infoMddf.unknown12);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown13 = 0x{0:X8} ({0})", infoMddf.unknown13);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown14 = 0x{0:X8} ({0})", infoMddf.unknown14);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown15 = 0x{0:X8} ({0})", infoMddf.unknown15);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown16 = 0x{0:X8} ({0})", infoMddf.unknown16);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown17 = 0x{0:X4} ({0})", infoMddf.unknown17);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown18 = 0x{0:X8} ({0})", infoMddf.unknown18);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown19 = 0x{0:X8} ({0})", infoMddf.unknown19);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown20 = 0x{0:X8} ({0})", infoMddf.unknown20);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown21 = 0x{0:X8} ({0})", infoMddf.unknown21);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown22 = 0x{0:X8} ({0})", infoMddf.unknown22);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown23 = 0x{0:X8} ({0})", infoMddf.unknown23);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown24 = 0x{0:X8} ({0})", infoMddf.unknown24);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown25 = 0x{0:X8} ({0})", infoMddf.unknown25);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown26 = 0x{0:X8} ({0})", infoMddf.unknown26);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown27 = 0x{0:X8} ({0})", infoMddf.unknown27);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown28 = 0x{0:X8} ({0})", infoMddf.unknown28);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown29 = 0x{0:X8} ({0})", infoMddf.unknown29);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown30 = 0x{0:X8} ({0})", infoMddf.unknown30);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown31 = 0x{0:X8} ({0})", infoMddf.unknown31);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown32 = 0x{0:X8} ({0})", infoMddf.unknown32);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown33 = 0x{0:X8} ({0})", infoMddf.unknown33);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown34 = 0x{0:X8} ({0})", infoMddf.unknown34);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown35 = 0x{0:X8} ({0})", infoMddf.unknown35);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown36 = 0x{0:X8} ({0})", infoMddf.unknown36);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown37 = 0x{0:X8} ({0})", infoMddf.unknown37);
+            AaruConsole.Debug(MODULE_NAME, "mddf.unknown38 = 0x{0:X8} ({0})", infoMddf.unknown38);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "mddf.unknown_timestamp = 0x{0:X8} ({0}, {1})",
                                        infoMddf.unknown_timestamp,
                                        DateHandlers.LisaToDateTime(infoMddf.unknown_timestamp));
diff --git a/Aaru.Filesystems/LisaFS/Super.cs b/Aaru.Filesystems/LisaFS/Super.cs
index 741cbc15d..cace19c8e 100644
--- a/Aaru.Filesystems/LisaFS/Super.cs
+++ b/Aaru.Filesystems/LisaFS/Super.cs
@@ -59,7 +59,7 @@ public sealed partial class LisaFS
             // However with some effort the code may be modified to ignore them.
             if(_device.Info.ReadableSectorTags?.Contains(SectorTagType.AppleSectorTag) != true)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Underlying_device_does_not_support_Lisa_tags);
+                AaruConsole.Debug(MODULE_NAME, Localization.Underlying_device_does_not_support_Lisa_tags);
 
                 return ErrorNumber.InOutError;
             }
@@ -67,7 +67,7 @@ public sealed partial class LisaFS
             // Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
             if(_device.Info.Sectors < 800)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Device_is_too_small);
+                AaruConsole.Debug(MODULE_NAME, Localization.Device_is_too_small);
 
                 return ErrorNumber.InOutError;
             }
@@ -84,7 +84,7 @@ public sealed partial class LisaFS
 
                 DecodeTag(tag, out LisaTag.PriamTag searchTag);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Sector_0_file_ID_1, i, searchTag.FileId);
+                AaruConsole.Debug(MODULE_NAME, Localization.Sector_0_file_ID_1, i, searchTag.FileId);
 
                 if(_volumePrefix == _device.Info.Sectors && searchTag.FileId == FILEID_LOADER_SIGNED)
                     _volumePrefix = i - 1;
@@ -188,7 +188,7 @@ public sealed partial class LisaFS
                    _mddf.blocksize        < _device.Info.SectorSize                             ||
                    _mddf.datasize         != _device.Info.SectorSize)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_MDDF_found);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Incorrect_MDDF_found);
 
                     return ErrorNumber.InvalidArgument;
                 }
@@ -197,19 +197,19 @@ public sealed partial class LisaFS
                 switch(_mddf.fsversion)
                 {
                     case LISA_V1:
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Mounting_LisaFS_v1);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Mounting_LisaFS_v1);
 
                         break;
                     case LISA_V2:
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Mounting_LisaFS_v2);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Mounting_LisaFS_v2);
 
                         break;
                     case LISA_V3:
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Mounting_LisaFS_v3);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Mounting_LisaFS_v3);
 
                         break;
                     default:
-                        AaruConsole.ErrorWriteLine(Localization.Cannot_mount_LisaFS_version_0,
+                        AaruConsole.Error(Localization.Cannot_mount_LisaFS_version_0,
                                                    _mddf.fsversion.ToString());
 
                         return ErrorNumber.NotSupported;
@@ -236,7 +236,7 @@ public sealed partial class LisaFS
 
                 if(error != ErrorNumber.NoError)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Error_0_reading_S_Records_file, error);
+                    AaruConsole.Error(Localization.Error_0_reading_S_Records_file, error);
 
                     return error;
                 }
@@ -253,7 +253,7 @@ public sealed partial class LisaFS
 
                 if(error != ErrorNumber.NoError)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Cannot_read_Catalog_File_error_0,
                                                error.ToString());
 
@@ -269,7 +269,7 @@ public sealed partial class LisaFS
 
                     if(error != ErrorNumber.NoError)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Unable_to_read_boot_blocks);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Unable_to_read_boot_blocks);
                         _mounted = false;
 
                         return error;
@@ -279,7 +279,7 @@ public sealed partial class LisaFS
 
                     if(error != ErrorNumber.NoError)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Unable_to_read_boot_loader);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Unable_to_read_boot_loader);
                         _mounted = false;
 
                         return error;
@@ -289,7 +289,7 @@ public sealed partial class LisaFS
 
                     if(error != ErrorNumber.NoError)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Unable_to_read_MDDF);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Unable_to_read_MDDF);
                         _mounted = false;
 
                         return error;
@@ -299,7 +299,7 @@ public sealed partial class LisaFS
 
                     if(error != ErrorNumber.NoError)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Unable_to_read_volume_bitmap);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Unable_to_read_volume_bitmap);
                         _mounted = false;
 
                         return error;
@@ -309,7 +309,7 @@ public sealed partial class LisaFS
 
                     if(error != ErrorNumber.NoError)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Unable_to_read_S_Records_file);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Unable_to_read_S_Records_file);
                         _mounted = false;
 
                         return error;
@@ -336,13 +336,13 @@ public sealed partial class LisaFS
                 return ErrorNumber.NoError;
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Not_a_Lisa_filesystem);
+            AaruConsole.Debug(MODULE_NAME, Localization.Not_a_Lisa_filesystem);
 
             return ErrorNumber.NotSupported;
         }
         catch(Exception ex)
         {
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.InOutError;
         }
diff --git a/Aaru.Filesystems/Locus/Info.cs b/Aaru.Filesystems/Locus/Info.cs
index 61152e3f6..7b258050a 100644
--- a/Aaru.Filesystems/Locus/Info.cs
+++ b/Aaru.Filesystems/Locus/Info.cs
@@ -80,7 +80,7 @@ public sealed partial class Locus
 
             Superblock locusSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.magic_at_1_equals_0, locusSb.s_magic, location);
+            AaruConsole.Debug(MODULE_NAME, Localization.magic_at_1_equals_0, locusSb.s_magic, location);
 
             if(locusSb.s_magic is LOCUS_MAGIC or LOCUS_CIGAM or LOCUS_MAGIC_OLD or LOCUS_CIGAM_OLD) return true;
         }
@@ -146,27 +146,27 @@ public sealed partial class Locus
         // ReSharper disable once InconsistentNaming
         string s_fpack = StringHandlers.CToString(locusSb.s_fpack, encoding);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_magic = 0x{0:X8}", locusSb.s_magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_gfs = {0}",        locusSb.s_gfs);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_fsize = {0}",      locusSb.s_fsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_lwm = {0}",        locusSb.s_lwm);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_hwm = {0}",        locusSb.s_hwm);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_llst = {0}",       locusSb.s_llst);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_fstore = {0}",     locusSb.s_fstore);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_time = {0}",       locusSb.s_time);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_tfree = {0}",      locusSb.s_tfree);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_isize = {0}",      locusSb.s_isize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_nfree = {0}",      locusSb.s_nfree);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_flags = {0}",      locusSb.s_flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_tinode = {0}",     locusSb.s_tinode);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_lasti = {0}",      locusSb.s_lasti);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_nbehind = {0}",    locusSb.s_nbehind);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_gfspack = {0}",    locusSb.s_gfspack);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_ninode = {0}",     locusSb.s_ninode);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_flock = {0}",      locusSb.s_flock);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_ilock = {0}",      locusSb.s_ilock);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_fmod = {0}",       locusSb.s_fmod);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "LocusSb.s_version = {0}",    locusSb.s_version);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_magic = 0x{0:X8}", locusSb.s_magic);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_gfs = {0}",        locusSb.s_gfs);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_fsize = {0}",      locusSb.s_fsize);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_lwm = {0}",        locusSb.s_lwm);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_hwm = {0}",        locusSb.s_hwm);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_llst = {0}",       locusSb.s_llst);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_fstore = {0}",     locusSb.s_fstore);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_time = {0}",       locusSb.s_time);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_tfree = {0}",      locusSb.s_tfree);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_isize = {0}",      locusSb.s_isize);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_nfree = {0}",      locusSb.s_nfree);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_flags = {0}",      locusSb.s_flags);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_tinode = {0}",     locusSb.s_tinode);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_lasti = {0}",      locusSb.s_lasti);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_nbehind = {0}",    locusSb.s_nbehind);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_gfspack = {0}",    locusSb.s_gfspack);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_ninode = {0}",     locusSb.s_ninode);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_flock = {0}",      locusSb.s_flock);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_ilock = {0}",      locusSb.s_ilock);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_fmod = {0}",       locusSb.s_fmod);
+        AaruConsole.Debug(MODULE_NAME, "LocusSb.s_version = {0}",    locusSb.s_version);
 
         sb.AppendFormat(Localization.Superblock_last_modified_on_0, DateHandlers.UnixToDateTime(locusSb.s_time))
           .AppendLine();
diff --git a/Aaru.Filesystems/Nintendo/Info.cs b/Aaru.Filesystems/Nintendo/Info.cs
index cf51cb5d4..1e7753ec5 100644
--- a/Aaru.Filesystems/Nintendo/Info.cs
+++ b/Aaru.Filesystems/Nintendo/Info.cs
@@ -178,31 +178,31 @@ public sealed partial class NintendoPlugin
             fields.FourthPartitions = [];
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "discType = {0}",         fields.DiscType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "gameCode = {0}",         fields.GameCode);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "regionCode = {0}",       fields.RegionCode);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "publisherCode = {0}",    fields.PublisherCode);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "discID = {0}",           fields.DiscId);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "discNumber = {0}",       fields.DiscNumber);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "discVersion = {0}",      fields.DiscVersion);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "streaming = {0}",        fields.Streaming);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "streamBufferSize = {0}", fields.StreamBufferSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "title = \"{0}\"",        fields.Title);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "debugOff = 0x{0:X8}",    fields.DebugOff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "debugAddr = 0x{0:X8}",   fields.DebugAddr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dolOff = 0x{0:X8}",      fields.DolOff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fstOff = 0x{0:X8}",      fields.FstOff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fstSize = {0}",          fields.FstSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fstMax = {0}",           fields.FstMax);
+        AaruConsole.Debug(MODULE_NAME, "discType = {0}",         fields.DiscType);
+        AaruConsole.Debug(MODULE_NAME, "gameCode = {0}",         fields.GameCode);
+        AaruConsole.Debug(MODULE_NAME, "regionCode = {0}",       fields.RegionCode);
+        AaruConsole.Debug(MODULE_NAME, "publisherCode = {0}",    fields.PublisherCode);
+        AaruConsole.Debug(MODULE_NAME, "discID = {0}",           fields.DiscId);
+        AaruConsole.Debug(MODULE_NAME, "discNumber = {0}",       fields.DiscNumber);
+        AaruConsole.Debug(MODULE_NAME, "discVersion = {0}",      fields.DiscVersion);
+        AaruConsole.Debug(MODULE_NAME, "streaming = {0}",        fields.Streaming);
+        AaruConsole.Debug(MODULE_NAME, "streamBufferSize = {0}", fields.StreamBufferSize);
+        AaruConsole.Debug(MODULE_NAME, "title = \"{0}\"",        fields.Title);
+        AaruConsole.Debug(MODULE_NAME, "debugOff = 0x{0:X8}",    fields.DebugOff);
+        AaruConsole.Debug(MODULE_NAME, "debugAddr = 0x{0:X8}",   fields.DebugAddr);
+        AaruConsole.Debug(MODULE_NAME, "dolOff = 0x{0:X8}",      fields.DolOff);
+        AaruConsole.Debug(MODULE_NAME, "fstOff = 0x{0:X8}",      fields.FstOff);
+        AaruConsole.Debug(MODULE_NAME, "fstSize = {0}",          fields.FstSize);
+        AaruConsole.Debug(MODULE_NAME, "fstMax = {0}",           fields.FstMax);
 
         for(int i = 0; i < fields.FirstPartitions.Length; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "firstPartitions[{1}].offset = {0}",
                                        fields.FirstPartitions[i].Offset,
                                        i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "firstPartitions[{1}].type = {0}",
                                        fields.FirstPartitions[i].Type,
                                        i);
@@ -210,12 +210,12 @@ public sealed partial class NintendoPlugin
 
         for(int i = 0; i < fields.SecondPartitions.Length; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "secondPartitions[{1}].offset = {0}",
                                        fields.SecondPartitions[i].Offset,
                                        i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "secondPartitions[{1}].type = {0}",
                                        fields.SecondPartitions[i].Type,
                                        i);
@@ -223,12 +223,12 @@ public sealed partial class NintendoPlugin
 
         for(int i = 0; i < fields.ThirdPartitions.Length; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "thirdPartitions[{1}].offset = {0}",
                                        fields.ThirdPartitions[i].Offset,
                                        i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "thirdPartitions[{1}].type = {0}",
                                        fields.ThirdPartitions[i].Type,
                                        i);
@@ -236,27 +236,27 @@ public sealed partial class NintendoPlugin
 
         for(int i = 0; i < fields.FourthPartitions.Length; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "fourthPartitions[{1}].offset = {0}",
                                        fields.FourthPartitions[i].Offset,
                                        i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "fourthPartitions[{1}].type = {0}",
                                        fields.FourthPartitions[i].Type,
                                        i);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "region = {0}",       fields.Region);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "japanAge = {0}",     fields.JapanAge);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "usaAge = {0}",       fields.UsaAge);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "germanAge = {0}",    fields.GermanAge);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pegiAge = {0}",      fields.PegiAge);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "finlandAge = {0}",   fields.FinlandAge);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "portugalAge = {0}",  fields.PortugalAge);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ukAge = {0}",        fields.UkAge);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "australiaAge = {0}", fields.AustraliaAge);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "koreaAge = {0}",     fields.KoreaAge);
+        AaruConsole.Debug(MODULE_NAME, "region = {0}",       fields.Region);
+        AaruConsole.Debug(MODULE_NAME, "japanAge = {0}",     fields.JapanAge);
+        AaruConsole.Debug(MODULE_NAME, "usaAge = {0}",       fields.UsaAge);
+        AaruConsole.Debug(MODULE_NAME, "germanAge = {0}",    fields.GermanAge);
+        AaruConsole.Debug(MODULE_NAME, "pegiAge = {0}",      fields.PegiAge);
+        AaruConsole.Debug(MODULE_NAME, "finlandAge = {0}",   fields.FinlandAge);
+        AaruConsole.Debug(MODULE_NAME, "portugalAge = {0}",  fields.PortugalAge);
+        AaruConsole.Debug(MODULE_NAME, "ukAge = {0}",        fields.UkAge);
+        AaruConsole.Debug(MODULE_NAME, "australiaAge = {0}", fields.AustraliaAge);
+        AaruConsole.Debug(MODULE_NAME, "koreaAge = {0}",     fields.KoreaAge);
 
         sbInformation.AppendLine(Localization.Nintendo_optical_filesystem);
 
diff --git a/Aaru.Filesystems/ODS/Info.cs b/Aaru.Filesystems/ODS/Info.cs
index 9c28886fb..ee3a2260d 100644
--- a/Aaru.Filesystems/ODS/Info.cs
+++ b/Aaru.Filesystems/ODS/Info.cs
@@ -71,7 +71,7 @@ public sealed partial class ODS
         Array.Copy(hbSector, 0x1F0, magicB, 0, 12);
         string magic = Encoding.ASCII.GetString(magicB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.magic_0, magic);
+        AaruConsole.Debug(MODULE_NAME, Localization.magic_0, magic);
 
         if(magic is "DECFILE11A  " or "DECFILE11B  ") return true;
 
@@ -87,7 +87,7 @@ public sealed partial class ODS
         Array.Copy(hbSector, 0x3F0, magicB, 0, 12);
         magic = Encoding.ASCII.GetString(magicB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.unaligned_magic_0, magic);
+        AaruConsole.Debug(MODULE_NAME, Localization.unaligned_magic_0, magic);
 
         return magic is "DECFILE11A  " or "DECFILE11B  ";
     }
diff --git a/Aaru.Filesystems/ProDOS/Info.cs b/Aaru.Filesystems/ProDOS/Info.cs
index 2def0a99c..bf2aadf7f 100644
--- a/Aaru.Filesystems/ProDOS/Info.cs
+++ b/Aaru.Filesystems/ProDOS/Info.cs
@@ -89,27 +89,27 @@ public sealed partial class ProDOSPlugin
         }
 
         ushort prePointer = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "prePointer = {0}", prePointer);
+        AaruConsole.Debug(MODULE_NAME, "prePointer = {0}", prePointer);
 
         if(prePointer != 0) return false;
 
         byte storageType = (byte)((rootDirectoryKeyBlock[0x04] & STORAGE_TYPE_MASK) >> 4);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "storage_type = {0}", storageType);
+        AaruConsole.Debug(MODULE_NAME, "storage_type = {0}", storageType);
 
         if(storageType != ROOT_DIRECTORY_TYPE) return false;
 
         byte entryLength = rootDirectoryKeyBlock[0x23];
-        AaruConsole.DebugWriteLine(MODULE_NAME, "entry_length = {0}", entryLength);
+        AaruConsole.Debug(MODULE_NAME, "entry_length = {0}", entryLength);
 
         if(entryLength != ENTRY_LENGTH) return false;
 
         byte entriesPerBlock = rootDirectoryKeyBlock[0x24];
-        AaruConsole.DebugWriteLine(MODULE_NAME, "entries_per_block = {0}", entriesPerBlock);
+        AaruConsole.Debug(MODULE_NAME, "entries_per_block = {0}", entriesPerBlock);
 
         if(entriesPerBlock != ENTRIES_PER_BLOCK) return false;
 
         ushort bitMapPointer = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0x27);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bit_map_pointer = {0}", bitMapPointer);
+        AaruConsole.Debug(MODULE_NAME, "bit_map_pointer = {0}", bitMapPointer);
 
         if(bitMapPointer > partition.End) return false;
 
@@ -117,7 +117,7 @@ public sealed partial class ProDOSPlugin
 
         if(apmFromHddOnCd) totalBlocks /= 4;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "{0} <= ({1} - {2} + 1)? {3}",
                                    totalBlocks,
                                    partition.End,
@@ -199,11 +199,11 @@ public sealed partial class ProDOSPlugin
 
             if(year < 1940) year += 100;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "temp_timestamp_left = 0x{0:X4}",  tempTimestampLeft);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "temp_timestamp_right = 0x{0:X4}", tempTimestampRight);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "temp_timestamp = 0x{0:X8}",       tempTimestamp);
+            AaruConsole.Debug(MODULE_NAME, "temp_timestamp_left = 0x{0:X4}",  tempTimestampLeft);
+            AaruConsole.Debug(MODULE_NAME, "temp_timestamp_right = 0x{0:X4}", tempTimestampRight);
+            AaruConsole.Debug(MODULE_NAME, "temp_timestamp = 0x{0:X8}",       tempTimestamp);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Datetime_field_year_0_month_1_day_2_hour_3_minute_4,
                                        year,
                                        month,
@@ -304,7 +304,7 @@ public sealed partial class ProDOSPlugin
         // TODO: Fix mask
         if((rootDirectoryKeyBlock.header.access & RESERVED_ATTRIBUTE_MASK) != 0)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Reserved_attributes_are_set_0,
                                        rootDirectoryKeyBlock.header.access);
         }
diff --git a/Aaru.Filesystems/RBF/Info.cs b/Aaru.Filesystems/RBF/Info.cs
index b3296a946..3063bfc5a 100644
--- a/Aaru.Filesystems/RBF/Info.cs
+++ b/Aaru.Filesystems/RBF/Info.cs
@@ -72,7 +72,7 @@ public sealed partial class RBF
             IdSector    rbfSb     = Marshal.ByteArrayToStructureBigEndian<IdSector>(sector);
             NewIdSector rbf9000Sb = Marshal.ByteArrayToStructureBigEndian<NewIdSector>(sector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.magic_at_0_equals_1_or_2_expected_3_or_4,
                                        location,
                                        rbfSb.dd_sync,
@@ -118,7 +118,7 @@ public sealed partial class RBF
             rbfSb     = Marshal.ByteArrayToStructureBigEndian<IdSector>(sector);
             rbf9000Sb = Marshal.ByteArrayToStructureBigEndian<NewIdSector>(sector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.magic_at_0_equals_1_or_2_expected_3_or_4,
                                        location,
                                        rbfSb.dd_sync,
diff --git a/Aaru.Filesystems/ReFS/Info.cs b/Aaru.Filesystems/ReFS/Info.cs
index 3638b0c14..6ff907c61 100644
--- a/Aaru.Filesystems/ReFS/Info.cs
+++ b/Aaru.Filesystems/ReFS/Info.cs
@@ -87,35 +87,35 @@ public sealed partial class ReFS
 
         VolumeHeader vhdr = Marshal.ByteArrayToStructureLittleEndian<VolumeHeader>(sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "VolumeHeader.jump empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(vhdr.jump));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "VolumeHeader.signature = {0}",
                                    StringHandlers.CToString(vhdr.signature));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "VolumeHeader.mustBeZero empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(vhdr.mustBeZero));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "VolumeHeader.identifier = {0}",
                                    StringHandlers.CToString(BitConverter.GetBytes(vhdr.identifier)));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "VolumeHeader.length = {0}",         vhdr.length);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "VolumeHeader.checksum = 0x{0:X4}",  vhdr.checksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "VolumeHeader.sectors = {0}",        vhdr.sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "VolumeHeader.bytesPerSector = {0}", vhdr.bytesPerSector);
+        AaruConsole.Debug(MODULE_NAME, "VolumeHeader.length = {0}",         vhdr.length);
+        AaruConsole.Debug(MODULE_NAME, "VolumeHeader.checksum = 0x{0:X4}",  vhdr.checksum);
+        AaruConsole.Debug(MODULE_NAME, "VolumeHeader.sectors = {0}",        vhdr.sectors);
+        AaruConsole.Debug(MODULE_NAME, "VolumeHeader.bytesPerSector = {0}", vhdr.bytesPerSector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "VolumeHeader.sectorsPerCluster = {0}", vhdr.sectorsPerCluster);
+        AaruConsole.Debug(MODULE_NAME, "VolumeHeader.sectorsPerCluster = {0}", vhdr.sectorsPerCluster);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "VolumeHeader.unknown1 zero? = {0}", vhdr.unknown1 == 0);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "VolumeHeader.unknown2 zero? = {0}", vhdr.unknown2 == 0);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "VolumeHeader.unknown3 zero? = {0}", vhdr.unknown3 == 0);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "VolumeHeader.unknown4 zero? = {0}", vhdr.unknown4 == 0);
+        AaruConsole.Debug(MODULE_NAME, "VolumeHeader.unknown1 zero? = {0}", vhdr.unknown1 == 0);
+        AaruConsole.Debug(MODULE_NAME, "VolumeHeader.unknown2 zero? = {0}", vhdr.unknown2 == 0);
+        AaruConsole.Debug(MODULE_NAME, "VolumeHeader.unknown3 zero? = {0}", vhdr.unknown3 == 0);
+        AaruConsole.Debug(MODULE_NAME, "VolumeHeader.unknown4 zero? = {0}", vhdr.unknown4 == 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "VolumeHeader.unknown5 empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(vhdr.unknown5));
 
diff --git a/Aaru.Filesystems/SolarFS/Info.cs b/Aaru.Filesystems/SolarFS/Info.cs
index 0c826491b..71e9ed34f 100644
--- a/Aaru.Filesystems/SolarFS/Info.cs
+++ b/Aaru.Filesystems/SolarFS/Info.cs
@@ -105,24 +105,24 @@ public sealed partial class SolarFS
         Array.Copy(bpbSector, 0x1B, bpb.unk3, 0, 10);
         bpb.unk4 = BitConverter.ToUInt32(bpbSector, 0x26);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "BPB.x86_jump: 0x{0:X2}{1:X2}{2:X2}",
                                    bpb.x86_jump[0],
                                    bpb.x86_jump[1],
                                    bpb.x86_jump[2]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.OEMName: \"{0}\"", bpb.OEMName);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.bps: {0}",         bpb.bps);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.unk1: 0x{0:X2}",   bpb.unk1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.unk2: 0x{0:X4}",   bpb.unk2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.root_ent: {0}",    bpb.root_ent);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.sectors: {0}",     bpb.sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.media: 0x{0:X2}",  bpb.media);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.spfat: {0}",       bpb.spfat);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.sptrk: {0}",       bpb.sptrk);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.heads: {0}",       bpb.heads);
+        AaruConsole.Debug(MODULE_NAME, "BPB.OEMName: \"{0}\"", bpb.OEMName);
+        AaruConsole.Debug(MODULE_NAME, "BPB.bps: {0}",         bpb.bps);
+        AaruConsole.Debug(MODULE_NAME, "BPB.unk1: 0x{0:X2}",   bpb.unk1);
+        AaruConsole.Debug(MODULE_NAME, "BPB.unk2: 0x{0:X4}",   bpb.unk2);
+        AaruConsole.Debug(MODULE_NAME, "BPB.root_ent: {0}",    bpb.root_ent);
+        AaruConsole.Debug(MODULE_NAME, "BPB.sectors: {0}",     bpb.sectors);
+        AaruConsole.Debug(MODULE_NAME, "BPB.media: 0x{0:X2}",  bpb.media);
+        AaruConsole.Debug(MODULE_NAME, "BPB.spfat: {0}",       bpb.spfat);
+        AaruConsole.Debug(MODULE_NAME, "BPB.sptrk: {0}",       bpb.sptrk);
+        AaruConsole.Debug(MODULE_NAME, "BPB.heads: {0}",       bpb.heads);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "BPB.unk3: 0x{0:X2}{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}",
                                    bpb.unk3[0],
                                    bpb.unk3[1],
@@ -135,10 +135,10 @@ public sealed partial class SolarFS
                                    bpb.unk3[8],
                                    bpb.unk3[9]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.signature: 0x{0:X2}", bpb.signature);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.unk4: 0x{0:X8}",      bpb.unk4);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.vol_name: \"{0}\"",   bpb.vol_name);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "BPB.fs_type: \"{0}\"",    bpb.fs_type);
+        AaruConsole.Debug(MODULE_NAME, "BPB.signature: 0x{0:X2}", bpb.signature);
+        AaruConsole.Debug(MODULE_NAME, "BPB.unk4: 0x{0:X8}",      bpb.unk4);
+        AaruConsole.Debug(MODULE_NAME, "BPB.vol_name: \"{0}\"",   bpb.vol_name);
+        AaruConsole.Debug(MODULE_NAME, "BPB.fs_type: \"{0}\"",    bpb.fs_type);
 
         sb.AppendLine(Localization.Solar_OS_filesystem);
         sb.AppendFormat(Localization.Media_descriptor_0,  bpb.media).AppendLine();
diff --git a/Aaru.Filesystems/UCSDPascal/Info.cs b/Aaru.Filesystems/UCSDPascal/Info.cs
index b73195197..1b4895383 100644
--- a/Aaru.Filesystems/UCSDPascal/Info.cs
+++ b/Aaru.Filesystems/UCSDPascal/Info.cs
@@ -81,16 +81,16 @@ public sealed partial class PascalPlugin
 
         Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "volEntry.firstBlock = {0}", volEntry.FirstBlock);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "volEntry.lastBlock = {0}",  volEntry.LastBlock);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "volEntry.entryType = {0}",  volEntry.EntryType);
+        AaruConsole.Debug(MODULE_NAME, "volEntry.firstBlock = {0}", volEntry.FirstBlock);
+        AaruConsole.Debug(MODULE_NAME, "volEntry.lastBlock = {0}",  volEntry.LastBlock);
+        AaruConsole.Debug(MODULE_NAME, "volEntry.entryType = {0}",  volEntry.EntryType);
 
         //            AaruConsole.DebugWriteLine(MODULE_NAME, "volEntry.volumeName = {0}", volEntry.VolumeName);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "volEntry.blocks = {0}",   volEntry.Blocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "volEntry.files = {0}",    volEntry.Files);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "volEntry.dummy = {0}",    volEntry.Dummy);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "volEntry.lastBoot = {0}", volEntry.LastBoot);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "volEntry.tail = {0}",     volEntry.Tail);
+        AaruConsole.Debug(MODULE_NAME, "volEntry.blocks = {0}",   volEntry.Blocks);
+        AaruConsole.Debug(MODULE_NAME, "volEntry.files = {0}",    volEntry.Files);
+        AaruConsole.Debug(MODULE_NAME, "volEntry.dummy = {0}",    volEntry.Dummy);
+        AaruConsole.Debug(MODULE_NAME, "volEntry.lastBoot = {0}", volEntry.LastBoot);
+        AaruConsole.Debug(MODULE_NAME, "volEntry.tail = {0}",     volEntry.Tail);
 
         // First block is always 0 (even is it's sector 2)
         if(volEntry.FirstBlock != 0) return false;
diff --git a/Aaru.Filesystems/UDF/Info.cs b/Aaru.Filesystems/UDF/Info.cs
index cadcd4f6d..db2f339c1 100644
--- a/Aaru.Filesystems/UDF/Info.cs
+++ b/Aaru.Filesystems/UDF/Info.cs
@@ -80,36 +80,36 @@ public sealed partial class UDF
         {
             anchor = Marshal.ByteArrayToStructureLittleEndian<AnchorVolumeDescriptorPointer>(sector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "anchor.tag.tagIdentifier = {0}", anchor.tag.tagIdentifier);
+            AaruConsole.Debug(MODULE_NAME, "anchor.tag.tagIdentifier = {0}", anchor.tag.tagIdentifier);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "anchor.tag.descriptorVersion = {0}", anchor.tag.descriptorVersion);
+            AaruConsole.Debug(MODULE_NAME, "anchor.tag.descriptorVersion = {0}", anchor.tag.descriptorVersion);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "anchor.tag.tagChecksum = 0x{0:X2}", anchor.tag.tagChecksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "anchor.tag.reserved = {0}",         anchor.tag.reserved);
+            AaruConsole.Debug(MODULE_NAME, "anchor.tag.tagChecksum = 0x{0:X2}", anchor.tag.tagChecksum);
+            AaruConsole.Debug(MODULE_NAME, "anchor.tag.reserved = {0}",         anchor.tag.reserved);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "anchor.tag.tagSerialNumber = {0}", anchor.tag.tagSerialNumber);
+            AaruConsole.Debug(MODULE_NAME, "anchor.tag.tagSerialNumber = {0}", anchor.tag.tagSerialNumber);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "anchor.tag.descriptorCrc = 0x{0:X4}", anchor.tag.descriptorCrc);
+            AaruConsole.Debug(MODULE_NAME, "anchor.tag.descriptorCrc = 0x{0:X4}", anchor.tag.descriptorCrc);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "anchor.tag.descriptorCrcLength = {0}",
                                        anchor.tag.descriptorCrcLength);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "anchor.tag.tagLocation = {0}", anchor.tag.tagLocation);
+            AaruConsole.Debug(MODULE_NAME, "anchor.tag.tagLocation = {0}", anchor.tag.tagLocation);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "anchor.mainVolumeDescriptorSequenceExtent.length = {0}",
                                        anchor.mainVolumeDescriptorSequenceExtent.length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "anchor.mainVolumeDescriptorSequenceExtent.location = {0}",
                                        anchor.mainVolumeDescriptorSequenceExtent.location);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "anchor.reserveVolumeDescriptorSequenceExtent.length = {0}",
                                        anchor.reserveVolumeDescriptorSequenceExtent.length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "anchor.reserveVolumeDescriptorSequenceExtent.location = {0}",
                                        anchor.reserveVolumeDescriptorSequenceExtent.location);
 
diff --git a/Aaru.Filesystems/UNICOS/Info.cs b/Aaru.Filesystems/UNICOS/Info.cs
index e2811f6a1..be66529bd 100644
--- a/Aaru.Filesystems/UNICOS/Info.cs
+++ b/Aaru.Filesystems/UNICOS/Info.cs
@@ -63,7 +63,7 @@ public sealed partial class UNICOS
 
         Superblock unicosSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.magic_equals_0_expected_1, unicosSb.s_magic, UNICOS_MAGIC);
+        AaruConsole.Debug(MODULE_NAME, Localization.magic_equals_0_expected_1, unicosSb.s_magic, UNICOS_MAGIC);
 
         return unicosSb.s_magic == UNICOS_MAGIC;
     }
diff --git a/Aaru.Filesystems/UNIXBFS/Info.cs b/Aaru.Filesystems/UNIXBFS/Info.cs
index be525ba9e..4370fdced 100644
--- a/Aaru.Filesystems/UNIXBFS/Info.cs
+++ b/Aaru.Filesystems/UNIXBFS/Info.cs
@@ -89,15 +89,15 @@ public sealed partial class BFS
         Array.Copy(bfsSbSector, 0x22, sbStrings, 0, 6);
         bfsSb.s_volume = StringHandlers.CToString(sbStrings, encoding);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bfs_sb.s_magic: 0x{0:X8}", bfsSb.s_magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bfs_sb.s_start: 0x{0:X8}", bfsSb.s_start);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bfs_sb.s_end: 0x{0:X8}",   bfsSb.s_end);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bfs_sb.s_from: 0x{0:X8}",  bfsSb.s_from);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bfs_sb.s_to: 0x{0:X8}",    bfsSb.s_to);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bfs_sb.s_bfrom: 0x{0:X8}", bfsSb.s_bfrom);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bfs_sb.s_bto: 0x{0:X8}",   bfsSb.s_bto);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bfs_sb.s_fsname: 0x{0}",   bfsSb.s_fsname);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "bfs_sb.s_volume: 0x{0}",   bfsSb.s_volume);
+        AaruConsole.Debug(MODULE_NAME, "bfs_sb.s_magic: 0x{0:X8}", bfsSb.s_magic);
+        AaruConsole.Debug(MODULE_NAME, "bfs_sb.s_start: 0x{0:X8}", bfsSb.s_start);
+        AaruConsole.Debug(MODULE_NAME, "bfs_sb.s_end: 0x{0:X8}",   bfsSb.s_end);
+        AaruConsole.Debug(MODULE_NAME, "bfs_sb.s_from: 0x{0:X8}",  bfsSb.s_from);
+        AaruConsole.Debug(MODULE_NAME, "bfs_sb.s_to: 0x{0:X8}",    bfsSb.s_to);
+        AaruConsole.Debug(MODULE_NAME, "bfs_sb.s_bfrom: 0x{0:X8}", bfsSb.s_bfrom);
+        AaruConsole.Debug(MODULE_NAME, "bfs_sb.s_bto: 0x{0:X8}",   bfsSb.s_bto);
+        AaruConsole.Debug(MODULE_NAME, "bfs_sb.s_fsname: 0x{0}",   bfsSb.s_fsname);
+        AaruConsole.Debug(MODULE_NAME, "bfs_sb.s_volume: 0x{0}",   bfsSb.s_volume);
 
         sb.AppendLine(Localization.UNIX_Boot_Filesystem);
 
diff --git a/Aaru.Filesystems/XFS/Info.cs b/Aaru.Filesystems/XFS/Info.cs
index 9a92aca7d..4f49cc87d 100644
--- a/Aaru.Filesystems/XFS/Info.cs
+++ b/Aaru.Filesystems/XFS/Info.cs
@@ -72,7 +72,7 @@ public sealed partial class XFS
 
                 Superblock xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.magic_at_0_X3_equals_1_expected_2,
                                            location,
                                            xfsSb.magicnum,
@@ -102,7 +102,7 @@ public sealed partial class XFS
 
                 Superblock xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.magic_at_0_equals_1_expected_2,
                                            location,
                                            xfsSb.magicnum,
@@ -149,7 +149,7 @@ public sealed partial class XFS
 
                 xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.magic_at_0_X3_equals_1_expected_2,
                                            location,
                                            xfsSb.magicnum,
@@ -176,7 +176,7 @@ public sealed partial class XFS
 
                 xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.magic_at_0_equals_1_expected_2,
                                            location,
                                            xfsSb.magicnum,
diff --git a/Aaru.Filesystems/dump/Info.cs b/Aaru.Filesystems/dump/Info.cs
index c8d8d84f3..61b83ae9b 100644
--- a/Aaru.Filesystems/dump/Info.cs
+++ b/Aaru.Filesystems/dump/Info.cs
@@ -71,9 +71,9 @@ public sealed partial class Dump
         spcl_aix aixHdr = Marshal.ByteArrayToStructureLittleEndian<spcl_aix>(sector);
         s_spcl   newHdr = Marshal.ByteArrayToStructureLittleEndian<s_spcl>(sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "old magic = 0x{0:X8}", oldHdr.c_magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "aix magic = 0x{0:X8}", aixHdr.c_magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "new magic = 0x{0:X8}", newHdr.c_magic);
+        AaruConsole.Debug(MODULE_NAME, "old magic = 0x{0:X8}", oldHdr.c_magic);
+        AaruConsole.Debug(MODULE_NAME, "aix magic = 0x{0:X8}", aixHdr.c_magic);
+        AaruConsole.Debug(MODULE_NAME, "new magic = 0x{0:X8}", newHdr.c_magic);
 
         return oldHdr.c_magic == OFS_MAGIC              ||
                aixHdr.c_magic is XIX_MAGIC or XIX_CIGAM ||
diff --git a/Aaru.Gui/ConsoleHandler.cs b/Aaru.Gui/ConsoleHandler.cs
index 3ba1a4d6d..60976b333 100644
--- a/Aaru.Gui/ConsoleHandler.cs
+++ b/Aaru.Gui/ConsoleHandler.cs
@@ -54,12 +54,12 @@ static class ConsoleHandler
 
             if(_debug)
             {
-                AaruConsole.DebugWithModuleWriteLineEvent += OnDebugWriteHandler;
+                AaruConsole.DebugWithModuleEvent += OnDebugWriteHandler;
                 AaruConsole.WriteExceptionEvent           += OnWriteExceptionEvent;
             }
             else
             {
-                AaruConsole.DebugWithModuleWriteLineEvent -= OnDebugWriteHandler;
+                AaruConsole.DebugWithModuleEvent -= OnDebugWriteHandler;
                 AaruConsole.WriteExceptionEvent           -= OnWriteExceptionEvent;
             }
         }
@@ -78,7 +78,7 @@ static class ConsoleHandler
     internal static void Init()
     {
         AaruConsole.WriteLineEvent      += OnWriteHandler;
-        AaruConsole.ErrorWriteLineEvent += OnErrorWriteHandler;
+        AaruConsole.ErrorEvent += OnErrorWriteHandler;
     }
 
     static void OnWriteHandler([CanBeNull] string format, [CanBeNull] params object[] arg)
diff --git a/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
index f13af639f..38816106e 100644
--- a/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
+++ b/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
@@ -165,7 +165,7 @@ public sealed class ConsoleViewModel : ViewModelBase
                                                           Icon.Error)
                                    .ShowWindowDialogAsync(_view);
 
-            AaruConsole.WriteException(exception);
+            AaruConsole.Exception(exception);
         }
     }
 
diff --git a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
index 2d34315ff..3b894755e 100644
--- a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
@@ -90,7 +90,7 @@ public sealed class SubdirectoryViewModel
             if(errno != ErrorNumber.NoError)
             {
                 AaruConsole
-                   .ErrorWriteLine(string.Format(UI.Error_0_trying_to_get_information_about_filesystem_entry_named_1,
+                   .Error(string.Format(UI.Error_0_trying_to_get_information_about_filesystem_entry_named_1,
                                                  errno,
                                                  dirent));
 
diff --git a/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
index 9c622ccc4..01eb9523a 100644
--- a/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
@@ -148,7 +148,7 @@ public class PcmciaInfoViewModel : ViewModelBase
             }
         }
         else
-            AaruConsole.DebugWriteLine(MODULE_NAME, UI.PCMCIA_CIS_returned_no_tuples);
+            AaruConsole.Debug(MODULE_NAME, UI.PCMCIA_CIS_returned_no_tuples);
     }
 
     public string CisLabel           => UI.Title_CIS;
diff --git a/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
index 926174d33..16db5b099 100644
--- a/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
@@ -606,7 +606,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
                         evpdPageTitle   = string.Format(UI.Page_0_h, page.Key);
                         evpdDecodedPage = UI.Undecoded;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Core.Found_undecoded_SCSI_VPD_page_0,
                                                    page.Key);
 
@@ -627,9 +627,9 @@ public sealed class ScsiInfoViewModel : ViewModelBase
 
         Features.SeparatedFeatures ftr = Features.Separate(_configuration);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.GET_CONFIGURATION_length_is_0, ftr.DataLength);
+        AaruConsole.Debug(MODULE_NAME, Localization.Core.GET_CONFIGURATION_length_is_0, ftr.DataLength);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Core.GET_CONFIGURATION_current_profile_is_0,
                                    ftr.CurrentProfile);
 
@@ -638,7 +638,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
             foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
             {
                 string featureNumber = string.Format(Localization.Core.Feature_0, desc.Code);
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Feature_0, desc.Code);
+                AaruConsole.Debug(MODULE_NAME, Localization.Core.Feature_0, desc.Code);
 
                 string featureDescription = desc.Code switch
                                             {
@@ -712,7 +712,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
         }
         else
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Core.GET_CONFIGURATION_returned_no_feature_descriptors);
         }
     }
diff --git a/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs
index 31dd4ebf3..ad01f8c84 100644
--- a/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs
@@ -494,7 +494,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
 
                             if(errno != ErrorNumber.NoError)
                             {
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
+                                AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
                                                                          errno,
                                                                          i));
 
@@ -507,7 +507,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
                         }
                     }
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                UI.Track_0_starts_at_sector_1_and_ends_at_sector_2,
                                                currentTrack.Sequence,
                                                currentTrack.StartSector,
@@ -543,7 +543,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
 
                             if(errno != ErrorNumber.NoError)
                             {
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
+                                AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
                                                                          errno,
                                                                          doneSectors));
 
@@ -573,7 +573,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
 
                             if(errno != ErrorNumber.NoError)
                             {
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
+                                AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
                                                                          errno,
                                                                          doneSectors));
 
@@ -637,7 +637,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
 
                         if(errno != ErrorNumber.NoError)
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
+                            AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
                                                                      errno,
                                                                      i));
 
@@ -666,9 +666,9 @@ public sealed class ImageChecksumViewModel : ViewModelBase
             }
             catch(Exception ex)
             {
-                AaruConsole.DebugWriteLine(Localization.Core.Could_not_get_tracks_because_0, ex.Message);
+                AaruConsole.Debug(Localization.Core.Could_not_get_tracks_because_0, ex.Message);
                 AaruConsole.WriteLine("Unable to get separate tracks, not checksumming them");
-                AaruConsole.WriteException(ex);
+                AaruConsole.Exception(ex);
             }
         }
         else
@@ -701,7 +701,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
 
                     if(errno != ErrorNumber.NoError)
                     {
-                        AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
+                        AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
                                                                  errno,
                                                                  doneSectors));
 
@@ -731,7 +731,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
 
                     if(errno != ErrorNumber.NoError)
                     {
-                        AaruConsole.ErrorWriteLine(string.Format(Localization.Core.Error_0_reading_sector_1,
+                        AaruConsole.Error(string.Format(Localization.Core.Error_0_reading_sector_1,
                                                                  errno,
                                                                  doneSectors));
 
diff --git a/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
index 66368668b..901663ce1 100644
--- a/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
@@ -808,7 +808,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                         icon: Icon.Error)
                                                                    .ShowWindowDialogAsync(_view));
 
-            AaruConsole.ErrorWriteLine(UI.Error_0_creating_output_image, outputFormat.ErrorMessage);
+            AaruConsole.Error(UI.Error_0_creating_output_image, outputFormat.ErrorMessage);
 
             return;
         }
@@ -857,13 +857,13 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                                 icon: Icon.Error)
                                                                            .ShowWindowDialogAsync(_view));
 
-                    AaruConsole.ErrorWriteLine(UI.Error_0_setting_metadata_not_continuing, outputFormat.ErrorMessage);
+                    AaruConsole.Error(UI.Error_0_setting_metadata_not_continuing, outputFormat.ErrorMessage);
 
                     return;
                 }
 
                 warning = true;
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_0_setting_metadata, outputFormat.ErrorMessage);
+                AaruConsole.Error(Localization.Core.Error_0_setting_metadata, outputFormat.ErrorMessage);
             }
         }
 
@@ -889,7 +889,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                             icon: Icon.Error)
                                                                        .ShowWindowDialogAsync(_view));
 
-                AaruConsole.ErrorWriteLine(UI.Error_0_sending_tracks_list_to_output_image, outputFormat.ErrorMessage);
+                AaruConsole.Error(UI.Error_0_sending_tracks_list_to_output_image, outputFormat.ErrorMessage);
 
                 return;
             }
@@ -918,9 +918,9 @@ public sealed class ImageConvertViewModel : ViewModelBase
                 warning = true;
 
                 if(errno == ErrorNumber.NoError)
-                    AaruConsole.ErrorWriteLine(UI.Error_0_writing_media_tag, outputFormat.ErrorMessage);
+                    AaruConsole.Error(UI.Error_0_writing_media_tag, outputFormat.ErrorMessage);
                 else
-                    AaruConsole.ErrorWriteLine(UI.Error_0_reading_media_tag, errno);
+                    AaruConsole.Error(UI.Error_0_reading_media_tag, errno);
             }
             else
             {
@@ -936,7 +936,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                                 icon: Icon.Error)
                                                                            .ShowWindowDialogAsync(_view));
 
-                    AaruConsole.ErrorWriteLine(UI.Error_0_writing_media_tag_not_continuing, outputFormat.ErrorMessage);
+                    AaruConsole.Error(UI.Error_0_writing_media_tag_not_continuing, outputFormat.ErrorMessage);
                 }
                 else
                 {
@@ -949,7 +949,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                                 icon: Icon.Error)
                                                                            .ShowWindowDialogAsync(_view));
 
-                    AaruConsole.ErrorWriteLine(UI.Error_0_reading_media_tag_not_continuing, errno);
+                    AaruConsole.Error(UI.Error_0_reading_media_tag_not_continuing, errno);
                 }
 
                 return;
@@ -978,7 +978,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
             {
                 warning = true;
 
-                AaruConsole.ErrorWriteLine(UI.Error_0_setting_geometry_image_may_be_incorrect_continuing,
+                AaruConsole.Error(UI.Error_0_setting_geometry_image_may_be_incorrect_continuing,
                                            outputFormat.ErrorMessage);
             }
 
@@ -1038,7 +1038,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                         {
                             warning = true;
 
-                            AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
+                            AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
                         }
                         else
                         {
@@ -1052,7 +1052,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                                       icon: Icon.Error)
                                                                                  .ShowWindowDialogAsync(_view));
 
-                            AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
+                            AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
 
                             return;
                         }
@@ -1078,7 +1078,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                         {
                             warning = true;
 
-                            AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
+                            AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
                         }
                         else
                         {
@@ -1092,7 +1092,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                                       icon: Icon.Error)
                                                                                  .ShowWindowDialogAsync(_view));
 
-                            AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
+                            AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing, errno, doneSectors);
 
                             return;
                         }
@@ -1105,7 +1105,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                     {
                         warning = true;
 
-                        AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_continuing,
+                        AaruConsole.Error(UI.Error_0_writing_sector_1_continuing,
                                                    outputFormat.ErrorMessage,
                                                    doneSectors);
                     }
@@ -1122,7 +1122,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                                   icon: Icon.Error)
                                                                              .ShowWindowDialogAsync(_view));
 
-                        AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_not_continuing,
+                        AaruConsole.Error(UI.Error_0_writing_sector_1_not_continuing,
                                                    outputFormat.ErrorMessage,
                                                    doneSectors);
 
@@ -1286,7 +1286,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                             {
                                 warning = true;
 
-                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
+                                AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
                             }
                             else
                             {
@@ -1300,7 +1300,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                               icon: Icon.Error)
                                                                          .ShowWindowDialogAsync(_view));
 
-                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing,
+                                AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing,
                                                            errno,
                                                            doneSectors);
 
@@ -1355,7 +1355,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                             {
                                 warning = true;
 
-                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
+                                AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
                             }
                             else
                             {
@@ -1369,7 +1369,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                               icon: Icon.Error)
                                                                          .ShowWindowDialogAsync(_view));
 
-                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing,
+                                AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing,
                                                            errno,
                                                            doneSectors);
 
@@ -1384,7 +1384,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                         {
                             warning = true;
 
-                            AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_continuing,
+                            AaruConsole.Error(UI.Error_0_writing_sector_1_continuing,
                                                        outputFormat.ErrorMessage,
                                                        doneSectors);
                         }
@@ -1401,7 +1401,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                                                                       icon: Icon.Error)
                                                                                  .ShowWindowDialogAsync(_view));
 
-                            AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_not_continuing,
+                            AaruConsole.Error(UI.Error_0_writing_sector_1_not_continuing,
                                                        outputFormat.ErrorMessage,
                                                        doneSectors);
 
@@ -1505,7 +1505,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                             {
                                 warning = true;
 
-                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
+                                AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
                             }
                             else
                             {
@@ -1547,7 +1547,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                             {
                                 warning = true;
 
-                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
+                                AaruConsole.Error(UI.Error_0_reading_sector_1_continuing, errno, doneSectors);
                             }
                             else
                             {
@@ -1572,7 +1572,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                         {
                             warning = true;
 
-                            AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_continuing,
+                            AaruConsole.Error(UI.Error_0_writing_sector_1_continuing,
                                                        outputFormat.ErrorMessage,
                                                        doneSectors);
                         }
@@ -1658,7 +1658,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                 {
                                     warning = true;
 
-                                    AaruConsole.ErrorWriteLine(UI.Error_0_reading_media_tag, errno);
+                                    AaruConsole.Error(UI.Error_0_reading_media_tag, errno);
                                 }
                                 else
                                 {
@@ -1683,7 +1683,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                                 {
                                     warning = true;
 
-                                    AaruConsole.ErrorWriteLine(UI.Error_0_writing_tag_continuing,
+                                    AaruConsole.Error(UI.Error_0_writing_tag_continuing,
                                                                outputFormat.ErrorMessage);
                                 }
                                 else
@@ -1755,7 +1755,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                             {
                                 warning = true;
 
-                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_tag_for_sector_1_continuing,
+                                AaruConsole.Error(UI.Error_0_reading_tag_for_sector_1_continuing,
                                                            errno,
                                                            doneSectors);
                             }
@@ -1781,7 +1781,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
                             {
                                 warning = true;
 
-                                AaruConsole.ErrorWriteLine(UI.Error_0_writing_tag_for_sector_1_continuing,
+                                AaruConsole.Error(UI.Error_0_writing_tag_for_sector_1_continuing,
                                                            outputFormat.ErrorMessage,
                                                            doneSectors);
                             }
diff --git a/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs
index 99c5c95a3..7cd28546a 100644
--- a/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs
@@ -316,7 +316,7 @@ public sealed class ImageEntropyViewModel : ViewModelBase
 
         if(WholeDiscChecked && _inputFormat is IOpticalMediaImage { Sessions.Count: > 1 })
         {
-            AaruConsole.ErrorWriteLine(UI.Calculating_disc_entropy_of_multisession_images_is_not_yet_implemented);
+            AaruConsole.Error(UI.Calculating_disc_entropy_of_multisession_images_is_not_yet_implemented);
             WholeDiscChecked = false;
         }
 
diff --git a/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs
index 2d1826a66..6541dd804 100644
--- a/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs
@@ -439,7 +439,7 @@ public sealed class ImageVerifyViewModel : ViewModelBase
                                       };
                 });
 
-                AaruConsole.VerboseWriteLine(UI.Checking_disc_image_checksums_took_0,
+                AaruConsole.Verbose(UI.Checking_disc_image_checksums_took_0,
                                              chkStopwatch.Elapsed.Humanize(minUnit: TimeUnit.Second));
             }
         }
@@ -611,7 +611,7 @@ public sealed class ImageVerifyViewModel : ViewModelBase
                 chkStopwatch.Stop();
             }
 
-            AaruConsole.VerboseWriteLine(UI.Checking_sector_checksums_took_0,
+            AaruConsole.Verbose(UI.Checking_sector_checksums_took_0,
                                          chkStopwatch.Elapsed.Humanize(minUnit: TimeUnit.Second));
 
             await Dispatcher.UIThread.InvokeAsync(() =>
diff --git a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
index e45cbb854..e1dc9c125 100644
--- a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
@@ -581,8 +581,8 @@ public sealed class MainWindowViewModel : ViewModelBase
                                                             ButtonEnum.Ok,
                                                             Icon.Error);
 
-                    AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
-                    AaruConsole.ErrorWriteLine(UI.No_error_given);
+                    AaruConsole.Error(UI.Unable_to_open_image_format);
+                    AaruConsole.Error(UI.No_error_given);
 
                     return;
                 }
@@ -614,7 +614,7 @@ public sealed class MainWindowViewModel : ViewModelBase
 
                 if(partitions.Count == 0)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, UI.No_partitions_found);
+                    AaruConsole.Debug(MODULE_NAME, UI.No_partitions_found);
 
                     checkRaw = true;
                 }
@@ -797,9 +797,9 @@ public sealed class MainWindowViewModel : ViewModelBase
                                                         ButtonEnum.Ok,
                                                         Icon.Error);
 
-                AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
-                AaruConsole.WriteException(ex);
+                AaruConsole.Error(UI.Unable_to_open_image_format);
+                AaruConsole.Error(Localization.Core.Error_0, ex.Message);
+                AaruConsole.Exception(ex);
             }
         }
         catch(Exception ex)
@@ -809,8 +809,8 @@ public sealed class MainWindowViewModel : ViewModelBase
                                                     ButtonEnum.Ok,
                                                     Icon.Error);
 
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message));
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(string.Format(UI.Error_reading_file_0, ex.Message));
+            AaruConsole.Exception(ex);
         }
 
         Statistics.AddCommand("image-info");
@@ -834,7 +834,7 @@ public sealed class MainWindowViewModel : ViewModelBase
                                                        .OrderBy(d => d.Vendor)
                                                        .ThenBy(d => d.Model))
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            UI.Found_supported_device_model_0_by_manufacturer_1_on_bus_2_and_path_3,
                                            device.Model,
                                            device.Vendor,
@@ -890,7 +890,7 @@ public sealed class MainWindowViewModel : ViewModelBase
         }
         catch(InvalidOperationException ex)
         {
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
index 7ed68eb98..02c7fed08 100644
--- a/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
@@ -214,9 +214,9 @@ public sealed class SplashWindowViewModel(SplashWindow view) : ViewModelBase
                 }
                 catch(Exception)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Exception_trying_to_remove_old_database_version);
+                    AaruConsole.Error(UI.Exception_trying_to_remove_old_database_version);
 
-                    AaruConsole.ErrorWriteLine(UI.Please_manually_remove_file_at_0, Settings.Settings.MainDbPath);
+                    AaruConsole.Error(UI.Please_manually_remove_file_at_0, Settings.Settings.MainDbPath);
 
                     return;
                 }
diff --git a/Aaru.Helpers/DateHandlers.cs b/Aaru.Helpers/DateHandlers.cs
index a6ef87569..2ae32d1c4 100644
--- a/Aaru.Helpers/DateHandlers.cs
+++ b/Aaru.Helpers/DateHandlers.cs
@@ -111,7 +111,7 @@ public static class DateHandlers
         fourCharValue[2] = vdDateTime[2];
         fourCharValue[3] = vdDateTime[3];
 
-        AaruConsole.DebugWriteLine(ISO9660_MODULE_NAME,
+        AaruConsole.Debug(ISO9660_MODULE_NAME,
                                    "year = \"{0}\"",
                                    StringHandlers.CToString(fourCharValue, Encoding.ASCII));
 
@@ -120,7 +120,7 @@ public static class DateHandlers
         twoCharValue[0] = vdDateTime[4];
         twoCharValue[1] = vdDateTime[5];
 
-        AaruConsole.DebugWriteLine(ISO9660_MODULE_NAME,
+        AaruConsole.Debug(ISO9660_MODULE_NAME,
                                    "month = \"{0}\"",
                                    StringHandlers.CToString(twoCharValue, Encoding.ASCII));
 
@@ -129,7 +129,7 @@ public static class DateHandlers
         twoCharValue[0] = vdDateTime[6];
         twoCharValue[1] = vdDateTime[7];
 
-        AaruConsole.DebugWriteLine(ISO9660_MODULE_NAME,
+        AaruConsole.Debug(ISO9660_MODULE_NAME,
                                    "day = \"{0}\"",
                                    StringHandlers.CToString(twoCharValue, Encoding.ASCII));
 
@@ -138,7 +138,7 @@ public static class DateHandlers
         twoCharValue[0] = vdDateTime[8];
         twoCharValue[1] = vdDateTime[9];
 
-        AaruConsole.DebugWriteLine(ISO9660_MODULE_NAME,
+        AaruConsole.Debug(ISO9660_MODULE_NAME,
                                    "hour = \"{0}\"",
                                    StringHandlers.CToString(twoCharValue, Encoding.ASCII));
 
@@ -147,7 +147,7 @@ public static class DateHandlers
         twoCharValue[0] = vdDateTime[10];
         twoCharValue[1] = vdDateTime[11];
 
-        AaruConsole.DebugWriteLine(ISO9660_MODULE_NAME,
+        AaruConsole.Debug(ISO9660_MODULE_NAME,
                                    "minute = \"{0}\"",
                                    StringHandlers.CToString(twoCharValue, Encoding.ASCII));
 
@@ -156,7 +156,7 @@ public static class DateHandlers
         twoCharValue[0] = vdDateTime[12];
         twoCharValue[1] = vdDateTime[13];
 
-        AaruConsole.DebugWriteLine(ISO9660_MODULE_NAME,
+        AaruConsole.Debug(ISO9660_MODULE_NAME,
                                    "second = \"{0}\"",
                                    StringHandlers.CToString(twoCharValue, Encoding.ASCII));
 
@@ -165,13 +165,13 @@ public static class DateHandlers
         twoCharValue[0] = vdDateTime[14];
         twoCharValue[1] = vdDateTime[15];
 
-        AaruConsole.DebugWriteLine(ISO9660_MODULE_NAME,
+        AaruConsole.Debug(ISO9660_MODULE_NAME,
                                    "hundredths = \"{0}\"",
                                    StringHandlers.CToString(twoCharValue, Encoding.ASCII));
 
         if(!int.TryParse(StringHandlers.CToString(twoCharValue, Encoding.ASCII), out int hundredths)) hundredths = 0;
 
-        AaruConsole.DebugWriteLine(ISO9660_MODULE_NAME,
+        AaruConsole.Debug(ISO9660_MODULE_NAME,
                                    "decodedDT = new DateTime({0}, {1}, {2}, {3}, {4}, {5}, {6}, DateTimeKind.Unspecified);",
                                    year,
                                    month,
@@ -221,7 +221,7 @@ public static class DateHandlers
         int day   = (dateRecord & 0x01F0) >> 4;
         int month = dateRecord & 0x000F;
 
-        AaruConsole.DebugWriteLine(PASCAL_MODULE_NAME,
+        AaruConsole.Debug(PASCAL_MODULE_NAME,
                                    "dateRecord = 0x{0:X4}, year = {1}, month = {2}, day = {3}",
                                    dateRecord,
                                    year,
@@ -244,14 +244,14 @@ public static class DateHandlers
         int minute = (time & 0x7E0)  >> 5;
         int second = (time & 0x1F) * 2;
 
-        AaruConsole.DebugWriteLine(DOS_MODULE_NAME,
+        AaruConsole.Debug(DOS_MODULE_NAME,
                                    "date = 0x{0:X4}, year = {1}, month = {2}, day = {3}",
                                    date,
                                    year,
                                    month,
                                    day);
 
-        AaruConsole.DebugWriteLine(DOS_MODULE_NAME,
+        AaruConsole.Debug(DOS_MODULE_NAME,
                                    "time = 0x{0:X4}, hour = {1}, minute = {2}, second = {3}",
                                    time,
                                    hour,
diff --git a/Aaru.Images/A2R/Read.cs b/Aaru.Images/A2R/Read.cs
index a0f21f5ee..9895fd2e8 100644
--- a/Aaru.Images/A2R/Read.cs
+++ b/Aaru.Images/A2R/Read.cs
@@ -62,14 +62,14 @@ public sealed partial class A2R
 
         _header = Marshal.ByteArrayToStructureLittleEndian<A2RHeader>(hdr);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "header.signature = \"{0}\"",
                                    StringHandlers.CToString(_header.signature));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.version = {0}",        _header.version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.highBitTest = {0:X2}", _header.highBitTest);
+        AaruConsole.Debug(MODULE_NAME, "header.version = {0}",        _header.version);
+        AaruConsole.Debug(MODULE_NAME, "header.highBitTest = {0:X2}", _header.highBitTest);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "header.lineTest = {0:X2} {1:X2} {2:X2}",
                                    _header.lineTest[0],
                                    _header.lineTest[1],
@@ -91,25 +91,25 @@ public sealed partial class A2R
                 _a2RStream.EnsureRead(infoChnk, 0, Marshal.SizeOf<InfoChunkV2>());
                 _infoChunkV2 = Marshal.ByteArrayToStructureLittleEndian<InfoChunkV2>(infoChnk);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "infoChunk.header.chunkId = \"{0}\"",
                                            StringHandlers.CToString(_infoChunkV2.header.chunkId));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "infoChunk.header.chunkSize = {0}",
                                            _infoChunkV2.header.chunkSize);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.version = {0}", _infoChunkV2.version);
+                AaruConsole.Debug(MODULE_NAME, "infoChunk.version = {0}", _infoChunkV2.version);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "infoChunk.creator = \"{0}\"",
                                            StringHandlers.CToString(_infoChunkV2.creator).TrimEnd());
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.diskType = {0}", _infoChunkV2.diskType);
+                AaruConsole.Debug(MODULE_NAME, "infoChunk.diskType = {0}", _infoChunkV2.diskType);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.writeProtected = {0}", _infoChunkV2.writeProtected);
+                AaruConsole.Debug(MODULE_NAME, "infoChunk.writeProtected = {0}", _infoChunkV2.writeProtected);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.synchronized = {0}", _infoChunkV2.synchronized);
+                AaruConsole.Debug(MODULE_NAME, "infoChunk.synchronized = {0}", _infoChunkV2.synchronized);
 
                 _imageInfo.Creator = Encoding.ASCII.GetString(_infoChunkV2.creator).TrimEnd();
 
@@ -140,27 +140,27 @@ public sealed partial class A2R
                 _a2RStream.EnsureRead(infoChk, 0, Marshal.SizeOf<InfoChunkV3>());
                 _infoChunkV3 = Marshal.ByteArrayToStructureLittleEndian<InfoChunkV3>(infoChk);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "infoChunk.header.chunkId = \"{0}\"",
                                            StringHandlers.CToString(_infoChunkV3.header.chunkId));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "infoChunk.header.chunkSize = {0}",
                                            _infoChunkV3.header.chunkSize);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.version = {0}", _infoChunkV3.version);
+                AaruConsole.Debug(MODULE_NAME, "infoChunk.version = {0}", _infoChunkV3.version);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "infoChunk.creator = \"{0}\"",
                                            StringHandlers.CToString(_infoChunkV3.creator).TrimEnd());
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.driveType = {0}", _infoChunkV3.driveType);
+                AaruConsole.Debug(MODULE_NAME, "infoChunk.driveType = {0}", _infoChunkV3.driveType);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.writeProtected = {0}", _infoChunkV3.writeProtected);
+                AaruConsole.Debug(MODULE_NAME, "infoChunk.writeProtected = {0}", _infoChunkV3.writeProtected);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "infoChunk.synchronized = {0}", _infoChunkV3.synchronized);
+                AaruConsole.Debug(MODULE_NAME, "infoChunk.synchronized = {0}", _infoChunkV3.synchronized);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "infoChunk.hardSectorCount = {0}",
                                            _infoChunkV3.hardSectorCount);
 
diff --git a/Aaru.Images/A2R/Write.cs b/Aaru.Images/A2R/Write.cs
index 217fbaae2..0505fc03f 100644
--- a/Aaru.Images/A2R/Write.cs
+++ b/Aaru.Images/A2R/Write.cs
@@ -135,7 +135,7 @@ public sealed partial class A2R
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
index d2e8e1c7a..d4bf16853 100644
--- a/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
+++ b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
@@ -158,15 +158,15 @@ public sealed partial class AaruFormat
         stopwatch.Stop();
         TimeSpan sequentialize = stopwatch.Elapsed;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Took_0_ms_to_deinterleave_subchannel,
                                    deinterleave.TotalMilliseconds);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Took_0_ms_to_sequentialize_subchannel,
                                    sequentialize.TotalMilliseconds);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Took_0_ms_to_transform_subchannel,
                                    deinterleave.TotalMilliseconds + sequentialize.TotalMilliseconds);
 
@@ -293,15 +293,15 @@ public sealed partial class AaruFormat
         stopwatch.Stop();
         TimeSpan interleave = stopwatch.Elapsed;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Took_0_ms_to_desequentialize_subchannel,
                                    desequentialize.TotalMilliseconds);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Took_0_ms_to_interleave_subchannel,
                                    interleave.TotalMilliseconds);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Took_0_ms_to_untransform_subchannel,
                                    interleave.TotalMilliseconds + desequentialize.TotalMilliseconds);
 
diff --git a/Aaru.Images/AaruFormat/Read.cs b/Aaru.Images/AaruFormat/Read.cs
index b88fe15cb..db89b0f30 100644
--- a/Aaru.Images/AaruFormat/Read.cs
+++ b/Aaru.Images/AaruFormat/Read.cs
@@ -68,7 +68,7 @@ public sealed partial class AaruFormat
     /// <inheritdoc />
     public ErrorNumber Open(IFilter imageFilter)
     {
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+        AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
         _imageStream = imageFilter.GetDataForkStream();
         _imageStream.Seek(0, SeekOrigin.Begin);
@@ -81,7 +81,7 @@ public sealed partial class AaruFormat
 
         if(_header.imageMajorVersion > AARUFMT_VERSION)
         {
-            AaruConsole.ErrorWriteLine(string.Format(Localization.Image_version_0_not_recognized,
+            AaruConsole.Error(string.Format(Localization.Image_version_0_not_recognized,
                                                      _header.imageMajorVersion));
 
             return ErrorNumber.NotSupported;
@@ -92,7 +92,7 @@ public sealed partial class AaruFormat
         _imageInfo.Version            = $"{_header.imageMajorVersion}.{_header.imageMinorVersion}";
         _imageInfo.MediaType          = _header.mediaType;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+        AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
         // Read the index header
         _imageStream.Position = (long)_header.indexOffset;
@@ -102,7 +102,7 @@ public sealed partial class AaruFormat
 
         if(idxHeader.identifier != BlockType.Index && idxHeader.identifier != BlockType.Index2)
         {
-            AaruConsole.ErrorWriteLine(Localization.Index_not_found);
+            AaruConsole.Error(Localization.Index_not_found);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -114,12 +114,12 @@ public sealed partial class AaruFormat
             _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length);
             IndexHeader2 idxHeader2 = Marshal.SpanToStructureLittleEndian<IndexHeader2>(_structureBytes);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Index_at_0_contains_1_entries,
                                        _header.indexOffset,
                                        idxHeader2.entries);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+            AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
             // Fill in-memory index
             _index = [];
@@ -130,7 +130,7 @@ public sealed partial class AaruFormat
                 _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length);
                 IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(_structureBytes);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Block_type_0_with_data_type_1_is_indexed_to_be_at_2,
                                            entry.blockType,
                                            entry.dataType,
@@ -141,12 +141,12 @@ public sealed partial class AaruFormat
         }
         else
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Index_at_0_contains_1_entries,
                                        _header.indexOffset,
                                        idxHeader.entries);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+            AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
             // Fill in-memory index
             _index = [];
@@ -157,7 +157,7 @@ public sealed partial class AaruFormat
                 _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length);
                 IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(_structureBytes);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Block_type_0_with_data_type_1_is_indexed_to_be_at_2,
                                            entry.blockType,
                                            entry.dataType,
@@ -167,7 +167,7 @@ public sealed partial class AaruFormat
             }
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+        AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
         _imageInfo.ImageSize = 0;
 
@@ -203,7 +203,7 @@ public sealed partial class AaruFormat
 
                     if(blockHeader.identifier != entry.blockType)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Incorrect_identifier_for_data_block_at_position_0,
                                                    entry.offset);
 
@@ -212,7 +212,7 @@ public sealed partial class AaruFormat
 
                     if(blockHeader.type != entry.dataType)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Expected_block_with_data_type_0_at_position_1_but_found_data_type_2,
                                                    entry.dataType,
@@ -224,12 +224,12 @@ public sealed partial class AaruFormat
 
                     byte[] data;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_data_block_type_0_at_position_1,
                                                entry.dataType,
                                                entry.offset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Memory_snapshot_0_bytes,
                                                GC.GetTotalMemory(false));
 
@@ -240,7 +240,7 @@ public sealed partial class AaruFormat
                         if(blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform &&
                            entry.dataType          != DataType.CdSectorSubchannel)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .Invalid_compression_type_0_for_block_with_data_type_1_continuing,
                                                        blockHeader.compression,
@@ -260,7 +260,7 @@ public sealed partial class AaruFormat
 
                         if(decompressedLength != blockHeader.length)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .Error_decompressing_block_should_be_0_bytes_but_got_1_bytes,
                                                        blockHeader.length,
@@ -274,11 +274,11 @@ public sealed partial class AaruFormat
 
                         decompressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_decompress_block,
                                                    decompressStopwatch.Elapsed.TotalSeconds);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Memory_snapshot_0_bytes,
                                                    GC.GetTotalMemory(false));
                     }
@@ -287,13 +287,13 @@ public sealed partial class AaruFormat
                         data = new byte[blockHeader.length];
                         _imageStream.EnsureRead(data, 0, (int)blockHeader.length);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Memory_snapshot_0_bytes,
                                                    GC.GetTotalMemory(false));
                     }
                     else
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_unknown_compression_type_0_continuing,
                                                    (ushort)blockHeader.compression);
 
@@ -305,7 +305,7 @@ public sealed partial class AaruFormat
 
                     if(BitConverter.ToUInt64(blockCrc, 0) != blockHeader.crc64 && blockHeader.crc64 != 0)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing,
                                                    BitConverter.ToUInt64(blockCrc, 0),
@@ -333,7 +333,7 @@ public sealed partial class AaruFormat
                             if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
                                 _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -363,7 +363,7 @@ public sealed partial class AaruFormat
                             if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
                                 _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -374,7 +374,7 @@ public sealed partial class AaruFormat
                             if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
                                 _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -387,7 +387,7 @@ public sealed partial class AaruFormat
                             if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
                                 _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -395,7 +395,7 @@ public sealed partial class AaruFormat
                         case DataType.CompactDiscMode2Subheader:
                             _mode2Subheaders = data;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -409,7 +409,7 @@ public sealed partial class AaruFormat
                             if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorTitleKey))
                                 _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorTitleKey);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -423,7 +423,7 @@ public sealed partial class AaruFormat
                             if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorNumber))
                                 _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorNumber);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -434,7 +434,7 @@ public sealed partial class AaruFormat
                             if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorIed))
                                 _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorIed);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -445,7 +445,7 @@ public sealed partial class AaruFormat
                             if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorEdc))
                                 _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorEdc);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -456,7 +456,7 @@ public sealed partial class AaruFormat
                             if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdTitleKeyDecrypted))
                                 _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdTitleKeyDecrypted);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -466,7 +466,7 @@ public sealed partial class AaruFormat
 
                             if(_mediaTags.ContainsKey(mediaTagType))
                             {
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization
                                                               .Media_tag_type_0_duplicated_removing_previous_entry,
                                                            mediaTagType);
@@ -476,7 +476,7 @@ public sealed partial class AaruFormat
 
                             _mediaTags.Add(mediaTagType, data);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -498,7 +498,7 @@ public sealed partial class AaruFormat
                             _imageInfo.Sectors = ddtHeader.entries;
                             _shift             = ddtHeader.shift;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -506,7 +506,7 @@ public sealed partial class AaruFormat
                             switch(ddtHeader.compression)
                             {
                                 case CompressionType.Lzma:
-                                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Decompressing_DDT);
+                                    AaruConsole.Debug(MODULE_NAME, Localization.Decompressing_DDT);
                                     var ddtStopwatch = new Stopwatch();
                                     ddtStopwatch.Start();
                                     byte[] compressedDdt  = new byte[ddtHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
@@ -520,7 +520,7 @@ public sealed partial class AaruFormat
 
                                     if(decompressedLength != ddtHeader.length)
                                     {
-                                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                                        AaruConsole.Debug(MODULE_NAME,
                                                                    Localization
                                                                       .Error_decompressing_DDT_should_be_0_bytes_but_got_1_bytes,
                                                                    ddtHeader.length,
@@ -533,11 +533,11 @@ public sealed partial class AaruFormat
                                     ddtStopwatch.Stop();
                                     _inMemoryDdt = true;
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization.Took_0_seconds_to_decompress_DDT,
                                                                ddtStopwatch.Elapsed.TotalSeconds);
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization.Memory_snapshot_0_bytes,
                                                                GC.GetTotalMemory(false));
 
@@ -546,13 +546,13 @@ public sealed partial class AaruFormat
                                     _inMemoryDdt          = false;
                                     _outMemoryDdtPosition = (long)entry.offset;
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization.Memory_snapshot_0_bytes,
                                                                GC.GetTotalMemory(false));
 
                                     break;
                                 default:
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization
+                                    AaruConsole.Error(string.Format(Localization
                                                                                 .Found_unsupported_compression_algorithm_0,
                                                                              (ushort)ddtHeader.compression));
 
@@ -567,7 +567,7 @@ public sealed partial class AaruFormat
                         {
                             byte[] decompressedDdt = new byte[ddtHeader.length];
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -575,7 +575,7 @@ public sealed partial class AaruFormat
                             switch(ddtHeader.compression)
                             {
                                 case CompressionType.Lzma:
-                                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Decompressing_DDT);
+                                    AaruConsole.Debug(MODULE_NAME, Localization.Decompressing_DDT);
                                     var ddtStopwatch = new Stopwatch();
                                     ddtStopwatch.Start();
                                     byte[] compressedDdt  = new byte[ddtHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
@@ -590,7 +590,7 @@ public sealed partial class AaruFormat
 
                                     if(decompressedLength != ddtHeader.length)
                                     {
-                                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                                        AaruConsole.Debug(MODULE_NAME,
                                                                    Localization
                                                                       .Error_decompressing_DDT_should_be_0_bytes_but_got_1_bytes,
                                                                    ddtHeader.length,
@@ -599,11 +599,11 @@ public sealed partial class AaruFormat
                                         return ErrorNumber.InOutError;
                                     }
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization.Took_0_seconds_to_decompress_DDT,
                                                                ddtStopwatch.Elapsed.TotalSeconds);
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization.Memory_snapshot_0_bytes,
                                                                GC.GetTotalMemory(false));
 
@@ -611,13 +611,13 @@ public sealed partial class AaruFormat
                                 case CompressionType.None:
                                     _imageStream.EnsureRead(decompressedDdt, 0, decompressedDdt.Length);
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization.Memory_snapshot_0_bytes,
                                                                GC.GetTotalMemory(false));
 
                                     break;
                                 default:
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization
+                                    AaruConsole.Error(string.Format(Localization
                                                                                 .Found_unsupported_compression_algorithm_0,
                                                                              (ushort)ddtHeader.compression));
 
@@ -640,7 +640,7 @@ public sealed partial class AaruFormat
                                     break;
                             }
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
 
@@ -658,7 +658,7 @@ public sealed partial class AaruFormat
 
                     if(_geometryBlock.identifier == BlockType.GeometryBlock)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Geometry_set_to_0_cylinders_1_heads_2_sectors_per_track,
                                                    _geometryBlock.cylinders,
                                                    _geometryBlock.heads,
@@ -668,7 +668,7 @@ public sealed partial class AaruFormat
                         _imageInfo.Heads           = _geometryBlock.heads;
                         _imageInfo.SectorsPerTrack = _geometryBlock.sectorsPerTrack;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Memory_snapshot_0_bytes,
                                                    GC.GetTotalMemory(false));
                     }
@@ -684,14 +684,14 @@ public sealed partial class AaruFormat
 
                     if(metadataBlock.identifier != entry.blockType)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Incorrect_identifier_for_data_block_at_position_0,
                                                    entry.offset);
 
                         break;
                     }
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_metadata_block_at_position_0,
                                                entry.offset);
 
@@ -704,7 +704,7 @@ public sealed partial class AaruFormat
                         _imageInfo.MediaSequence     = metadataBlock.mediaSequence;
                         _imageInfo.LastMediaSequence = metadataBlock.lastMediaSequence;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_media_sequence_as_0_of_1,
                                                    _imageInfo.MediaSequence,
                                                    _imageInfo.LastMediaSequence);
@@ -717,7 +717,7 @@ public sealed partial class AaruFormat
                                                                         (int)metadataBlock.creatorOffset,
                                                                         (int)(metadataBlock.creatorLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_creator_0, _imageInfo.Creator);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Setting_creator_0, _imageInfo.Creator);
                     }
 
                     if(metadataBlock.commentsOffset                                > 0 &&
@@ -727,7 +727,7 @@ public sealed partial class AaruFormat
                                                                          (int)metadataBlock.commentsOffset,
                                                                          (int)(metadataBlock.commentsLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_comments_0, _imageInfo.Comments);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Setting_comments_0, _imageInfo.Comments);
                     }
 
                     if(metadataBlock.mediaTitleOffset                                  > 0 &&
@@ -738,7 +738,7 @@ public sealed partial class AaruFormat
                                                        (int)metadataBlock.mediaTitleOffset,
                                                        (int)(metadataBlock.mediaTitleLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_media_title_0,
                                                    _imageInfo.MediaTitle);
                     }
@@ -751,7 +751,7 @@ public sealed partial class AaruFormat
                                                        (int)metadataBlock.mediaManufacturerOffset,
                                                        (int)(metadataBlock.mediaManufacturerLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_media_manufacturer_0,
                                                    _imageInfo.MediaManufacturer);
                     }
@@ -764,7 +764,7 @@ public sealed partial class AaruFormat
                                                        (int)metadataBlock.mediaModelOffset,
                                                        (int)(metadataBlock.mediaModelLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_media_model_0,
                                                    _imageInfo.MediaModel);
                     }
@@ -777,7 +777,7 @@ public sealed partial class AaruFormat
                                                        (int)metadataBlock.mediaSerialNumberOffset,
                                                        (int)(metadataBlock.mediaSerialNumberLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_media_serial_number_0,
                                                    _imageInfo.MediaSerialNumber);
                     }
@@ -790,7 +790,7 @@ public sealed partial class AaruFormat
                                                        (int)metadataBlock.mediaBarcodeOffset,
                                                        (int)(metadataBlock.mediaBarcodeLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_media_barcode_0,
                                                    _imageInfo.MediaBarcode);
                     }
@@ -803,7 +803,7 @@ public sealed partial class AaruFormat
                                                        (int)metadataBlock.mediaPartNumberOffset,
                                                        (int)(metadataBlock.mediaPartNumberLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_media_part_number_0,
                                                    _imageInfo.MediaPartNumber);
                     }
@@ -816,7 +816,7 @@ public sealed partial class AaruFormat
                                                        (int)metadataBlock.driveManufacturerOffset,
                                                        (int)(metadataBlock.driveManufacturerLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_drive_manufacturer_0,
                                                    _imageInfo.DriveManufacturer);
                     }
@@ -829,7 +829,7 @@ public sealed partial class AaruFormat
                                                        (int)metadataBlock.driveModelOffset,
                                                        (int)(metadataBlock.driveModelLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_drive_model_0,
                                                    _imageInfo.DriveModel);
                     }
@@ -842,7 +842,7 @@ public sealed partial class AaruFormat
                                                        (int)metadataBlock.driveSerialNumberOffset,
                                                        (int)(metadataBlock.driveSerialNumberLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_drive_serial_number_0,
                                                    _imageInfo.DriveSerialNumber);
                     }
@@ -856,12 +856,12 @@ public sealed partial class AaruFormat
                                                        (int)metadataBlock.driveFirmwareRevisionOffset,
                                                        (int)(metadataBlock.driveFirmwareRevisionLength - 2));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_drive_firmware_revision_0,
                                                    _imageInfo.DriveFirmwareRevision);
                     }
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Memory_snapshot_0_bytes,
                                                GC.GetTotalMemory(false));
 
@@ -875,7 +875,7 @@ public sealed partial class AaruFormat
 
                     if(tracksHeader.identifier != BlockType.TracksBlock)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Incorrect_identifier_for_tracks_block_at_position_0,
                                                    entry.offset);
 
@@ -888,7 +888,7 @@ public sealed partial class AaruFormat
 
                     if(BitConverter.ToUInt64(trksCrc, 0) != tracksHeader.crc64)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing,
                                                    BitConverter.ToUInt64(trksCrc, 0),
@@ -903,7 +903,7 @@ public sealed partial class AaruFormat
                     _trackFlags = new Dictionary<byte, byte>();
                     _trackIsrcs = new Dictionary<byte, string>();
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_0_tracks_at_position_1,
                                                tracksHeader.entries,
                                                entry.offset);
@@ -945,7 +945,7 @@ public sealed partial class AaruFormat
                     _imageInfo.HasPartitions = true;
                     _imageInfo.HasSessions   = true;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Memory_snapshot_0_bytes,
                                                GC.GetTotalMemory(false));
 
@@ -961,11 +961,11 @@ public sealed partial class AaruFormat
 
                     if(cicmBlock.identifier != BlockType.CicmBlock) break;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_CICM_XML_metadata_block_at_position_0,
                                                entry.offset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Memory_snapshot_0_bytes,
                                                GC.GetTotalMemory(false));
 
@@ -990,16 +990,16 @@ public sealed partial class AaruFormat
                     }
                     catch(XmlException ex)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Exception_0_processing_CICM_XML_metadata_block,
                                                    ex.Message);
 
-                        AaruConsole.WriteException(ex);
+                        AaruConsole.Exception(ex);
 
                         AaruMetadata = null;
                     }
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Memory_snapshot_0_bytes,
                                                GC.GetTotalMemory(false));
 
@@ -1015,11 +1015,11 @@ public sealed partial class AaruFormat
 
                     if(aaruMetadataBlock.identifier != BlockType.AaruMetadataJsonBlock) break;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_Aaru_Metadata_block_at_position_0,
                                                entry.offset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Memory_snapshot_0_bytes,
                                                GC.GetTotalMemory(false));
 
@@ -1034,16 +1034,16 @@ public sealed partial class AaruFormat
                     }
                     catch(JsonException ex)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Exception_0_processing_Aaru_Metadata_block,
                                                    ex.Message);
 
-                        AaruConsole.WriteException(ex);
+                        AaruConsole.Exception(ex);
 
                         AaruMetadata = null;
                     }
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Memory_snapshot_0_bytes,
                                                GC.GetTotalMemory(false));
 
@@ -1059,11 +1059,11 @@ public sealed partial class AaruFormat
 
                     if(dumpBlock.identifier != BlockType.DumpHardwareBlock) break;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_dump_hardware_block_at_position_0,
                                                entry.offset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Memory_snapshot_0_bytes,
                                                GC.GetTotalMemory(false));
 
@@ -1073,7 +1073,7 @@ public sealed partial class AaruFormat
 
                     if(BitConverter.ToUInt64(dumpCrc, 0) != dumpBlock.crc64)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing,
                                                    BitConverter.ToUInt64(dumpCrc, 0),
@@ -1186,7 +1186,7 @@ public sealed partial class AaruFormat
 
                     if(DumpHardware.Count == 0) DumpHardware = null;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Memory_snapshot_0_bytes,
                                                GC.GetTotalMemory(false));
 
@@ -1202,7 +1202,7 @@ public sealed partial class AaruFormat
 
                     if(partitionHeader.identifier != BlockType.TapePartitionBlock) break;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_tape_partition_block_at_position_0,
                                                entry.offset);
 
@@ -1237,7 +1237,7 @@ public sealed partial class AaruFormat
 
                     if(fileHeader.identifier != BlockType.TapeFileBlock) break;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_tape_file_block_at_position_0,
                                                entry.offset);
 
@@ -1271,7 +1271,7 @@ public sealed partial class AaruFormat
 
                     if(indexesHeader.identifier != BlockType.CompactDiscIndexesBlock)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Incorrect_identifier_for_compact_disc_indexes_block_at_position_0,
                                                    entry.offset);
@@ -1285,7 +1285,7 @@ public sealed partial class AaruFormat
 
                     if(BitConverter.ToUInt64(idsxCrc, 0) != indexesHeader.crc64)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing,
                                                    BitConverter.ToUInt64(idsxCrc, 0),
@@ -1298,7 +1298,7 @@ public sealed partial class AaruFormat
 
                     compactDiscIndexes = [];
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_0_compact_disc_indexes_at_position_1,
                                                indexesHeader.entries,
                                                entry.offset);
@@ -1313,7 +1313,7 @@ public sealed partial class AaruFormat
                                                        CompactDiscIndexEntry>(_structureBytes));
                     }
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Memory_snapshot_0_bytes,
                                                GC.GetTotalMemory(false));
 
@@ -1323,16 +1323,16 @@ public sealed partial class AaruFormat
 
         if(!foundUserDataDdt)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_find_user_data_deduplication_table);
+            AaruConsole.Error(Localization.Could_not_find_user_data_deduplication_table);
 
             return ErrorNumber.InvalidArgument;
         }
 
         _imageInfo.CreationTime = DateTime.FromFileTimeUtc(_header.creationTime);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Image_created_on_0, _imageInfo.CreationTime);
+        AaruConsole.Debug(MODULE_NAME, Localization.Image_created_on_0, _imageInfo.CreationTime);
         _imageInfo.LastModificationTime = DateTime.FromFileTimeUtc(_header.lastWrittenTime);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Image_last_written_on_0, _imageInfo.LastModificationTime);
+        AaruConsole.Debug(MODULE_NAME, Localization.Image_last_written_on_0, _imageInfo.LastModificationTime);
 
         _imageInfo.MetadataMediaType = GetMetadataMediaType(_header.mediaType);
 
@@ -1346,7 +1346,7 @@ public sealed partial class AaruFormat
 
         _imageInfo.ReadableMediaTags.AddRange(_mediaTags.Keys);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+        AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
         // Initialize caches
         _blockCache       = new Dictionary<ulong, byte[]>();
@@ -1355,7 +1355,7 @@ public sealed partial class AaruFormat
 
         if(!_inMemoryDdt) _ddtEntryCache = new Dictionary<ulong, ulong>();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+        AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
         // Initialize tracks, sessions and partitions
         if(_imageInfo.MetadataMediaType == MetadataMediaType.OpticalDisc)
@@ -1462,16 +1462,16 @@ public sealed partial class AaruFormat
                 }
 
                 if(leadOutFixed)
-                    AaruConsole.ErrorWriteLine(Localization.This_image_has_a_corrupted_track_list_convert_will_fix_it);
+                    AaruConsole.Error(Localization.This_image_has_a_corrupted_track_list_convert_will_fix_it);
 
                 if(sessionPregapFixed)
                 {
-                    AaruConsole.ErrorWriteLine(Localization
+                    AaruConsole.Error(Localization
                                                   .This_image_has_a_corrupted_track_list_a_best_effort_has_been_tried_but_may_require_manual_editing_or_redump);
                 }
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+            AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
             if(Tracks == null || Tracks.Count == 0)
             {
@@ -1501,7 +1501,7 @@ public sealed partial class AaruFormat
                 _trackIsrcs = new Dictionary<byte, string>();
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+            AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
             Sessions = [];
 
@@ -1517,7 +1517,7 @@ public sealed partial class AaruFormat
                 });
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+            AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
             foreach(Track track in Tracks.OrderBy(t => t.StartSector))
             {
@@ -1566,7 +1566,7 @@ public sealed partial class AaruFormat
                 currentTrackOffset += (track.EndSector - track.StartSector + 1) * (ulong)track.BytesPerSector;
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+            AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
             Track[] tracks = Tracks.ToArray();
 
@@ -1591,11 +1591,11 @@ public sealed partial class AaruFormat
                 trk.SubchannelType   = TrackSubchannelType.Raw;
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+            AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
             Tracks = tracks.ToList();
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+            AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
             if(compactDiscIndexes != null)
             {
@@ -1621,7 +1621,7 @@ public sealed partial class AaruFormat
 
         if(_sectorSuffixDdt != null) EccInit();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+        AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
         if(_imageInfo.MetadataMediaType != MetadataMediaType.OpticalDisc) return ErrorNumber.NoError;
 
@@ -1723,7 +1723,7 @@ public sealed partial class AaruFormat
         blockHeader = Marshal.SpanToStructureLittleEndian<BlockHeader>(_structureBytes);
 
         // Decompress block
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+        AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
         ulong decompressedLength;
 
@@ -1733,7 +1733,7 @@ public sealed partial class AaruFormat
                 block = new byte[blockHeader.length];
                 _imageStream.EnsureRead(block, 0, (int)blockHeader.length);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+                AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
                 break;
             case CompressionType.Lzma:
@@ -1746,7 +1746,7 @@ public sealed partial class AaruFormat
 
                 if(decompressedLength != blockHeader.length)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Error_decompressing_block_should_be_0_bytes_but_got_1_bytes,
                                                blockHeader.length,
                                                decompressedLength);
@@ -1754,7 +1754,7 @@ public sealed partial class AaruFormat
                     return ErrorNumber.InOutError;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+                AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
                 break;
             case CompressionType.Flac:
@@ -1765,7 +1765,7 @@ public sealed partial class AaruFormat
 
                 if(decompressedLength != blockHeader.length)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Error_decompressing_block_should_be_0_bytes_but_got_1_bytes,
                                                blockHeader.length,
                                                decompressedLength);
@@ -1773,7 +1773,7 @@ public sealed partial class AaruFormat
                     return ErrorNumber.InOutError;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+                AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
                 break;
             default:
@@ -1796,7 +1796,7 @@ public sealed partial class AaruFormat
         buffer = new byte[blockHeader.sectorSize];
         Array.Copy(block, (long)(offset * blockHeader.sectorSize), buffer, 0, blockHeader.sectorSize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+        AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
         return ErrorNumber.NoError;
     }
diff --git a/Aaru.Images/AaruFormat/Verify.cs b/Aaru.Images/AaruFormat/Verify.cs
index a4a9432ae..2c22be32a 100644
--- a/Aaru.Images/AaruFormat/Verify.cs
+++ b/Aaru.Images/AaruFormat/Verify.cs
@@ -47,7 +47,7 @@ public sealed partial class AaruFormat
     public bool? VerifyMediaImage()
     {
         // This will traverse all blocks and check their CRC64 without uncompressing them
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Checking_index_integrity_at_0, _header.indexOffset);
+        AaruConsole.Debug(MODULE_NAME, Localization.Checking_index_integrity_at_0, _header.indexOffset);
 
         _imageStream.Position = (long)_header.indexOffset;
 
@@ -57,12 +57,12 @@ public sealed partial class AaruFormat
 
         if(idxHeader.identifier != BlockType.Index)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Incorrect_index_identifier);
+            AaruConsole.Debug(MODULE_NAME, Localization.Incorrect_index_identifier);
 
             return false;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Index_at_0_contains_1_entries,
                                    _header.indexOffset,
                                    idxHeader.entries);
@@ -73,7 +73,7 @@ public sealed partial class AaruFormat
 
         if(BitConverter.ToUInt64(verifyCrc, 0) != idxHeader.crc64)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Expected_index_CRC_0_X16_but_got_1_X16,
                                        idxHeader.crc64,
                                        BitConverter.ToUInt64(verifyCrc, 0));
@@ -91,7 +91,7 @@ public sealed partial class AaruFormat
             _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length);
             IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(_structureBytes);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Block_type_0_with_data_type_1_is_indexed_to_be_at_2,
                                        entry.blockType,
                                        entry.dataType,
@@ -120,7 +120,7 @@ public sealed partial class AaruFormat
                     crcVerify = new Crc64Context();
                     readBytes = 0;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Verifying_data_block_type_0_at_position_1,
                                                entry.dataType,
                                                entry.offset);
@@ -141,7 +141,7 @@ public sealed partial class AaruFormat
 
                     if(BitConverter.ToUInt64(verifyCrc, 0) != blockHeader.cmpCrc64)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Expected_block_CRC_0_X16_but_got_1_X16,
                                                    blockHeader.cmpCrc64,
                                                    BitConverter.ToUInt64(verifyCrc, 0));
@@ -158,7 +158,7 @@ public sealed partial class AaruFormat
                     crcVerify = new Crc64Context();
                     readBytes = 0;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Verifying_deduplication_table_type_0_at_position_1,
                                                entry.dataType,
                                                entry.offset);
@@ -179,7 +179,7 @@ public sealed partial class AaruFormat
 
                     if(BitConverter.ToUInt64(verifyCrc, 0) != ddtHeader.cmpCrc64)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Expected_DDT_CRC_0_but_got_1,
                                                    ddtHeader.cmpCrc64,
                                                    BitConverter.ToUInt64(verifyCrc, 0));
@@ -193,7 +193,7 @@ public sealed partial class AaruFormat
                     _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length);
                     TracksHeader trkHeader = Marshal.SpanToStructureLittleEndian<TracksHeader>(_structureBytes);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Track_block_at_0_contains_1_entries,
                                                _header.indexOffset,
                                                trkHeader.entries);
@@ -204,7 +204,7 @@ public sealed partial class AaruFormat
 
                     if(BitConverter.ToUInt64(verifyCrc, 0) != trkHeader.crc64)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Expected_index_CRC_0_X16_but_got_1_X16,
                                                    trkHeader.crc64,
                                                    BitConverter.ToUInt64(verifyCrc, 0));
@@ -214,7 +214,7 @@ public sealed partial class AaruFormat
 
                     break;
                 default:
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Ignored_field_type_0, entry.blockType);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Ignored_field_type_0, entry.blockType);
 
                     break;
             }
diff --git a/Aaru.Images/AaruFormat/Write.cs b/Aaru.Images/AaruFormat/Write.cs
index 8c8e0b46f..0ed011aaa 100644
--- a/Aaru.Images/AaruFormat/Write.cs
+++ b/Aaru.Images/AaruFormat/Write.cs
@@ -221,7 +221,7 @@ public sealed partial class AaruFormat
             _shift++;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Got_a_shift_of_0_for_1_sectors_per_block,
                                    _shift,
                                    oldSectorsPerBlock);
@@ -241,7 +241,7 @@ public sealed partial class AaruFormat
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
@@ -332,7 +332,7 @@ public sealed partial class AaruFormat
                 return false;
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Index_at_0_contains_1_entries,
                                        _header.indexOffset,
                                        idxHeader.entries);
@@ -343,7 +343,7 @@ public sealed partial class AaruFormat
                 _imageStream.EnsureRead(_structureBytes, 0, _structureBytes.Length);
                 IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(_structureBytes);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Block_type_0_with_data_type_1_is_indexed_to_be_at_2,
                                            entry.blockType,
                                            entry.dataType,
@@ -379,7 +379,7 @@ public sealed partial class AaruFormat
 
                         if(blockHeader.identifier != entry.blockType)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Incorrect_identifier_for_data_block_at_position_0,
                                                        entry.offset);
 
@@ -388,7 +388,7 @@ public sealed partial class AaruFormat
 
                         if(blockHeader.type != entry.dataType)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .Expected_block_with_data_type_0_at_position_1_but_found_data_type_2,
                                                        entry.dataType,
@@ -400,12 +400,12 @@ public sealed partial class AaruFormat
 
                         byte[] data;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_data_block_type_0_at_position_1,
                                                    entry.dataType,
                                                    entry.offset);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Memory_snapshot_0_bytes,
                                                    GC.GetTotalMemory(false));
 
@@ -416,7 +416,7 @@ public sealed partial class AaruFormat
                             if(blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform &&
                                entry.dataType          != DataType.CdSectorSubchannel)
                             {
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization
                                                               .Invalid_compression_type_0_for_block_with_data_type_1_continuing,
                                                            blockHeader.compression,
@@ -450,11 +450,11 @@ public sealed partial class AaruFormat
 
                             decompressStopwatch.Stop();
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Took_0_seconds_to_decompress_block,
                                                        decompressStopwatch.Elapsed.TotalSeconds);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
                         }
@@ -463,13 +463,13 @@ public sealed partial class AaruFormat
                             data = new byte[blockHeader.length];
                             _imageStream.EnsureRead(data, 0, (int)blockHeader.length);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
                         }
                         else
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Found_unknown_compression_type_0_continuing,
                                                        (ushort)blockHeader.compression);
 
@@ -481,7 +481,7 @@ public sealed partial class AaruFormat
 
                         if(BitConverter.ToUInt64(blockCrc, 0) != blockHeader.crc64 && blockHeader.crc64 != 0)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing,
                                                        BitConverter.ToUInt64(blockCrc, 0),
@@ -509,7 +509,7 @@ public sealed partial class AaruFormat
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -539,7 +539,7 @@ public sealed partial class AaruFormat
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -550,7 +550,7 @@ public sealed partial class AaruFormat
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -563,7 +563,7 @@ public sealed partial class AaruFormat
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -571,7 +571,7 @@ public sealed partial class AaruFormat
                             case DataType.CompactDiscMode2Subheader:
                                 _mode2Subheaders = data;
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -585,7 +585,7 @@ public sealed partial class AaruFormat
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorTitleKey))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorTitleKey);
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -596,7 +596,7 @@ public sealed partial class AaruFormat
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdTitleKeyDecrypted))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdTitleKeyDecrypted);
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -610,7 +610,7 @@ public sealed partial class AaruFormat
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorNumber))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorNumber);
 
-                                AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                AaruConsole.Debug("Aaru Format plugin",
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -621,7 +621,7 @@ public sealed partial class AaruFormat
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorIed))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorIed);
 
-                                AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                AaruConsole.Debug("Aaru Format plugin",
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -632,7 +632,7 @@ public sealed partial class AaruFormat
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdSectorEdc))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdSectorEdc);
 
-                                AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                AaruConsole.Debug("Aaru Format plugin",
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -642,7 +642,7 @@ public sealed partial class AaruFormat
 
                                 if(_mediaTags.ContainsKey(mediaTagType))
                                 {
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization
                                                                   .Media_tag_type_0_duplicated_removing_previous_entry,
                                                                mediaTagType);
@@ -652,7 +652,7 @@ public sealed partial class AaruFormat
 
                                 _mediaTags.Add(mediaTagType, data);
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Memory_snapshot_0_bytes,
                                                            GC.GetTotalMemory(false));
 
@@ -687,7 +687,7 @@ public sealed partial class AaruFormat
                             switch(ddtHeader.compression)
                             {
                                 case CompressionType.Lzma:
-                                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Decompressing_DDT);
+                                    AaruConsole.Debug(MODULE_NAME, Localization.Decompressing_DDT);
 
                                     var ddtStopwatch = new Stopwatch();
                                     ddtStopwatch.Start();
@@ -717,7 +717,7 @@ public sealed partial class AaruFormat
                                     ddtStopwatch.Stop();
                                     _inMemoryDdt = true;
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization.Took_0_seconds_to_decompress_DDT,
                                                                ddtStopwatch.Elapsed.TotalSeconds);
 
@@ -771,7 +771,7 @@ public sealed partial class AaruFormat
                             switch(ddtHeader.compression)
                             {
                                 case CompressionType.Lzma:
-                                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Decompressing_DDT);
+                                    AaruConsole.Debug(MODULE_NAME, Localization.Decompressing_DDT);
 
                                     var ddtStopwatch = new Stopwatch();
                                     ddtStopwatch.Start();
@@ -798,7 +798,7 @@ public sealed partial class AaruFormat
 
                                     ddtStopwatch.Stop();
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                Localization.Took_0_seconds_to_decompress_DDT,
                                                                ddtStopwatch.Elapsed.TotalSeconds);
 
@@ -839,7 +839,7 @@ public sealed partial class AaruFormat
 
                         if(_geometryBlock.identifier == BlockType.GeometryBlock)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .Geometry_set_to_0_cylinders_1_heads_2_sectors_per_track,
                                                        _geometryBlock.cylinders,
@@ -850,7 +850,7 @@ public sealed partial class AaruFormat
                             _imageInfo.Heads           = _geometryBlock.heads;
                             _imageInfo.SectorsPerTrack = _geometryBlock.sectorsPerTrack;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Memory_snapshot_0_bytes,
                                                        GC.GetTotalMemory(false));
                         }
@@ -867,14 +867,14 @@ public sealed partial class AaruFormat
 
                         if(metadataBlock.identifier != entry.blockType)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Incorrect_identifier_for_data_block_at_position_0,
                                                        entry.offset);
 
                             break;
                         }
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_metadata_block_at_position_0,
                                                    entry.offset);
 
@@ -887,7 +887,7 @@ public sealed partial class AaruFormat
                             _imageInfo.MediaSequence     = metadataBlock.mediaSequence;
                             _imageInfo.LastMediaSequence = metadataBlock.lastMediaSequence;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_media_sequence_as_0_of_1,
                                                        _imageInfo.MediaSequence,
                                                        _imageInfo.LastMediaSequence);
@@ -901,7 +901,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.creatorOffset,
                                                            (int)(metadataBlock.creatorLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Setting_creator_0, _imageInfo.Creator);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Setting_creator_0, _imageInfo.Creator);
                         }
 
                         if(metadataBlock.commentsOffset                                > 0 &&
@@ -912,7 +912,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.commentsOffset,
                                                            (int)(metadataBlock.commentsLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_comments_0,
                                                        _imageInfo.Comments);
                         }
@@ -925,7 +925,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.mediaTitleOffset,
                                                            (int)(metadataBlock.mediaTitleLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_media_title_0,
                                                        _imageInfo.MediaTitle);
                         }
@@ -939,7 +939,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.mediaManufacturerOffset,
                                                            (int)(metadataBlock.mediaManufacturerLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_media_manufacturer_0,
                                                        _imageInfo.MediaManufacturer);
                         }
@@ -952,7 +952,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.mediaModelOffset,
                                                            (int)(metadataBlock.mediaModelLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_media_model_0,
                                                        _imageInfo.MediaModel);
                         }
@@ -966,7 +966,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.mediaSerialNumberOffset,
                                                            (int)(metadataBlock.mediaSerialNumberLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_media_serial_number_0,
                                                        _imageInfo.MediaSerialNumber);
                         }
@@ -979,7 +979,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.mediaBarcodeOffset,
                                                            (int)(metadataBlock.mediaBarcodeLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_media_barcode_0,
                                                        _imageInfo.MediaBarcode);
                         }
@@ -992,7 +992,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.mediaPartNumberOffset,
                                                            (int)(metadataBlock.mediaPartNumberLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_media_part_number_0,
                                                        _imageInfo.MediaPartNumber);
                         }
@@ -1006,7 +1006,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.driveManufacturerOffset,
                                                            (int)(metadataBlock.driveManufacturerLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_drive_manufacturer_0,
                                                        _imageInfo.DriveManufacturer);
                         }
@@ -1019,7 +1019,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.driveModelOffset,
                                                            (int)(metadataBlock.driveModelLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_drive_model_0,
                                                        _imageInfo.DriveModel);
                         }
@@ -1033,7 +1033,7 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.driveSerialNumberOffset,
                                                            (int)(metadataBlock.driveSerialNumberLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_drive_serial_number_0,
                                                        _imageInfo.DriveSerialNumber);
                         }
@@ -1047,12 +1047,12 @@ public sealed partial class AaruFormat
                                                            (int)metadataBlock.driveFirmwareRevisionOffset,
                                                            (int)(metadataBlock.driveFirmwareRevisionLength - 2));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Setting_drive_firmware_revision_0,
                                                        _imageInfo.DriveFirmwareRevision);
                         }
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Memory_snapshot_0_bytes,
                                                    GC.GetTotalMemory(false));
 
@@ -1067,7 +1067,7 @@ public sealed partial class AaruFormat
 
                         if(tracksHeader.identifier != BlockType.TracksBlock)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Incorrect_identifier_for_tracks_block_at_position_0,
                                                        entry.offset);
 
@@ -1080,7 +1080,7 @@ public sealed partial class AaruFormat
 
                         if(BitConverter.ToUInt64(trksCrc, 0) != tracksHeader.crc64)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing,
                                                        BitConverter.ToUInt64(trksCrc, 0),
@@ -1095,7 +1095,7 @@ public sealed partial class AaruFormat
                         _trackFlags = new Dictionary<byte, byte>();
                         _trackIsrcs = new Dictionary<byte, string>();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_0_tracks_at_position_1,
                                                    tracksHeader.entries,
                                                    entry.offset);
@@ -1136,7 +1136,7 @@ public sealed partial class AaruFormat
                         _imageInfo.HasPartitions = true;
                         _imageInfo.HasSessions   = true;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Memory_snapshot_0_bytes,
                                                    GC.GetTotalMemory(false));
 
@@ -1152,7 +1152,7 @@ public sealed partial class AaruFormat
 
                         if(cicmBlock.identifier != BlockType.CicmBlock) break;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_CICM_XML_metadata_block_at_position_0,
                                                    entry.offset);
 
@@ -1177,11 +1177,11 @@ public sealed partial class AaruFormat
                         }
                         catch(XmlException ex)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Exception_0_processing_CICM_XML_metadata_block,
                                                        ex.Message);
 
-                            AaruConsole.WriteException(ex);
+                            AaruConsole.Exception(ex);
 
                             AaruMetadata = null;
                         }
@@ -1198,11 +1198,11 @@ public sealed partial class AaruFormat
 
                         if(aaruMetadataBlock.identifier != BlockType.AaruMetadataJsonBlock) break;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_Aaru_Metadata_block_at_position_0,
                                                    entry.offset);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Memory_snapshot_0_bytes,
                                                    GC.GetTotalMemory(false));
 
@@ -1218,14 +1218,14 @@ public sealed partial class AaruFormat
                         }
                         catch(JsonException ex)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Exception_0_processing_Aaru_Metadata_block,
                                                        ex.Message);
 
                             AaruMetadata = null;
                         }
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Memory_snapshot_0_bytes,
                                                    GC.GetTotalMemory(false));
 
@@ -1241,7 +1241,7 @@ public sealed partial class AaruFormat
 
                         if(dumpBlock.identifier != BlockType.DumpHardwareBlock) break;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_dump_hardware_block_at_position_0,
                                                    entry.offset);
 
@@ -1251,7 +1251,7 @@ public sealed partial class AaruFormat
 
                         if(BitConverter.ToUInt64(dumpCrc, 0) != dumpBlock.crc64)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing,
                                                        BitConverter.ToUInt64(dumpCrc, 0),
@@ -1376,7 +1376,7 @@ public sealed partial class AaruFormat
 
                         if(partitionHeader.identifier != BlockType.TapePartitionBlock) break;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_tape_partition_block_at_position_0,
                                                    entry.offset);
 
@@ -1412,7 +1412,7 @@ public sealed partial class AaruFormat
 
                         if(fileHeader.identifier != BlockType.TapeFileBlock) break;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_tape_file_block_at_position_0,
                                                    entry.offset);
 
@@ -1446,7 +1446,7 @@ public sealed partial class AaruFormat
 
                         if(indexesHeader.identifier != BlockType.CompactDiscIndexesBlock)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .Incorrect_identifier_for_compact_disc_indexes_block_at_position_0,
                                                        entry.offset);
@@ -1460,7 +1460,7 @@ public sealed partial class AaruFormat
 
                         if(BitConverter.ToUInt64(idsxCrc, 0) != indexesHeader.crc64)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization
                                                           .Incorrect_CRC_found_0_X16_found_expected_1_X16_continuing,
                                                        BitConverter.ToUInt64(idsxCrc, 0),
@@ -1473,7 +1473,7 @@ public sealed partial class AaruFormat
 
                         compactDiscIndexes = [];
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_0_compact_disc_indexes_at_position_1,
                                                    indexesHeader.entries,
                                                    entry.offset);
@@ -1488,7 +1488,7 @@ public sealed partial class AaruFormat
                                                            CompactDiscIndexEntry>(_structureBytes));
                         }
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Memory_snapshot_0_bytes,
                                                    GC.GetTotalMemory(false));
 
@@ -1593,7 +1593,7 @@ public sealed partial class AaruFormat
                     }
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+                AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
                 if(Tracks == null || Tracks.Count == 0)
                 {
@@ -1621,7 +1621,7 @@ public sealed partial class AaruFormat
                     _trackIsrcs = new Dictionary<byte, string>();
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+                AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
                 Sessions = [];
 
@@ -1637,7 +1637,7 @@ public sealed partial class AaruFormat
                     });
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+                AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
                 foreach(Track track in Tracks.OrderBy(t => t.StartSector))
                 {
@@ -1679,7 +1679,7 @@ public sealed partial class AaruFormat
                     currentTrackOffset += (track.EndSector - track.StartSector + 1) * (ulong)track.BytesPerSector;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+                AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
                 Track[] tracks = Tracks.ToArray();
 
@@ -1704,11 +1704,11 @@ public sealed partial class AaruFormat
                     trk.SubchannelType   = TrackSubchannelType.Raw;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+                AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
                 Tracks = tracks.ToList();
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
+                AaruConsole.Debug(MODULE_NAME, Localization.Memory_snapshot_0_bytes, GC.GetTotalMemory(false));
 
                 if(compactDiscIndexes != null)
                 {
@@ -1788,7 +1788,7 @@ public sealed partial class AaruFormat
             if(doSpamsum) _spamsumProvider = new SpamSumContext();
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.In_memory_DDT_0, _inMemoryDdt);
+        AaruConsole.Debug(MODULE_NAME, Localization.In_memory_DDT_0, _inMemoryDdt);
 
         _imageStream.Seek(0, SeekOrigin.End);
 
@@ -2808,7 +2808,7 @@ public sealed partial class AaruFormat
 
         if(_deduplicate)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Of_0_sectors_written_1_are_unique_2,
                                        _writtenSectors,
                                        _deduplicationTable.Count,
@@ -2827,7 +2827,7 @@ public sealed partial class AaruFormat
 
             if(mediaTag.Value is null)
             {
-                AaruConsole.ErrorWriteLine(Localization.Tag_type_0_is_null_skipping, dataType);
+                AaruConsole.Error(Localization.Tag_type_0_is_null_skipping, dataType);
 
                 continue;
             }
@@ -2839,7 +2839,7 @@ public sealed partial class AaruFormat
                 offset    = (ulong)_imageStream.Position
             };
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Writing_tag_type_0_to_position_1,
                                        mediaTag.Key,
                                        idxEntry.offset);
@@ -2933,7 +2933,7 @@ public sealed partial class AaruFormat
                 offset    = (ulong)_imageStream.Position
             };
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_geometry_block_to_position_0, idxEntry.offset);
+            AaruConsole.Debug(MODULE_NAME, Localization.Writing_geometry_block_to_position_0, idxEntry.offset);
 
             _structureBytes = new byte[Marshal.SizeOf<GeometryBlock>()];
             MemoryMarshal.Write(_structureBytes, in _geometryBlock);
@@ -3059,7 +3059,7 @@ public sealed partial class AaruFormat
                 offset    = (ulong)_imageStream.Position
             };
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Writing_dump_hardware_block_to_position_0,
                                        idxEntry.offset);
 
@@ -3103,7 +3103,7 @@ public sealed partial class AaruFormat
                 offset    = (ulong)_imageStream.Position
             };
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Writing_Aaru_Metadata_block_to_position_0,
                                        idxEntry.offset);
 
@@ -3214,7 +3214,7 @@ public sealed partial class AaruFormat
                     offset    = (ulong)_imageStream.Position
                 };
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Writing_checksum_block_to_position_0,
                                            idxEntry.offset);
 
@@ -3247,7 +3247,7 @@ public sealed partial class AaruFormat
                 offset    = (ulong)_imageStream.Position
             };
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Writing_tape_partitions_to_position_0,
                                        idxEntry.offset);
 
@@ -3293,7 +3293,7 @@ public sealed partial class AaruFormat
                 offset    = (ulong)_imageStream.Position
             };
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_tape_files_to_position_0, idxEntry.offset);
+            AaruConsole.Debug(MODULE_NAME, Localization.Writing_tape_files_to_position_0, idxEntry.offset);
 
             var tapeFileEntries = new TapeFileEntry[Files.Count];
 
@@ -3340,7 +3340,7 @@ public sealed partial class AaruFormat
                 offset    = (ulong)_imageStream.Position
             };
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_user_data_DDT_to_position_0, idxEntry.offset);
+            AaruConsole.Debug(MODULE_NAME, Localization.Writing_user_data_DDT_to_position_0, idxEntry.offset);
 
             var ddtHeader = new DdtHeader
             {
@@ -3431,7 +3431,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_CD_sector_prefix_block_to_position_0,
                                                idxEntry.offset);
 
@@ -3504,7 +3504,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_prefix,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -3530,7 +3530,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_CD_sector_suffix_block_to_position_0,
                                                idxEntry.offset);
 
@@ -3601,7 +3601,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_suffix,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -3690,7 +3690,7 @@ public sealed partial class AaruFormat
                         }
                     }
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization
                                                   ._0_1_prefixes_are_correct_2_3_prefixes_have_not_been_dumped_4_5_prefixes_have_been_written_to_image,
                                                correctPrefixes,
@@ -3700,7 +3700,7 @@ public sealed partial class AaruFormat
                                                writtenPrefixes,
                                                writtenPrefixes / _imageInfo.Sectors);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization
                                                   ._0_1_suffixes_are_correct_2_3_suffixes_have_not_been_dumped_4_5_suffixes_have_been_written_to_image,
                                                correctSuffixes,
@@ -3710,7 +3710,7 @@ public sealed partial class AaruFormat
                                                writtenSuffixes,
                                                writtenSuffixes / _imageInfo.Sectors);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization
                                                   ._0_1_MODE_2_Form_1_are_correct_2_3_MODE_2_Form_2_are_correct_4_5_MODE_2_Form_2_have_empty_CRC,
                                                correctMode2Form1,
@@ -3728,7 +3728,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_CompactDisc_sector_prefix_DDT_to_position_0,
                                                idxEntry.offset);
 
@@ -3812,7 +3812,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_CompactDisc_sector_suffix_DDT_to_position_0,
                                                idxEntry.offset);
 
@@ -3893,7 +3893,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_CD_sector_corrected_prefix_block_to_position_0,
                                                idxEntry.offset);
 
@@ -3965,7 +3965,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_prefix,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -3995,7 +3995,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_CD_sector_corrected_suffix_block_to_position_0,
                                                idxEntry.offset);
 
@@ -4067,7 +4067,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_suffix,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -4100,7 +4100,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_CD_MODE2_subheaders_block_to_position_0,
                                                idxEntry.offset);
 
@@ -4173,7 +4173,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_MODE2_subheaders,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -4206,7 +4206,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_CD_subchannel_block_to_position_0,
                                                idxEntry.offset);
 
@@ -4283,7 +4283,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_subchannel,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -4316,7 +4316,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_DVD_CPR_MAI_block_to_position_0,
                                                idxEntry.offset);
 
@@ -4389,7 +4389,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_CPR_MAI,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -4419,7 +4419,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_DVD_ID_block_to_position_0,
                                                idxEntry.offset);
 
@@ -4491,7 +4491,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_ID,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -4520,7 +4520,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_DVD_IED_block_to_position_0,
                                                idxEntry.offset);
 
@@ -4592,7 +4592,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_IED,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -4621,7 +4621,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_DVD_EDC_block_to_position_0,
                                                idxEntry.offset);
 
@@ -4693,7 +4693,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_EDC,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -4722,7 +4722,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_decrypted_DVD_title_key_block_to_position_0,
                                                idxEntry.offset);
 
@@ -4795,7 +4795,7 @@ public sealed partial class AaruFormat
 
                         compressStopwatch.Stop();
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Took_0_seconds_to_compress_decrypted_DVD_title_keys,
                                                    compressStopwatch.Elapsed.TotalSeconds);
                     }
@@ -4895,7 +4895,7 @@ public sealed partial class AaruFormat
                         crc64      = BitConverter.ToUInt64(trksCrc, 0)
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_tracks_to_position_0,
                                                _imageStream.Position);
 
@@ -4947,7 +4947,7 @@ public sealed partial class AaruFormat
                         crc64      = BitConverter.ToUInt64(cdixCrc, 0)
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_compact_disc_indexes_to_position_0,
                                                _imageStream.Position);
 
@@ -4997,7 +4997,7 @@ public sealed partial class AaruFormat
                         offset    = (ulong)_imageStream.Position
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Writing_apple_sector_tag_block_to_position_0,
                                                idxEntry.offset);
 
@@ -5232,7 +5232,7 @@ public sealed partial class AaruFormat
         // Check if we set up any metadata earlier, then write its block
         if(metadataBlock.identifier == BlockType.MetadataBlock)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_metadata_to_position_0, _imageStream.Position);
+            AaruConsole.Debug(MODULE_NAME, Localization.Writing_metadata_to_position_0, _imageStream.Position);
 
             metadataBlock.blockSize = (uint)blockStream.Length;
             _structureBytes         = new byte[Marshal.SizeOf<MetadataBlock>()];
@@ -5254,7 +5254,7 @@ public sealed partial class AaruFormat
 
         _header.indexOffset = (ulong)_imageStream.Position;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_index_to_position_0, _header.indexOffset);
+        AaruConsole.Debug(MODULE_NAME, Localization.Writing_index_to_position_0, _header.indexOffset);
 
         blockStream = new MemoryStream();
 
@@ -5303,7 +5303,7 @@ public sealed partial class AaruFormat
         _imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length);
         blockStream.Close();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Writing_header);
+        AaruConsole.Debug(MODULE_NAME, Localization.Writing_header);
         _header.lastWrittenTime = DateTime.UtcNow.ToFileTimeUtc();
         _imageStream.Position   = 0;
         _structurePointer       = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<AaruHeader>());
diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs
index 3dc9bb105..42b33e80a 100644
--- a/Aaru.Images/Alcohol120/Read.cs
+++ b/Aaru.Images/Alcohol120/Read.cs
@@ -63,33 +63,33 @@ public sealed partial class Alcohol120
         stream.EnsureRead(hdr, 0, 88);
         _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.signature = {0}", Encoding.ASCII.GetString(_header.signature));
+        AaruConsole.Debug(MODULE_NAME, "header.signature = {0}", Encoding.ASCII.GetString(_header.signature));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.version = {0}.{1}", _header.version[0], _header.version[1]);
+        AaruConsole.Debug(MODULE_NAME, "header.version = {0}.{1}", _header.version[0], _header.version[1]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.type = {0}",     _header.type);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sessions = {0}", _header.sessions);
+        AaruConsole.Debug(MODULE_NAME, "header.type = {0}",     _header.type);
+        AaruConsole.Debug(MODULE_NAME, "header.sessions = {0}", _header.sessions);
 
         for(int i = 0; i < _header.unknown1.Length; i++)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown1[{1}] = 0x{0:X4}", _header.unknown1[i], i);
+            AaruConsole.Debug(MODULE_NAME, "header.unknown1[{1}] = 0x{0:X4}", _header.unknown1[i], i);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.bcaLength = {0}", _header.bcaLength);
+        AaruConsole.Debug(MODULE_NAME, "header.bcaLength = {0}", _header.bcaLength);
 
         for(int i = 0; i < _header.unknown2.Length; i++)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown2[{1}] = 0x{0:X8}", _header.unknown2[i], i);
+            AaruConsole.Debug(MODULE_NAME, "header.unknown2[{1}] = 0x{0:X8}", _header.unknown2[i], i);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.bcaOffset = {0}", _header.bcaOffset);
+        AaruConsole.Debug(MODULE_NAME, "header.bcaOffset = {0}", _header.bcaOffset);
 
         for(int i = 0; i < _header.unknown3.Length; i++)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown3[{1}] = 0x{0:X8}", _header.unknown3[i], i);
+            AaruConsole.Debug(MODULE_NAME, "header.unknown3[{1}] = 0x{0:X8}", _header.unknown3[i], i);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.structuresOffset = {0}", _header.structuresOffset);
+        AaruConsole.Debug(MODULE_NAME, "header.structuresOffset = {0}", _header.structuresOffset);
 
         for(int i = 0; i < _header.unknown4.Length; i++)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown4[{1}] = 0x{0:X8}", _header.unknown4[i], i);
+            AaruConsole.Debug(MODULE_NAME, "header.unknown4[{1}] = 0x{0:X8}", _header.unknown4[i], i);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sessionOffset = {0}", _header.sessionOffset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dpmOffset = {0}",     _header.dpmOffset);
+        AaruConsole.Debug(MODULE_NAME, "header.sessionOffset = {0}", _header.sessionOffset);
+        AaruConsole.Debug(MODULE_NAME, "header.dpmOffset = {0}",     _header.dpmOffset);
 
         if(_header.version[0] > MAXIMUM_SUPPORTED_VERSION) return ErrorNumber.NotSupported;
 
@@ -102,23 +102,23 @@ public sealed partial class Alcohol120
             stream.EnsureRead(sesHdr, 0, 24);
             Session session = Marshal.SpanToStructureLittleEndian<Session>(sesHdr);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].sessionStart = {0}", session.sessionStart, i);
+            AaruConsole.Debug(MODULE_NAME, "session[{1}].sessionStart = {0}", session.sessionStart, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].sessionEnd = {0}", session.sessionEnd, i);
+            AaruConsole.Debug(MODULE_NAME, "session[{1}].sessionEnd = {0}", session.sessionEnd, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].sessionSequence = {0}", session.sessionSequence, i);
+            AaruConsole.Debug(MODULE_NAME, "session[{1}].sessionSequence = {0}", session.sessionSequence, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].allBlocks = {0}", session.allBlocks, i);
+            AaruConsole.Debug(MODULE_NAME, "session[{1}].allBlocks = {0}", session.allBlocks, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].nonTrackBlocks = {0}", session.nonTrackBlocks, i);
+            AaruConsole.Debug(MODULE_NAME, "session[{1}].nonTrackBlocks = {0}", session.nonTrackBlocks, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].firstTrack = {0}", session.firstTrack, i);
+            AaruConsole.Debug(MODULE_NAME, "session[{1}].firstTrack = {0}", session.firstTrack, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].lastTrack = {0}", session.lastTrack, i);
+            AaruConsole.Debug(MODULE_NAME, "session[{1}].lastTrack = {0}", session.lastTrack, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].unknown = 0x{0:X8}", session.unknown, i);
+            AaruConsole.Debug(MODULE_NAME, "session[{1}].unknown = 0x{0:X8}", session.unknown, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{1}].trackOffset = {0}", session.trackOffset, i);
+            AaruConsole.Debug(MODULE_NAME, "session[{1}].trackOffset = {0}", session.trackOffset, i);
 
             _alcSessions.Add(session.sessionSequence, session);
         }
@@ -151,85 +151,85 @@ public sealed partial class Alcohol120
                     oldIncorrectImage =  true;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].mode = {0}",
                                            track.mode,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].subMode = {0}",
                                            track.subMode,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].adrCtl = {0}",
                                            track.adrCtl,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].tno = {0}",
                                            track.tno,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].point = {0:X2}",
                                            track.point,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].min = {0}",
                                            track.min,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].sec = {0}",
                                            track.sec,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].frame = {0}",
                                            track.frame,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].zero = {0}",
                                            track.zero,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].pmin = {0}",
                                            track.pmin,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].psec = {0}",
                                            track.psec,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].pframe = {0}",
                                            track.pframe,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].extraOffset = {0}",
                                            track.extraOffset,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].sectorSize = {0}",
                                            track.sectorSize,
                                            track.point,
@@ -237,25 +237,25 @@ public sealed partial class Alcohol120
 
                 //for(int j = 0; j < track.unknown.Length; j++)
                 //    AaruConsole.DebugWriteLine(MODULE_NAME, "session[{2}].track[{1}].unknown[{2}] = {0}", track.unknown[j], i, j, session.sessionSequence);
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].startLba = {0}",
                                            track.startLba,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].startOffset = {0}",
                                            track.startOffset,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].files = {0}",
                                            track.files,
                                            track.point,
                                            session.sessionSequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{2}].track[{1}].footerOffset = {0}",
                                            track.footerOffset,
                                            track.point,
@@ -268,7 +268,7 @@ public sealed partial class Alcohol120
 
                 if(track is { point: 1, startLba: > 0 })
                 {
-                    AaruConsole.ErrorWriteLine(Localization
+                    AaruConsole.Error(Localization
                                                   .The_disc_this_image_represents_contained_a_hidden_track_in_the_first_pregap_that_this_image_format_cannot_store_This_dump_is_therefore_incorrect);
 
                     track1Index1   = track.startLba;
@@ -298,9 +298,9 @@ public sealed partial class Alcohol120
                 stream.EnsureRead(extHdr, 0, 8);
                 TrackExtra extra = Marshal.SpanToStructureLittleEndian<TrackExtra>(extHdr);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "track[{1}].extra.pregap = {0}", extra.pregap, track.point);
+                AaruConsole.Debug(MODULE_NAME, "track[{1}].extra.pregap = {0}", extra.pregap, track.point);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "track[{1}].extra.sectors = {0}", extra.sectors, track.point);
+                AaruConsole.Debug(MODULE_NAME, "track[{1}].extra.sectors = {0}", extra.sectors, track.point);
 
                 if(track.point == 1)
                 {
@@ -328,11 +328,11 @@ public sealed partial class Alcohol120
             stream.EnsureRead(footer, 0, 16);
             _alcFooter = Marshal.SpanToStructureLittleEndian<Footer>(footer);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.filenameOffset = {0}", _alcFooter.filenameOffset);
+            AaruConsole.Debug(MODULE_NAME, "footer.filenameOffset = {0}", _alcFooter.filenameOffset);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.widechar = {0}",      _alcFooter.widechar);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.unknown1 = 0x{0:X8}", _alcFooter.unknown1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.unknown2 = 0x{0:X8}", _alcFooter.unknown2);
+            AaruConsole.Debug(MODULE_NAME, "footer.widechar = {0}",      _alcFooter.widechar);
+            AaruConsole.Debug(MODULE_NAME, "footer.unknown1 = 0x{0:X8}", _alcFooter.unknown1);
+            AaruConsole.Debug(MODULE_NAME, "footer.unknown2 = 0x{0:X8}", _alcFooter.unknown2);
         }
 
         string alcFile = "*.mdf";
@@ -351,7 +351,7 @@ public sealed partial class Alcohol120
                           ? StringHandlers.CToString(filename, Encoding.Unicode, true)
                           : StringHandlers.CToString(filename, Encoding.Default);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.filename = {0}", alcFile);
+            AaruConsole.Debug(MODULE_NAME, "footer.filename = {0}", alcFile);
         }
 
         if(_alcFooter.filenameOffset == 0)
@@ -527,7 +527,7 @@ public sealed partial class Alcohol120
                 _imageInfo.MediaType = MediaType.CD;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageInfo.mediaType = {0}", _imageInfo.MediaType);
+        AaruConsole.Debug(MODULE_NAME, "ImageInfo.mediaType = {0}", _imageInfo.MediaType);
 
         Partitions = [];
         _offsetMap = new Dictionary<uint, ulong>();
@@ -630,35 +630,35 @@ public sealed partial class Alcohol120
                 _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.printing_partition_map);
+        AaruConsole.Debug(MODULE_NAME, Localization.printing_partition_map);
 
         foreach(Partition partition in Partitions)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Partition_sequence_0,    partition.Sequence);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_name_0, partition.Name);
+            AaruConsole.Debug(MODULE_NAME, Localization.Partition_sequence_0,    partition.Sequence);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_name_0, partition.Name);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_description_0, partition.Description);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_description_0, partition.Description);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_type_0, partition.Type);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_type_0, partition.Type);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_starting_sector_0, partition.Start);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_starting_sector_0, partition.Start);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_sectors_0, partition.Length);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_sectors_0, partition.Length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_starting_offset_0, partition.Offset);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_starting_offset_0, partition.Offset);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_size_in_bytes_0, partition.Size);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_size_in_bytes_0, partition.Size);
         }
 
         _imageInfo.Application = "Alcohol 120%";
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Data_filename_0, alcFile);
+        AaruConsole.Debug(MODULE_NAME, Localization.Data_filename_0, alcFile);
 
         _alcImage = PluginRegister.Singleton.GetFilter(alcFile);
 
         if(_alcImage == null)
         {
-            AaruConsole.ErrorWriteLine(Localization.Cannot_open_data_file);
+            AaruConsole.Error(Localization.Cannot_open_data_file);
 
             return ErrorNumber.NoSuchFile;
         }
@@ -671,7 +671,7 @@ public sealed partial class Alcohol120
 
         if(!_isDvd)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Rebuilding_TOC);
+            AaruConsole.Debug(MODULE_NAME, Localization.Rebuilding_TOC);
             byte firstSession = byte.MaxValue;
             byte lastSession  = 0;
             var  tocMs        = new MemoryStream();
@@ -713,7 +713,7 @@ public sealed partial class Alcohol120
             // Wxripper unlock
             _imageInfo.MediaType = MediaType.XGD3;
 
-        AaruConsole.VerboseWriteLine(Localization.Alcohol_120_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.Alcohol_120_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
 
         if(oldIncorrectImage)
         {
diff --git a/Aaru.Images/Alcohol120/Write.cs b/Aaru.Images/Alcohol120/Write.cs
index 6b2a8dbf5..69be0918b 100644
--- a/Aaru.Images/Alcohol120/Write.cs
+++ b/Aaru.Images/Alcohol120/Write.cs
@@ -82,7 +82,7 @@ public sealed partial class Alcohol120
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/Anex86/Identify.cs b/Aaru.Images/Anex86/Identify.cs
index 55b063506..b3b6345be 100644
--- a/Aaru.Images/Anex86/Identify.cs
+++ b/Aaru.Images/Anex86/Identify.cs
@@ -54,14 +54,14 @@ public sealed partial class Anex86
 
         _header = Marshal.SpanToStructureLittleEndian<Header>(hdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fdihdr.unknown = {0}",   _header.unknown);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fdihdr.hddtype = {0}",   _header.hddtype);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fdihdr.hdrSize = {0}",   _header.hdrSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fdihdr.dskSize = {0}",   _header.dskSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fdihdr.bps = {0}",       _header.bps);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fdihdr.spt = {0}",       _header.spt);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fdihdr.heads = {0}",     _header.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "fdihdr.cylinders = {0}", _header.cylinders);
+        AaruConsole.Debug(MODULE_NAME, "fdihdr.unknown = {0}",   _header.unknown);
+        AaruConsole.Debug(MODULE_NAME, "fdihdr.hddtype = {0}",   _header.hddtype);
+        AaruConsole.Debug(MODULE_NAME, "fdihdr.hdrSize = {0}",   _header.hdrSize);
+        AaruConsole.Debug(MODULE_NAME, "fdihdr.dskSize = {0}",   _header.dskSize);
+        AaruConsole.Debug(MODULE_NAME, "fdihdr.bps = {0}",       _header.bps);
+        AaruConsole.Debug(MODULE_NAME, "fdihdr.spt = {0}",       _header.spt);
+        AaruConsole.Debug(MODULE_NAME, "fdihdr.heads = {0}",     _header.heads);
+        AaruConsole.Debug(MODULE_NAME, "fdihdr.cylinders = {0}", _header.cylinders);
 
         return stream.Length   == _header.hdrSize + _header.dskSize &&
                _header.dskSize == _header.bps * _header.spt * _header.heads * _header.cylinders;
diff --git a/Aaru.Images/Anex86/Read.cs b/Aaru.Images/Anex86/Read.cs
index afd90cf15..7b2142d45 100644
--- a/Aaru.Images/Anex86/Read.cs
+++ b/Aaru.Images/Anex86/Read.cs
@@ -62,7 +62,7 @@ public sealed partial class Anex86
 
         if(_imageInfo.MediaType == MediaType.Unknown) _imageInfo.MediaType = MediaType.GENERIC_HDD;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.MediaType_0, _imageInfo.MediaType);
+        AaruConsole.Debug(MODULE_NAME, Localization.MediaType_0, _imageInfo.MediaType);
 
         _imageInfo.ImageSize            = (ulong)_header.dskSize;
         _imageInfo.CreationTime         = imageFilter.CreationTime;
diff --git a/Aaru.Images/Anex86/Write.cs b/Aaru.Images/Anex86/Write.cs
index bab7f7556..c677d2fb3 100644
--- a/Aaru.Images/Anex86/Write.cs
+++ b/Aaru.Images/Anex86/Write.cs
@@ -86,7 +86,7 @@ public sealed partial class Anex86
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/Apple2MG/Read.cs b/Aaru.Images/Apple2MG/Read.cs
index 0a30cf05a..3a6e977c1 100644
--- a/Aaru.Images/Apple2MG/Read.cs
+++ b/Aaru.Images/Apple2MG/Read.cs
@@ -68,38 +68,38 @@ public sealed partial class Apple2Mg
         {
             _imageHeader.DataSize = 0x000C8000;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Detected_incorrect_endian_on_data_size_field_correcting);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.magic = \"{0}\"", Encoding.ASCII.GetString(magic));
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.magic = \"{0}\"", Encoding.ASCII.GetString(magic));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.creator = \"{0}\"", Encoding.ASCII.GetString(creator));
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.creator = \"{0}\"", Encoding.ASCII.GetString(creator));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.headerSize = {0}",      _imageHeader.HeaderSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.version = {0}",         _imageHeader.Version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.imageFormat = {0}",     _imageHeader.ImageFormat);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.flags = 0x{0:X8}",      _imageHeader.Flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.blocks = {0}",          _imageHeader.Blocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.dataOffset = 0x{0:X8}", _imageHeader.DataOffset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.dataSize = {0}",        _imageHeader.DataSize);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.headerSize = {0}",      _imageHeader.HeaderSize);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.version = {0}",         _imageHeader.Version);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.imageFormat = {0}",     _imageHeader.ImageFormat);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.flags = 0x{0:X8}",      _imageHeader.Flags);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.blocks = {0}",          _imageHeader.Blocks);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.dataOffset = 0x{0:X8}", _imageHeader.DataOffset);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.dataSize = {0}",        _imageHeader.DataSize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.commentOffset = 0x{0:X8}", _imageHeader.CommentOffset);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.commentOffset = 0x{0:X8}", _imageHeader.CommentOffset);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.commentSize = {0}", _imageHeader.CommentSize);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.commentSize = {0}", _imageHeader.CommentSize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ImageHeader.creatorSpecificOffset = 0x{0:X8}",
                                    _imageHeader.CreatorSpecificOffset);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ImageHeader.creatorSpecificSize = {0}",
                                    _imageHeader.CreatorSpecificSize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.reserved1 = 0x{0:X8}", _imageHeader.Reserved1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.reserved2 = 0x{0:X8}", _imageHeader.Reserved2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.reserved3 = 0x{0:X8}", _imageHeader.Reserved3);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.reserved4 = 0x{0:X8}", _imageHeader.Reserved4);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.reserved1 = 0x{0:X8}", _imageHeader.Reserved1);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.reserved2 = 0x{0:X8}", _imageHeader.Reserved2);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.reserved3 = 0x{0:X8}", _imageHeader.Reserved3);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.reserved4 = 0x{0:X8}", _imageHeader.Reserved4);
 
         if(_imageHeader is { DataSize: 0, Blocks: 0 } && _imageHeader.ImageFormat != SectorOrder.ProDos)
             return ErrorNumber.InvalidArgument;
@@ -219,10 +219,10 @@ public sealed partial class Apple2Mg
 
         _imageInfo.MetadataMediaType = MetadataMediaType.BlockMedia;
 
-        AaruConsole.VerboseWriteLine(Localization._2MG_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization._2MG_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
 
         if(!string.IsNullOrEmpty(_imageInfo.Comments))
-            AaruConsole.VerboseWriteLine(Localization._2MG_comments_0, _imageInfo.Comments);
+            AaruConsole.Verbose(Localization._2MG_comments_0, _imageInfo.Comments);
 
         switch(_imageInfo.MediaType)
         {
diff --git a/Aaru.Images/Apple2MG/Write.cs b/Aaru.Images/Apple2MG/Write.cs
index d1a709511..dd75b5a35 100644
--- a/Aaru.Images/Apple2MG/Write.cs
+++ b/Aaru.Images/Apple2MG/Write.cs
@@ -89,7 +89,7 @@ public sealed partial class Apple2Mg
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/AppleDOS/Write.cs b/Aaru.Images/AppleDOS/Write.cs
index 1d6dede3e..9596e9705 100644
--- a/Aaru.Images/AppleDOS/Write.cs
+++ b/Aaru.Images/AppleDOS/Write.cs
@@ -84,7 +84,7 @@ public sealed partial class AppleDos
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/AppleNIB/Read.cs b/Aaru.Images/AppleNIB/Read.cs
index 33036b7a3..4d0c554f6 100644
--- a/Aaru.Images/AppleNIB/Read.cs
+++ b/Aaru.Images/AppleNIB/Read.cs
@@ -57,9 +57,9 @@ public sealed partial class AppleNib
         byte[] buffer = new byte[stream.Length];
         stream.EnsureRead(buffer, 0, buffer.Length);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Decoding_whole_image);
+        AaruConsole.Debug(MODULE_NAME, Localization.Decoding_whole_image);
         List<Apple2.RawTrack> tracks = Apple2.MarshalDisk(buffer);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Got_0_tracks, tracks.Count);
+        AaruConsole.Debug(MODULE_NAME, Localization.Got_0_tracks, tracks.Count);
 
         Dictionary<ulong, Apple2.RawSector> rawSectors = new();
 
@@ -95,7 +95,7 @@ public sealed partial class AppleNib
             {
                 if(isDos) skewing = _dosSkewing;
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            skewing.SequenceEqual(_dosSkewing)
                                                ? Localization.Using_DOS_skewing
                                                : Localization.Using_ProDOS_skewing);
@@ -112,7 +112,7 @@ public sealed partial class AppleNib
                                               sector.addressField.sector[1] & 0x55) &
                                              0xFF);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Hardware_sector_0_of_track_1_goes_to_logical_sector_2,
                                                sectorNo,
                                                i,
@@ -129,9 +129,9 @@ public sealed partial class AppleNib
             }
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Got_0_sectors, _imageInfo.Sectors);
+        AaruConsole.Debug(MODULE_NAME, Localization.Got_0_sectors, _imageInfo.Sectors);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Cooking_sectors);
+        AaruConsole.Debug(MODULE_NAME, Localization.Cooking_sectors);
 
         _longSectors   = new Dictionary<ulong, byte[]>();
         _cookedSectors = new Dictionary<ulong, byte[]>();
diff --git a/Aaru.Images/Apridisk/Read.cs b/Aaru.Images/Apridisk/Read.cs
index c98fcab12..ce0a60098 100644
--- a/Aaru.Images/Apridisk/Read.cs
+++ b/Aaru.Images/Apridisk/Read.cs
@@ -69,36 +69,36 @@ public sealed partial class Apridisk
             {
                 // Deleted record, just skip it
                 case RecordType.Deleted:
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_deleted_record_at_0, stream.Position);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_deleted_record_at_0, stream.Position);
 
                     stream.Seek(record.headerSize - recordSize + record.dataSize, SeekOrigin.Current);
 
                     break;
                 case RecordType.Comment:
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_comment_record_at_0, stream.Position);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_comment_record_at_0, stream.Position);
 
                     stream.Seek(record.headerSize - recordSize, SeekOrigin.Current);
                     byte[] commentB = new byte[record.dataSize];
                     stream.EnsureRead(commentB, 0, commentB.Length);
                     _imageInfo.Comments = StringHandlers.CToString(commentB);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Comment_0, _imageInfo.Comments);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Comment_0, _imageInfo.Comments);
 
                     break;
                 case RecordType.Creator:
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_creator_record_at_0, stream.Position);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_creator_record_at_0, stream.Position);
 
                     stream.Seek(record.headerSize - recordSize, SeekOrigin.Current);
                     byte[] creatorB = new byte[record.dataSize];
                     stream.EnsureRead(creatorB, 0, creatorB.Length);
                     _imageInfo.Creator = StringHandlers.CToString(creatorB);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Creator_0, _imageInfo.Creator);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Creator_0, _imageInfo.Creator);
 
                     break;
                 case RecordType.Sector:
                     if(record.compression != CompressType.Compressed && record.compression != CompressType.Uncompresed)
                         return ErrorNumber.NotSupported;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                record.compression == CompressType.Compressed
                                                    ? Localization
                                                       .Found_compressed_sector_record_at_0_for_cylinder_1_head_2_sector_3
@@ -136,7 +136,7 @@ public sealed partial class Apridisk
         _imageInfo.Cylinders = (ushort)totalCylinders;
         _imageInfo.Heads     = (byte)totalHeads;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Found_0_cylinders_and_1_heads_with_a_maximum_sector_number_of_2,
                                    totalCylinders,
                                    totalHeads,
@@ -197,7 +197,7 @@ public sealed partial class Apridisk
             }
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Found_a_minimum_of_0_bytes_per_sector,
                                    _imageInfo.SectorSize);
 
@@ -214,7 +214,7 @@ public sealed partial class Apridisk
 
         _imageInfo.SectorsPerTrack = spt;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Found_a_minimum_of_0_sectors_per_track,
                                    _imageInfo.SectorsPerTrack);
 
diff --git a/Aaru.Images/Apridisk/Write.cs b/Aaru.Images/Apridisk/Write.cs
index 5fd52804f..0286ebd81 100644
--- a/Aaru.Images/Apridisk/Write.cs
+++ b/Aaru.Images/Apridisk/Write.cs
@@ -73,7 +73,7 @@ public sealed partial class Apridisk
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/BLU/Read.cs b/Aaru.Images/BLU/Read.cs
index 539957233..1f5e593f0 100644
--- a/Aaru.Images/BLU/Read.cs
+++ b/Aaru.Images/BLU/Read.cs
@@ -64,13 +64,13 @@ public sealed partial class Blu
         _imageHeader.DeviceBlocks  = BigEndianBitConverter.ToUInt32(header, 0x11) & 0x00FFFFFF;
         _imageHeader.BytesPerBlock = BigEndianBitConverter.ToUInt16(header, 0x15);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ImageHeader.deviceName = \"{0}\"",
                                    StringHandlers.CToString(_imageHeader.DeviceName));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.deviceType = {0}",    _imageHeader.DeviceType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.deviceBlock = {0}",   _imageHeader.DeviceBlocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.bytesPerBlock = {0}", _imageHeader.BytesPerBlock);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.deviceType = {0}",    _imageHeader.DeviceType);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.deviceBlock = {0}",   _imageHeader.DeviceBlocks);
+        AaruConsole.Debug(MODULE_NAME, "ImageHeader.bytesPerBlock = {0}", _imageHeader.BytesPerBlock);
 
         for(int i = 0; i < 0xD; i++)
         {
@@ -149,7 +149,7 @@ public sealed partial class Blu
 
         if(_bptag > 0) _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
 
-        AaruConsole.VerboseWriteLine(Localization.BLU_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.BLU_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
 
         return ErrorNumber.NoError;
     }
diff --git a/Aaru.Images/BLU/Write.cs b/Aaru.Images/BLU/Write.cs
index 0af02210c..ed8b0a2df 100644
--- a/Aaru.Images/BLU/Write.cs
+++ b/Aaru.Images/BLU/Write.cs
@@ -91,7 +91,7 @@ public sealed partial class Blu
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/BlindWrite4/Read.cs b/Aaru.Images/BlindWrite4/Read.cs
index 4ae67c94c..6eda7d20e 100644
--- a/Aaru.Images/BlindWrite4/Read.cs
+++ b/Aaru.Images/BlindWrite4/Read.cs
@@ -126,34 +126,34 @@ public sealed partial class BlindWrite4
         stream.EnsureRead(tmpArray, 0, _header.Unknown3);
         _header.Unknown4 = tmpArray;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.signature = {0}", StringHandlers.CToString(_header.Signature));
+        AaruConsole.Debug(MODULE_NAME, "header.signature = {0}", StringHandlers.CToString(_header.Signature));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown1 = {0}",         _header.Unknown1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.timestamp = {0}",        _header.Timestamp);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.volumeIdLength = {0}",   _header.VolumeIdLength);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.volumeIdentifier = {0}", _header.VolumeIdentifier);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sysIdLength = {0}",      _header.SysIdLength);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.systemIdentifier = {0}", _header.SystemIdentifier);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.commentsLength = {0}",   _header.CommentsLength);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.comments = {0}",         _header.Comments);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.trackDescriptors = {0}", _header.TrackDescriptors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dataFileLength = {0}",   _header.DataFileLength);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dataFilter = {0}",       _header.DataFilter);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dataFile = {0}",         _header.DataFile);
+        AaruConsole.Debug(MODULE_NAME, "header.unknown1 = {0}",         _header.Unknown1);
+        AaruConsole.Debug(MODULE_NAME, "header.timestamp = {0}",        _header.Timestamp);
+        AaruConsole.Debug(MODULE_NAME, "header.volumeIdLength = {0}",   _header.VolumeIdLength);
+        AaruConsole.Debug(MODULE_NAME, "header.volumeIdentifier = {0}", _header.VolumeIdentifier);
+        AaruConsole.Debug(MODULE_NAME, "header.sysIdLength = {0}",      _header.SysIdLength);
+        AaruConsole.Debug(MODULE_NAME, "header.systemIdentifier = {0}", _header.SystemIdentifier);
+        AaruConsole.Debug(MODULE_NAME, "header.commentsLength = {0}",   _header.CommentsLength);
+        AaruConsole.Debug(MODULE_NAME, "header.comments = {0}",         _header.Comments);
+        AaruConsole.Debug(MODULE_NAME, "header.trackDescriptors = {0}", _header.TrackDescriptors);
+        AaruConsole.Debug(MODULE_NAME, "header.dataFileLength = {0}",   _header.DataFileLength);
+        AaruConsole.Debug(MODULE_NAME, "header.dataFilter = {0}",       _header.DataFilter);
+        AaruConsole.Debug(MODULE_NAME, "header.dataFile = {0}",         _header.DataFile);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.subchannelFileLength = {0}", _header.SubchannelFileLength);
+        AaruConsole.Debug(MODULE_NAME, "header.subchannelFileLength = {0}", _header.SubchannelFileLength);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.subchannelFilter = {0}", _header.SubchannelFilter);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.subchannelFile = {0}",   _header.SubchannelFile);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown2 = {0}",         _header.Unknown2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown3 = {0}",         _header.Unknown3);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown4.Length = {0}",  _header.Unknown4.Length);
+        AaruConsole.Debug(MODULE_NAME, "header.subchannelFilter = {0}", _header.SubchannelFilter);
+        AaruConsole.Debug(MODULE_NAME, "header.subchannelFile = {0}",   _header.SubchannelFile);
+        AaruConsole.Debug(MODULE_NAME, "header.unknown2 = {0}",         _header.Unknown2);
+        AaruConsole.Debug(MODULE_NAME, "header.unknown3 = {0}",         _header.Unknown3);
+        AaruConsole.Debug(MODULE_NAME, "header.unknown4.Length = {0}",  _header.Unknown4.Length);
 
         _bwTracks = [];
 
         for(int i = 0; i < _header.TrackDescriptors; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, "stream.Position = {0}", stream.Position);
+            AaruConsole.Debug(MODULE_NAME, "stream.Position = {0}", stream.Position);
 
             var track = new TrackDescriptor();
 
@@ -319,66 +319,66 @@ public sealed partial class BlindWrite4
             track.isrcBytes = tmpArray;
             track.isrcUpc   = StringHandlers.CToString(track.isrcBytes, Encoding.Default);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.filenameLen = {0}", track.filenameLen);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.filename = {0}",    track.filename);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.offset = {0}",      track.offset);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.subchannel = {0}",  track.subchannel);
+            AaruConsole.Debug(MODULE_NAME, "track.filenameLen = {0}", track.filenameLen);
+            AaruConsole.Debug(MODULE_NAME, "track.filename = {0}",    track.filename);
+            AaruConsole.Debug(MODULE_NAME, "track.offset = {0}",      track.offset);
+            AaruConsole.Debug(MODULE_NAME, "track.subchannel = {0}",  track.subchannel);
 
             for(int j = 0; j < track.unknown1.Length; j++)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown1[{1}] = 0x{0:X8}", track.unknown1[j], j);
+                AaruConsole.Debug(MODULE_NAME, "track.unknown1[{1}] = 0x{0:X8}", track.unknown1[j], j);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown2 = {0}",    track.unknown2);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown3 = {0}",    track.unknown3);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.session = {0}",     track.session);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown4 = {0}",    track.unknown4);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.adrCtl = {0}",      track.adrCtl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown5 = {0}",    track.unknown5);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.trackMode = {0}",   track.trackMode);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown6 = {0}",    track.unknown6);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.point = {0}",       track.point);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown7 = {0}",    track.unknown7);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown8 = {0}",    track.unknown8);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown9 = {0}",    track.pregapOffsetAdjustment);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown10 = {0}",   track.unknown10);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown11 = {0}",   track.unknown11);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.lastSector = {0}",  track.lastSector);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown12 = {0}",   track.unknown12);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.pregap = {0}",      track.pregap);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.startSector = {0}", track.startSector);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown2 = {0}",    track.unknown2);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown3 = {0}",    track.unknown3);
+            AaruConsole.Debug(MODULE_NAME, "track.session = {0}",     track.session);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown4 = {0}",    track.unknown4);
+            AaruConsole.Debug(MODULE_NAME, "track.adrCtl = {0}",      track.adrCtl);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown5 = {0}",    track.unknown5);
+            AaruConsole.Debug(MODULE_NAME, "track.trackMode = {0}",   track.trackMode);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown6 = {0}",    track.unknown6);
+            AaruConsole.Debug(MODULE_NAME, "track.point = {0}",       track.point);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown7 = {0}",    track.unknown7);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown8 = {0}",    track.unknown8);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown9 = {0}",    track.pregapOffsetAdjustment);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown10 = {0}",   track.unknown10);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown11 = {0}",   track.unknown11);
+            AaruConsole.Debug(MODULE_NAME, "track.lastSector = {0}",  track.lastSector);
+            AaruConsole.Debug(MODULE_NAME, "track.unknown12 = {0}",   track.unknown12);
+            AaruConsole.Debug(MODULE_NAME, "track.pregap = {0}",      track.pregap);
+            AaruConsole.Debug(MODULE_NAME, "track.startSector = {0}", track.startSector);
 
             for(int j = 0; j < track.unknown13.Length; j++)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "track.unknown13[{1}] = 0x{0:X8}", track.unknown13[j], j);
+                AaruConsole.Debug(MODULE_NAME, "track.unknown13[{1}] = 0x{0:X8}", track.unknown13[j], j);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.titleLen = {0}",     track.titleLen);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.title = {0}",        track.title);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.performerLen = {0}", track.performerLen);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.performer = {0}",    track.performer);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen1 = {0}",   track.unkStrLen1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString1 = {0}",   track.unkString1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen2 = {0}",   track.unkStrLen2);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString2 = {0}",   track.unkString2);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen3 = {0}",   track.unkStrLen3);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString3 = {0}",   track.unkString3);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen4 = {0}",   track.unkStrLen4);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString4 = {0}",   track.unkString4);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.discIdLen = {0}",    track.discIdLen);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.discId = {0}",       track.discId);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen5 = {0}",   track.unkStrLen5);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString5 = {0}",   track.unkString5);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen6 = {0}",   track.unkStrLen6);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString6 = {0}",   track.unkString6);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen7 = {0}",   track.unkStrLen7);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString7 = {0}",   track.unkString7);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen8 = {0}",   track.unkStrLen8);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString8 = {0}",   track.unkString8);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen9 = {0}",   track.unkStrLen9);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString9 = {0}",   track.unkString9);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen10 = {0}",  track.unkStrLen10);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString10 = {0}",  track.unkString10);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkStrLen11 = {0}",  track.unkStrLen11);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.unkString11 = {0}",  track.unkString11);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.isrcLen = {0}",      track.isrcLen);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "track.isrcUpc = {0}",      track.isrcUpc);
+            AaruConsole.Debug(MODULE_NAME, "track.titleLen = {0}",     track.titleLen);
+            AaruConsole.Debug(MODULE_NAME, "track.title = {0}",        track.title);
+            AaruConsole.Debug(MODULE_NAME, "track.performerLen = {0}", track.performerLen);
+            AaruConsole.Debug(MODULE_NAME, "track.performer = {0}",    track.performer);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen1 = {0}",   track.unkStrLen1);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString1 = {0}",   track.unkString1);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen2 = {0}",   track.unkStrLen2);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString2 = {0}",   track.unkString2);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen3 = {0}",   track.unkStrLen3);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString3 = {0}",   track.unkString3);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen4 = {0}",   track.unkStrLen4);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString4 = {0}",   track.unkString4);
+            AaruConsole.Debug(MODULE_NAME, "track.discIdLen = {0}",    track.discIdLen);
+            AaruConsole.Debug(MODULE_NAME, "track.discId = {0}",       track.discId);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen5 = {0}",   track.unkStrLen5);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString5 = {0}",   track.unkString5);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen6 = {0}",   track.unkStrLen6);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString6 = {0}",   track.unkString6);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen7 = {0}",   track.unkStrLen7);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString7 = {0}",   track.unkString7);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen8 = {0}",   track.unkStrLen8);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString8 = {0}",   track.unkString8);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen9 = {0}",   track.unkStrLen9);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString9 = {0}",   track.unkString9);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen10 = {0}",  track.unkStrLen10);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString10 = {0}",  track.unkString10);
+            AaruConsole.Debug(MODULE_NAME, "track.unkStrLen11 = {0}",  track.unkStrLen11);
+            AaruConsole.Debug(MODULE_NAME, "track.unkString11 = {0}",  track.unkString11);
+            AaruConsole.Debug(MODULE_NAME, "track.isrcLen = {0}",      track.isrcLen);
+            AaruConsole.Debug(MODULE_NAME, "track.isrcUpc = {0}",      track.isrcUpc);
 
             _bwTracks.Add(track);
         }
@@ -440,14 +440,14 @@ public sealed partial class BlindWrite4
 
                 if(_dataFilter != null) break;
 
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Data_file_0_not_found, _header.DataFile));
+                AaruConsole.Error(string.Format(Localization.Data_file_0_not_found, _header.DataFile));
 
                 return ErrorNumber.NoSuchFile;
             }
         }
         else
         {
-            AaruConsole.ErrorWriteLine(Localization.Unable_to_find_data_file);
+            AaruConsole.Error(Localization.Unable_to_find_data_file);
 
             return ErrorNumber.NoSuchFile;
         }
@@ -799,10 +799,10 @@ public sealed partial class BlindWrite4
 
         _imageInfo.Comments = _header.Comments;
 
-        AaruConsole.VerboseWriteLine(Localization.BlindWrite_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.BlindWrite_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
 
         if(!string.IsNullOrEmpty(_imageInfo.Comments))
-            AaruConsole.VerboseWriteLine(Localization.BlindWrite_comments_0, _imageInfo.Comments);
+            AaruConsole.Verbose(Localization.BlindWrite_comments_0, _imageInfo.Comments);
 
         return ErrorNumber.NoError;
     }
diff --git a/Aaru.Images/BlindWrite5/Read.cs b/Aaru.Images/BlindWrite5/Read.cs
index b82c2a25d..6819ba10a 100644
--- a/Aaru.Images/BlindWrite5/Read.cs
+++ b/Aaru.Images/BlindWrite5/Read.cs
@@ -71,56 +71,56 @@ public sealed partial class BlindWrite5
         stream.EnsureRead(hdr, 0, 260);
         _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.signature = {0}", StringHandlers.CToString(_header.signature));
+        AaruConsole.Debug(MODULE_NAME, "header.signature = {0}", StringHandlers.CToString(_header.signature));
 
         for(int i = 0; i < _header.unknown1.Length; i++)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown1[{1}] = 0x{0:X8}", _header.unknown1[i], i);
+            AaruConsole.Debug(MODULE_NAME, "header.unknown1[{1}] = 0x{0:X8}", _header.unknown1[i], i);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.profile = {0}",  _header.profile);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sessions = {0}", _header.sessions);
+        AaruConsole.Debug(MODULE_NAME, "header.profile = {0}",  _header.profile);
+        AaruConsole.Debug(MODULE_NAME, "header.sessions = {0}", _header.sessions);
 
         for(int i = 0; i < _header.unknown2.Length; i++)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown2[{1}] = 0x{0:X8}", _header.unknown2[i], i);
+            AaruConsole.Debug(MODULE_NAME, "header.unknown2[{1}] = 0x{0:X8}", _header.unknown2[i], i);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.mcnIsValid = {0}",    _header.mcnIsValid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.mcn = {0}",           StringHandlers.CToString(_header.mcn));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown3 = 0x{0:X4}", _header.unknown3);
+        AaruConsole.Debug(MODULE_NAME, "header.mcnIsValid = {0}",    _header.mcnIsValid);
+        AaruConsole.Debug(MODULE_NAME, "header.mcn = {0}",           StringHandlers.CToString(_header.mcn));
+        AaruConsole.Debug(MODULE_NAME, "header.unknown3 = 0x{0:X4}", _header.unknown3);
 
         for(int i = 0; i < _header.unknown4.Length; i++)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown4[{1}] = 0x{0:X8}", _header.unknown4[i], i);
+            AaruConsole.Debug(MODULE_NAME, "header.unknown4[{1}] = 0x{0:X8}", _header.unknown4[i], i);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.pmaLen = {0}",    _header.pmaLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.atipLen = {0}",   _header.atipLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.cdtLen = {0}",    _header.cdtLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.cdInfoLen = {0}", _header.cdInfoLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.bcaLen = {0}",    _header.bcaLen);
+        AaruConsole.Debug(MODULE_NAME, "header.pmaLen = {0}",    _header.pmaLen);
+        AaruConsole.Debug(MODULE_NAME, "header.atipLen = {0}",   _header.atipLen);
+        AaruConsole.Debug(MODULE_NAME, "header.cdtLen = {0}",    _header.cdtLen);
+        AaruConsole.Debug(MODULE_NAME, "header.cdInfoLen = {0}", _header.cdInfoLen);
+        AaruConsole.Debug(MODULE_NAME, "header.bcaLen = {0}",    _header.bcaLen);
 
         for(int i = 0; i < _header.unknown5.Length; i++)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown5[{1}] = 0x{0:X8}", _header.unknown5[i], i);
+            AaruConsole.Debug(MODULE_NAME, "header.unknown5[{1}] = 0x{0:X8}", _header.unknown5[i], i);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dvdStrLen = {0}",  _header.dvdStrLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dvdInfoLen = {0}", _header.dvdInfoLen);
+        AaruConsole.Debug(MODULE_NAME, "header.dvdStrLen = {0}",  _header.dvdStrLen);
+        AaruConsole.Debug(MODULE_NAME, "header.dvdInfoLen = {0}", _header.dvdInfoLen);
 
         for(int i = 0; i < _header.unknown6.Length; i++)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown6[{1}] = 0x{0:X2}", _header.unknown6[i], i);
+            AaruConsole.Debug(MODULE_NAME, "header.unknown6[{1}] = 0x{0:X2}", _header.unknown6[i], i);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "header.manufacturer = {0}",
                                    StringHandlers.CToString(_header.manufacturer));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.product = {0}", StringHandlers.CToString(_header.product));
+        AaruConsole.Debug(MODULE_NAME, "header.product = {0}", StringHandlers.CToString(_header.product));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.revision = {0}", StringHandlers.CToString(_header.revision));
+        AaruConsole.Debug(MODULE_NAME, "header.revision = {0}", StringHandlers.CToString(_header.revision));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.vendor = {0}", StringHandlers.CToString(_header.vendor));
+        AaruConsole.Debug(MODULE_NAME, "header.vendor = {0}", StringHandlers.CToString(_header.vendor));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.volumeId = {0}", StringHandlers.CToString(_header.volumeId));
+        AaruConsole.Debug(MODULE_NAME, "header.volumeId = {0}", StringHandlers.CToString(_header.volumeId));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.mode2ALen = {0}",   _header.mode2ALen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.unkBlkLen = {0}",   _header.unkBlkLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dataLen = {0}",     _header.dataLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sessionsLen = {0}", _header.sessionsLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dpmLen = {0}",      _header.dpmLen);
+        AaruConsole.Debug(MODULE_NAME, "header.mode2ALen = {0}",   _header.mode2ALen);
+        AaruConsole.Debug(MODULE_NAME, "header.unkBlkLen = {0}",   _header.unkBlkLen);
+        AaruConsole.Debug(MODULE_NAME, "header.dataLen = {0}",     _header.dataLen);
+        AaruConsole.Debug(MODULE_NAME, "header.sessionsLen = {0}", _header.sessionsLen);
+        AaruConsole.Debug(MODULE_NAME, "header.dpmLen = {0}",      _header.dpmLen);
 
         _mode2A = new byte[_header.mode2ALen];
 
@@ -132,7 +132,7 @@ public sealed partial class BlindWrite5
 
             if(decoded2A is not null)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.mode_page_2A_0,
                                            Modes.PrettifyModePage_2A(decoded2A));
             }
@@ -158,7 +158,7 @@ public sealed partial class BlindWrite5
             PMA.CDPMA? decodedPma = PMA.Decode(_pma);
 
             if(decodedPma.HasValue)
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.PMA_0, PMA.Prettify(decodedPma));
+                AaruConsole.Debug(MODULE_NAME, Localization.PMA_0, PMA.Prettify(decodedPma));
             else
                 _pma = null;
         }
@@ -204,7 +204,7 @@ public sealed partial class BlindWrite5
             PFI.PhysicalFormatInformation? decodedPfi = PFI.Decode(_pfi, MediaType.DVDROM);
 
             if(decodedPfi.HasValue)
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.PFI_0, PFI.Prettify(decodedPfi));
+                AaruConsole.Debug(MODULE_NAME, Localization.PFI_0, PFI.Prettify(decodedPfi));
             else
             {
                 _pfi = null;
@@ -230,7 +230,7 @@ public sealed partial class BlindWrite5
         {
             stream.EnsureRead(_discInformation, 0, _discInformation.Length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Disc_information_0,
                                        PrintHex.ByteArrayToHexArrayString(_discInformation, 40));
         }
@@ -247,7 +247,7 @@ public sealed partial class BlindWrite5
         byte[] dataPathBytes = new byte[dataPathLen];
         stream.EnsureRead(dataPathBytes, 0, dataPathBytes.Length);
         _dataPath = Encoding.Unicode.GetString(dataPathBytes);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Data_path_0, _dataPath);
+        AaruConsole.Debug(MODULE_NAME, Localization.Data_path_0, _dataPath);
 
         _dataFiles = [];
 
@@ -287,22 +287,22 @@ public sealed partial class BlindWrite5
             dataFile.Filename = Encoding.Unicode.GetString(dataFile.FilenameBytes);
             _dataFiles.Add(dataFile);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dataFile.type = 0x{0:X8}", dataFile.Type);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dataFile.length = {0}",    dataFile.Length);
+            AaruConsole.Debug(MODULE_NAME, "dataFile.type = 0x{0:X8}", dataFile.Type);
+            AaruConsole.Debug(MODULE_NAME, "dataFile.length = {0}",    dataFile.Length);
 
             for(int i = 0; i < dataFile.Unknown1.Length; i++)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "dataFile.unknown1[{1}] = {0}", dataFile.Unknown1[i], i);
+                AaruConsole.Debug(MODULE_NAME, "dataFile.unknown1[{1}] = {0}", dataFile.Unknown1[i], i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dataFile.offset = {0}", dataFile.Offset);
+            AaruConsole.Debug(MODULE_NAME, "dataFile.offset = {0}", dataFile.Offset);
 
             for(int i = 0; i < dataFile.Unknown2.Length; i++)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "dataFile.unknown2[{1}] = {0}", dataFile.Unknown2[i], i);
+                AaruConsole.Debug(MODULE_NAME, "dataFile.unknown2[{1}] = {0}", dataFile.Unknown2[i], i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dataFile.startLba = {0}",    dataFile.StartLba);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dataFile.sectors = {0}",     dataFile.Sectors);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dataFile.filenameLen = {0}", dataFile.FilenameLen);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dataFile.filename = {0}",    dataFile.Filename);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dataFile.unknown3 = {0}",    dataFile.Unknown3);
+            AaruConsole.Debug(MODULE_NAME, "dataFile.startLba = {0}",    dataFile.StartLba);
+            AaruConsole.Debug(MODULE_NAME, "dataFile.sectors = {0}",     dataFile.Sectors);
+            AaruConsole.Debug(MODULE_NAME, "dataFile.filenameLen = {0}", dataFile.FilenameLen);
+            AaruConsole.Debug(MODULE_NAME, "dataFile.filename = {0}",    dataFile.Filename);
+            AaruConsole.Debug(MODULE_NAME, "dataFile.unknown3 = {0}",    dataFile.Unknown3);
         }
 
         _bwSessions = [];
@@ -321,15 +321,15 @@ public sealed partial class BlindWrite5
             session.LastTrack  = BitConverter.ToUInt16(tmpArray, 14);
             session.Tracks     = new TrackDescriptor[session.Entries];
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{0}].filename = {1}", ses, session.Sequence);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{0}].entries = {1}",  ses, session.Entries);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{0}].unknown = {1}",  ses, session.Unknown);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{0}].start = {1}",    ses, session.Start);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{0}].end = {1}",      ses, session.End);
+            AaruConsole.Debug(MODULE_NAME, "session[{0}].filename = {1}", ses, session.Sequence);
+            AaruConsole.Debug(MODULE_NAME, "session[{0}].entries = {1}",  ses, session.Entries);
+            AaruConsole.Debug(MODULE_NAME, "session[{0}].unknown = {1}",  ses, session.Unknown);
+            AaruConsole.Debug(MODULE_NAME, "session[{0}].start = {1}",    ses, session.Start);
+            AaruConsole.Debug(MODULE_NAME, "session[{0}].end = {1}",      ses, session.End);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{0}].firstTrack = {1}", ses, session.FirstTrack);
+            AaruConsole.Debug(MODULE_NAME, "session[{0}].firstTrack = {1}", ses, session.FirstTrack);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session[{0}].lastTrack = {1}", ses, session.LastTrack);
+            AaruConsole.Debug(MODULE_NAME, "session[{0}].lastTrack = {1}", ses, session.LastTrack);
 
             for(int tSeq = 0; tSeq < session.Entries; tSeq++)
             {
@@ -344,7 +344,7 @@ public sealed partial class BlindWrite5
                     stream.Seek(-8, SeekOrigin.Current);
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].type = {2}",
                                            ses,
                                            tSeq,
@@ -352,7 +352,7 @@ public sealed partial class BlindWrite5
 
                 for(int i = 0; i < session.Tracks[tSeq].unknown1.Length; i++)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "session[{0}].track[{1}].unknown1[{2}] = 0x{3:X2}",
                                                ses,
                                                tSeq,
@@ -360,97 +360,97 @@ public sealed partial class BlindWrite5
                                                session.Tracks[tSeq].unknown1[i]);
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].unknown2 = 0x{2:X8}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].unknown2);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].subchannel = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].subchannel);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].unknown3 = 0x{2:X2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].unknown3);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].ctl = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].ctl);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].adr = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].adr);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].point = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].point);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].unknown4 = 0x{2:X2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].tno);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].min = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].min);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].sec = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].sec);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].frame = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].frame);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].zero = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].zero);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].pmin = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].pmin);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].psec = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].psec);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].pframe = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].pframe);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].unknown5 = 0x{2:X2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].unknown5);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].pregap = {2}",
                                            ses,
                                            tSeq,
@@ -458,7 +458,7 @@ public sealed partial class BlindWrite5
 
                 for(int i = 0; i < session.Tracks[tSeq].unknown6.Length; i++)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "session[{0}].track[{1}].unknown6[{2}] = 0x{3:X8}",
                                                ses,
                                                tSeq,
@@ -466,13 +466,13 @@ public sealed partial class BlindWrite5
                                                session.Tracks[tSeq].unknown6[i]);
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].startLba = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].startLba);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].sectors = {2}",
                                            ses,
                                            tSeq,
@@ -480,7 +480,7 @@ public sealed partial class BlindWrite5
 
                 for(int i = 0; i < session.Tracks[tSeq].unknown7.Length; i++)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "session[{0}].track[{1}].unknown7[{2}] = 0x{3:X8}",
                                                ses,
                                                tSeq,
@@ -488,13 +488,13 @@ public sealed partial class BlindWrite5
                                                session.Tracks[tSeq].unknown7[i]);
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].session = {2}",
                                            ses,
                                            tSeq,
                                            session.Tracks[tSeq].session);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "session[{0}].track[{1}].unknown8 = 0x{2:X4}",
                                            ses,
                                            tSeq,
@@ -505,7 +505,7 @@ public sealed partial class BlindWrite5
                 {
                     for(int i = 0; i < session.Tracks[tSeq].unknown9.Length; i++)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "session[{0}].track[{1}].unknown9[{2}] = 0x{3:X8}",
                                                    ses,
                                                    tSeq,
@@ -529,10 +529,10 @@ public sealed partial class BlindWrite5
         stream.EnsureRead(footer, 0, footer.Length);
 
         if(_bw5Footer.SequenceEqual(footer))
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Correctly_arrived_end_of_image);
+            AaruConsole.Debug(MODULE_NAME, Localization.Correctly_arrived_end_of_image);
         else
         {
-            AaruConsole.ErrorWriteLine(Localization
+            AaruConsole.Error(Localization
                                           .BlindWrite5_image_ends_after_expected_position_Probably_new_version_with_different_data_Errors_may_occur);
         }
 
@@ -658,7 +658,7 @@ public sealed partial class BlindWrite5
                                 }
                                 else
                                 {
-                                    AaruConsole.ErrorWriteLine(Localization.Cannot_find_data_file_0, dataFile.Filename);
+                                    AaruConsole.Error(Localization.Cannot_find_data_file_0, dataFile.Filename);
 
                                     continue;
                                 }
@@ -683,7 +683,7 @@ public sealed partial class BlindWrite5
 
                         break;
                     default:
-                        AaruConsole.ErrorWriteLine(Localization.BlindWrite5_found_unknown_subchannel_size_0,
+                        AaruConsole.Error(Localization.BlindWrite5_found_unknown_subchannel_size_0,
                                                    sectorSize - 2352);
 
                         return ErrorNumber.NotSupported;
@@ -715,7 +715,7 @@ public sealed partial class BlindWrite5
         _trackFlags        = new Dictionary<uint, byte>();
         _imageInfo.Sectors = 0;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Building_maps);
+        AaruConsole.Debug(MODULE_NAME, Localization.Building_maps);
 
         foreach(SessionDescriptor ses in _bwSessions)
         {
@@ -1024,7 +1024,7 @@ public sealed partial class BlindWrite5
                     }
                     else
                     {
-                        AaruConsole.ErrorWriteLine(Localization.Could_not_find_image_for_track_0, trk.point);
+                        AaruConsole.Error(Localization.Could_not_find_image_for_track_0, trk.point);
 
                         return ErrorNumber.NoSuchFile;
                     }
@@ -1046,7 +1046,7 @@ public sealed partial class BlindWrite5
                     }
                     catch(Exception)
                     {
-                        AaruConsole.ErrorWriteLine(Localization.Could_not_find_image_for_track_0, trk.point);
+                        AaruConsole.Error(Localization.Could_not_find_image_for_track_0, trk.point);
 
                         return ErrorNumber.NoSuchFile;
                     }
@@ -1114,7 +1114,7 @@ public sealed partial class BlindWrite5
 
                 if(track.Filter is null)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Could_not_find_image_for_track_0, trk.point);
+                    AaruConsole.Error(Localization.Could_not_find_image_for_track_0, trk.point);
 
                     return ErrorNumber.NoSuchFile;
                 }
@@ -1162,47 +1162,47 @@ public sealed partial class BlindWrite5
             track.Session = trackSession.Sequence;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.printing_track_map);
+        AaruConsole.Debug(MODULE_NAME, Localization.printing_track_map);
 
         foreach(Track track in Tracks)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Partition_sequence_0, track.Sequence);
+            AaruConsole.Debug(MODULE_NAME, Localization.Partition_sequence_0, track.Sequence);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Track_description_0, track.Description);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Track_description_0, track.Description);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Track_type_0, track.Type);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Track_type_0, track.Type);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Track_starting_sector_0, track.StartSector);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Track_starting_sector_0, track.StartSector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Track_ending_sector_0, track.EndSector);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Track_ending_sector_0, track.EndSector);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.printing_partition_map);
+        AaruConsole.Debug(MODULE_NAME, Localization.printing_partition_map);
 
         foreach(Partition partition in Partitions)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Partition_sequence_0,    partition.Sequence);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_name_0, partition.Name);
+            AaruConsole.Debug(MODULE_NAME, Localization.Partition_sequence_0,    partition.Sequence);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_name_0, partition.Name);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_description_0, partition.Description);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_description_0, partition.Description);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_type_0, partition.Type);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_type_0, partition.Type);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_starting_sector_0, partition.Start);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_starting_sector_0, partition.Start);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_sectors_0, partition.Length);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_sectors_0, partition.Length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_starting_offset_0, partition.Offset);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_starting_offset_0, partition.Offset);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_size_in_bytes_0, partition.Size);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_size_in_bytes_0, partition.Size);
         }
 
         if(!isDvd)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Rebuilding_TOC);
+            AaruConsole.Debug(MODULE_NAME, Localization.Rebuilding_TOC);
 
             _fullToc = fullTocStream.ToArray();
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.TOC_len_0, _fullToc.Length);
+            AaruConsole.Debug(MODULE_NAME, Localization.TOC_len_0, _fullToc.Length);
 
             _fullToc[0] = firstSession;
             _fullToc[1] = lastSession;
@@ -1357,7 +1357,7 @@ public sealed partial class BlindWrite5
                                    };
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ImageInfo.mediaType = {0}", _imageInfo.MediaType);
+        AaruConsole.Debug(MODULE_NAME, "ImageInfo.mediaType = {0}", _imageInfo.MediaType);
 
         if(_mode2A != null) _imageInfo.ReadableMediaTags.Add(MediaTagType.SCSI_MODEPAGE_2A);
 
@@ -1399,7 +1399,7 @@ public sealed partial class BlindWrite5
             // Wxripper unlock
             _imageInfo.MediaType = MediaType.XGD3;
 
-        AaruConsole.VerboseWriteLine(Localization.BlindWrite_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.BlindWrite_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
 
         if(_header.profile is ProfileNumber.CDR or ProfileNumber.CDRW or ProfileNumber.CDROM)
             return ErrorNumber.NoError;
diff --git a/Aaru.Images/ByteAddressable/AtariLynx.cs b/Aaru.Images/ByteAddressable/AtariLynx.cs
index e736ca8d3..492a45f49 100644
--- a/Aaru.Images/ByteAddressable/AtariLynx.cs
+++ b/Aaru.Images/ByteAddressable/AtariLynx.cs
@@ -271,7 +271,7 @@ public class AtariLynx : IByteAddressableImage
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.InOutError;
         }
diff --git a/Aaru.Images/ByteAddressable/GameBoy.cs b/Aaru.Images/ByteAddressable/GameBoy.cs
index 6d86df413..ad389312e 100644
--- a/Aaru.Images/ByteAddressable/GameBoy.cs
+++ b/Aaru.Images/ByteAddressable/GameBoy.cs
@@ -239,7 +239,7 @@ public class GameBoy : IByteAddressableImage
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.InOutError;
         }
diff --git a/Aaru.Images/ByteAddressable/GameBoyAdvance.cs b/Aaru.Images/ByteAddressable/GameBoyAdvance.cs
index 9130eebb7..de44bd13d 100644
--- a/Aaru.Images/ByteAddressable/GameBoyAdvance.cs
+++ b/Aaru.Images/ByteAddressable/GameBoyAdvance.cs
@@ -219,7 +219,7 @@ public class GameBoyAdvance : IByteAddressableImage
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.InOutError;
         }
diff --git a/Aaru.Images/ByteAddressable/MasterSystem.cs b/Aaru.Images/ByteAddressable/MasterSystem.cs
index e3749c44e..c8a275ac2 100644
--- a/Aaru.Images/ByteAddressable/MasterSystem.cs
+++ b/Aaru.Images/ByteAddressable/MasterSystem.cs
@@ -322,7 +322,7 @@ public class MasterSystem : IByteAddressableImage
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.InOutError;
         }
diff --git a/Aaru.Images/ByteAddressable/NES.cs b/Aaru.Images/ByteAddressable/NES.cs
index 2cbb522e5..1e447e473 100644
--- a/Aaru.Images/ByteAddressable/NES.cs
+++ b/Aaru.Images/ByteAddressable/NES.cs
@@ -436,7 +436,7 @@ public class Nes : IByteAddressableImage
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.InOutError;
         }
diff --git a/Aaru.Images/ByteAddressable/Nintendo64.cs b/Aaru.Images/ByteAddressable/Nintendo64.cs
index ac33dd412..e68a24924 100644
--- a/Aaru.Images/ByteAddressable/Nintendo64.cs
+++ b/Aaru.Images/ByteAddressable/Nintendo64.cs
@@ -273,7 +273,7 @@ public class Nintendo64 : IByteAddressableImage
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.InOutError;
         }
diff --git a/Aaru.Images/ByteAddressable/SegaMegaDrive.cs b/Aaru.Images/ByteAddressable/SegaMegaDrive.cs
index fb4628e56..f3e5a86a9 100644
--- a/Aaru.Images/ByteAddressable/SegaMegaDrive.cs
+++ b/Aaru.Images/ByteAddressable/SegaMegaDrive.cs
@@ -511,7 +511,7 @@ public class SegaMegaDrive : IByteAddressableImage
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.InOutError;
         }
diff --git a/Aaru.Images/ByteAddressable/SuperNintendo.cs b/Aaru.Images/ByteAddressable/SuperNintendo.cs
index f7e3aa208..be3fe1548 100644
--- a/Aaru.Images/ByteAddressable/SuperNintendo.cs
+++ b/Aaru.Images/ByteAddressable/SuperNintendo.cs
@@ -341,7 +341,7 @@ public class SuperNintendo : IByteAddressableImage
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.InOutError;
         }
diff --git a/Aaru.Images/CDRDAO/Identify.cs b/Aaru.Images/CDRDAO/Identify.cs
index 418f34cb7..af8b0b024 100644
--- a/Aaru.Images/CDRDAO/Identify.cs
+++ b/Aaru.Images/CDRDAO/Identify.cs
@@ -95,8 +95,8 @@ public sealed partial class Cdrdao
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(Localization.Exception_trying_to_identify_image_file_0, _cdrdaoFilter.Filename);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Localization.Exception_trying_to_identify_image_file_0, _cdrdaoFilter.Filename);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/CDRDAO/Read.cs b/Aaru.Images/CDRDAO/Read.cs
index 590951557..4d2d01f5c 100644
--- a/Aaru.Images/CDRDAO/Read.cs
+++ b/Aaru.Images/CDRDAO/Read.cs
@@ -129,7 +129,7 @@ public sealed partial class Cdrdao
 
                 if(!matchDiskType.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Not_a_CDRDAO_TOC_or_TOC_type_not_in_line_0,
                                                lineNumber);
 
@@ -183,7 +183,7 @@ public sealed partial class Cdrdao
                     // Ignore "// Track X" comments
                     if(matchComment.Groups["comment"].Value.StartsWith(" Track ", StringComparison.Ordinal)) continue;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_comment_1_at_line_0,
                                                lineNumber,
                                                matchComment.Groups["comment"].Value.Trim());
@@ -192,7 +192,7 @@ public sealed partial class Cdrdao
                 }
                 else if(matchDiskType.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_1_at_line_0,
                                                lineNumber,
                                                matchDiskType.Groups["type"].Value);
@@ -210,7 +210,7 @@ public sealed partial class Cdrdao
                 }
                 else if(matchMcn.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_CATALOG_1_at_line_0,
                                                lineNumber,
                                                matchMcn.Groups["catalog"].Value);
@@ -221,14 +221,14 @@ public sealed partial class Cdrdao
                 {
                     if(matchTrack.Groups["subchan"].Value == "")
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_TRACK_type_1_with_no_subchannel_at_line_0,
                                                    lineNumber,
                                                    matchTrack.Groups["type"].Value);
                     }
                     else
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_TRACK_type_1_subchannel_2_at_line_0,
                                                    lineNumber,
                                                    matchTrack.Groups["type"].Value,
@@ -280,7 +280,7 @@ public sealed partial class Cdrdao
                             break;
                         default:
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization.Track_mode_0_is_unsupported,
+                            AaruConsole.Error(string.Format(Localization.Track_mode_0_is_unsupported,
                                                                      matchTrack.Groups["type"].Value));
 
                             return ErrorNumber.NotSupported;
@@ -300,7 +300,7 @@ public sealed partial class Cdrdao
                             break;
                         default:
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Track_subchannel_mode_0_is_unsupported,
                                                                      matchTrack.Groups["subchan"].Value));
 
@@ -315,7 +315,7 @@ public sealed partial class Cdrdao
                 }
                 else if(matchCopy.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_1_COPY_at_line_0,
                                                lineNumber,
                                                matchCopy.Groups["no"].Value);
@@ -324,7 +324,7 @@ public sealed partial class Cdrdao
                 }
                 else if(matchEmphasis.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_1_PRE_EMPHASIS_at_line_0,
                                                lineNumber,
                                                matchEmphasis.Groups["no"].Value);
@@ -333,7 +333,7 @@ public sealed partial class Cdrdao
                 }
                 else if(matchStereo.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_1_CHANNEL_AUDIO_at_line_0,
                                                lineNumber,
                                                matchStereo.Groups["num"].Value);
@@ -342,7 +342,7 @@ public sealed partial class Cdrdao
                 }
                 else if(matchIsrc.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_ISRC_1_at_line_0,
                                                lineNumber,
                                                matchIsrc.Groups["isrc"].Value);
@@ -351,7 +351,7 @@ public sealed partial class Cdrdao
                 }
                 else if(matchIndex.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_INDEX_1_at_line_0,
                                                lineNumber,
                                                matchIndex.Groups["address"].Value);
@@ -366,7 +366,7 @@ public sealed partial class Cdrdao
                 }
                 else if(matchPregap.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_START_1_at_line_0,
                                                lineNumber,
                                                matchPregap.Groups["address"].Value);
@@ -386,7 +386,7 @@ public sealed partial class Cdrdao
                 }
                 else if(matchZeroPregap.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_PREGAP_1_at_line_0,
                                                lineNumber,
                                                matchZeroPregap.Groups["length"].Value);
@@ -400,14 +400,14 @@ public sealed partial class Cdrdao
                 }
                 else if(matchZeroData.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_ZERO_1_at_line_0,
                                                lineNumber,
                                                matchZeroData.Groups["length"].Value);
                 }
                 else if(matchZeroAudio.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_SILENCE_1_at_line_0,
                                                lineNumber,
                                                matchZeroAudio.Groups["length"].Value);
@@ -416,7 +416,7 @@ public sealed partial class Cdrdao
                 {
                     if(matchAudioFile.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_AUDIOFILE_1_at_line_0,
                                                    lineNumber,
                                                    matchAudioFile.Groups["filename"].Value);
@@ -467,7 +467,7 @@ public sealed partial class Cdrdao
                     }
                     else if(matchFile.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_DATAFILE_1_at_line_0,
                                                    lineNumber,
                                                    matchFile.Groups["filename"].Value);
@@ -504,7 +504,7 @@ public sealed partial class Cdrdao
                     }
                     else if(matchTitle.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_TITLE_1_at_line_0,
                                                    lineNumber,
                                                    matchTitle.Groups["title"].Value);
@@ -516,7 +516,7 @@ public sealed partial class Cdrdao
                     }
                     else if(matchPerformer.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_PERFORMER_1_at_line_0,
                                                    lineNumber,
                                                    matchPerformer.Groups["performer"].Value);
@@ -528,7 +528,7 @@ public sealed partial class Cdrdao
                     }
                     else if(matchSongwriter.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_SONGWRITER_1_at_line_0,
                                                    lineNumber,
                                                    matchSongwriter.Groups["songwriter"].Value);
@@ -540,7 +540,7 @@ public sealed partial class Cdrdao
                     }
                     else if(matchComposer.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_COMPOSER_1_at_line_0,
                                                    lineNumber,
                                                    matchComposer.Groups["composer"].Value);
@@ -552,7 +552,7 @@ public sealed partial class Cdrdao
                     }
                     else if(matchArranger.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_ARRANGER_1_at_line_0,
                                                    lineNumber,
                                                    matchArranger.Groups["arranger"].Value);
@@ -564,7 +564,7 @@ public sealed partial class Cdrdao
                     }
                     else if(matchMessage.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_MESSAGE_1_at_line_0,
                                                    lineNumber,
                                                    matchMessage.Groups["message"].Value);
@@ -576,7 +576,7 @@ public sealed partial class Cdrdao
                     }
                     else if(matchDiscId.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_DISC_ID_1_at_line_0,
                                                    lineNumber,
                                                    matchDiscId.Groups["discid"].Value);
@@ -585,7 +585,7 @@ public sealed partial class Cdrdao
                     }
                     else if(matchUpc.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_UPC_EAN_1_at_line_0,
                                                    lineNumber,
                                                    matchUpc.Groups["catalog"].Value);
@@ -624,160 +624,160 @@ public sealed partial class Cdrdao
             _discimage.Comment = commentBuilder.ToString();
 
             // DEBUG information
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_image_parsing_results);
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_CD_TEXT);
+            AaruConsole.Debug(MODULE_NAME, Localization.Disc_image_parsing_results);
+            AaruConsole.Debug(MODULE_NAME, Localization.Disc_CD_TEXT);
 
             if(_discimage.Arranger == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Arranger_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Arranger_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Arranger_0, _discimage.Arranger);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Arranger_0, _discimage.Arranger);
 
             if(_discimage.Composer == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Composer_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Composer_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Composer_0, _discimage.Composer);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Composer_0, _discimage.Composer);
 
             if(_discimage.Performer == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Performer_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Performer_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Performer_0, _discimage.Performer);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Performer_0, _discimage.Performer);
 
             if(_discimage.Songwriter == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Songwriter_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Songwriter_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Songwriter_0, _discimage.Songwriter);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Songwriter_0, _discimage.Songwriter);
 
             if(_discimage.Title == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Title_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Title_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Title_0, _discimage.Title);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Title_0, _discimage.Title);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_information);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Guessed_disk_type_0, _discimage.Disktype);
+            AaruConsole.Debug(MODULE_NAME, Localization.Disc_information);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Guessed_disk_type_0, _discimage.Disktype);
 
             if(_discimage.Barcode == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Barcode_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Barcode_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Barcode_0, _discimage.Barcode);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Barcode_0, _discimage.Barcode);
 
             if(_discimage.DiskId == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Disc_ID_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Disc_ID_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Disc_ID_0, _discimage.DiskId);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Disc_ID_0, _discimage.DiskId);
 
             if(_discimage.Mcn == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.MCN_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.MCN_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.MCN_0, _discimage.Mcn);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.MCN_0, _discimage.Mcn);
 
             if(string.IsNullOrEmpty(_discimage.Comment))
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Comment_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Comment_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Comment_0, _discimage.Comment);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Comment_0, _discimage.Comment);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Track_information);
+            AaruConsole.Debug(MODULE_NAME, Localization.Track_information);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "\t" + Localization.Disc_contains_0_tracks,
                                        _discimage.Tracks.Count);
 
             for(int i = 0; i < _discimage.Tracks.Count; i++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t" + Localization.Track_0_information,
                                            _discimage.Tracks[i].Sequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization._0_bytes_per_sector,
                                            _discimage.Tracks[i].Bps);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Pregap_0_sectors,
                                            _discimage.Tracks[i].Pregap);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Data_0_sectors_starting_at_sector_1,
                                            _discimage.Tracks[i].Sectors,
                                            _discimage.Tracks[i].StartSector);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Postgap_0_sectors,
                                            _discimage.Tracks[i].Postgap);
 
                 if(_discimage.Tracks[i].Flag4Ch)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_is_flagged_as_quadraphonic);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_is_flagged_as_quadraphonic);
 
                 if(_discimage.Tracks[i].FlagDcp)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_allows_digital_copy);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_allows_digital_copy);
 
                 if(_discimage.Tracks[i].FlagPre)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_has_pre_emphasis_applied);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_has_pre_emphasis_applied);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" +
                                            Localization.Track_resides_in_file_0_type_defined_as_1_starting_at_byte_2,
                                            _discimage.Tracks[i].Trackfile.Datafilter.Filename,
                                            _discimage.Tracks[i].Trackfile.Filetype,
                                            _discimage.Tracks[i].Trackfile.Offset);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Indexes);
+                AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Indexes);
 
                 foreach(KeyValuePair<int, ulong> kvp in _discimage.Tracks[i].Indexes)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "\t\t\t" + Localization.Index_0_starts_at_sector_1,
                                                kvp.Key,
                                                kvp.Value);
                 }
 
                 if(_discimage.Tracks[i].Isrc == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.ISRC_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.ISRC_is_not_set);
                 else
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.ISRC_0, _discimage.Tracks[i].Isrc);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.ISRC_0, _discimage.Tracks[i].Isrc);
 
                 if(_discimage.Tracks[i].Arranger == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Arranger_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Arranger_is_not_set);
                 else
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "\t\t" + Localization.Arranger_0,
                                                _discimage.Tracks[i].Arranger);
                 }
 
                 if(_discimage.Tracks[i].Composer == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Composer_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Composer_is_not_set);
                 else
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "\t\t" + Localization.Composer_0,
                                                _discimage.Tracks[i].Composer);
                 }
 
                 if(_discimage.Tracks[i].Performer == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Performer_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Performer_is_not_set);
                 else
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "\t\t" + Localization.Performer_0,
                                                _discimage.Tracks[i].Performer);
                 }
 
                 if(_discimage.Tracks[i].Songwriter == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Songwriter_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Songwriter_is_not_set);
                 else
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "\t\t" + Localization.Songwriter_0,
                                                _discimage.Tracks[i].Songwriter);
                 }
 
                 if(_discimage.Tracks[i].Title == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Title_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Title_is_not_set);
                 else
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Title_0, _discimage.Tracks[i].Title);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Title_0, _discimage.Tracks[i].Title);
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Building_offset_map);
+            AaruConsole.Debug(MODULE_NAME, Localization.Building_offset_map);
 
             Partitions = [];
             _offsetmap = new Dictionary<uint, ulong>();
@@ -789,7 +789,7 @@ public sealed partial class Cdrdao
             {
                 if(_discimage.Tracks[i].Sequence == 1 && i != 0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Unordered_tracks);
+                    AaruConsole.Error(Localization.Unordered_tracks);
 
                     return ErrorNumber.NotSupported;
                 }
@@ -827,30 +827,30 @@ public sealed partial class Cdrdao
             }
 
             // Print partition map
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.printing_partition_map);
+            AaruConsole.Debug(MODULE_NAME, Localization.printing_partition_map);
 
             foreach(Partition partition in Partitions)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Partition_sequence_0,    partition.Sequence);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_name_0, partition.Name);
+                AaruConsole.Debug(MODULE_NAME, Localization.Partition_sequence_0,    partition.Sequence);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_name_0, partition.Name);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t" + Localization.Partition_description_0,
                                            partition.Description);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_type_0, partition.Type);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_type_0, partition.Type);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t" + Localization.Partition_starting_sector_0,
                                            partition.Start);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_sectors_0, partition.Length);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_sectors_0, partition.Length);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t" + Localization.Partition_starting_offset_0,
                                            partition.Offset);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_size_in_bytes_0, partition.Size);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_size_in_bytes_0, partition.Size);
             }
 
             foreach(CdrdaoTrack track in _discimage.Tracks)
@@ -958,10 +958,10 @@ public sealed partial class Cdrdao
 
             _imageInfo.MetadataMediaType = MetadataMediaType.OpticalDisc;
 
-            AaruConsole.VerboseWriteLine(Localization.CDRDAO_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
+            AaruConsole.Verbose(Localization.CDRDAO_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
 
             if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                AaruConsole.VerboseWriteLine(Localization.CDRDAO_comments_0, _imageInfo.Comments);
+                AaruConsole.Verbose(Localization.CDRDAO_comments_0, _imageInfo.Comments);
 
             _sectorBuilder = new SectorBuilder();
 
@@ -969,8 +969,8 @@ public sealed partial class Cdrdao
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(Localization.Exception_trying_to_identify_image_file_0, imageFilter);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Localization.Exception_trying_to_identify_image_file_0, imageFilter);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.UnexpectedException;
         }
diff --git a/Aaru.Images/CDRDAO/Write.cs b/Aaru.Images/CDRDAO/Write.cs
index eaa3c97bf..00941c3e7 100644
--- a/Aaru.Images/CDRDAO/Write.cs
+++ b/Aaru.Images/CDRDAO/Write.cs
@@ -99,7 +99,7 @@ public sealed partial class Cdrdao
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/CDRWin/Identify.cs b/Aaru.Images/CDRWin/Identify.cs
index bde6bf1b0..b6ab18df5 100644
--- a/Aaru.Images/CDRWin/Identify.cs
+++ b/Aaru.Images/CDRWin/Identify.cs
@@ -102,8 +102,8 @@ public sealed partial class CdrWin
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(Localization.Exception_trying_to_identify_image_file_0, _cdrwinFilter);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Localization.Exception_trying_to_identify_image_file_0, _cdrwinFilter);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs
index 5b14b24c6..d632c3ec1 100644
--- a/Aaru.Images/CDRWin/Read.cs
+++ b/Aaru.Images/CDRWin/Read.cs
@@ -146,7 +146,7 @@ public sealed partial class CdrWin
 
                 if(trackCount + 1 != trackSeq)
                 {
-                    AaruConsole.ErrorWriteLine(string.Format(Localization.Found_TRACK_0_out_of_order_in_line_1,
+                    AaruConsole.Error(string.Format(Localization.Found_TRACK_0_out_of_order_in_line_1,
                                                              trackSeq,
                                                              lineNumber));
 
@@ -158,7 +158,7 @@ public sealed partial class CdrWin
 
             if(trackCount == 0)
             {
-                AaruConsole.ErrorWriteLine(Localization.No_tracks_found);
+                AaruConsole.Error(Localization.No_tracks_found);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -205,7 +205,7 @@ public sealed partial class CdrWin
 
                     if(matchTruripDiscCrc32.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_REM_CRC32_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_REM_CRC32_at_line_0, lineNumber);
                         _discImage.DiscHashes.Add("crc32", matchTruripDiscCrc32.Groups[1].Value.ToLowerInvariant());
 
                         continue;
@@ -213,7 +213,7 @@ public sealed partial class CdrWin
 
                     if(matchTruripDiscMd5.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_REM_MD5_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_REM_MD5_at_line_0, lineNumber);
                         _discImage.DiscHashes.Add("md5", matchTruripDiscMd5.Groups[1].Value.ToLowerInvariant());
 
                         continue;
@@ -221,7 +221,7 @@ public sealed partial class CdrWin
 
                     if(matchTruripDiscSha1.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_REM_SHA1_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_REM_SHA1_at_line_0, lineNumber);
                         _discImage.DiscHashes.Add("sha1", matchTruripDiscSha1.Groups[1].Value.ToLowerInvariant());
 
                         continue;
@@ -236,7 +236,7 @@ public sealed partial class CdrWin
 
                     if(matchTruripTrackCrc32.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_CRC32_for_1_2_at_line_0,
                                                    lineNumber,
                                                    matchTruripTrackCrc32.Groups[1].Value == "Trk"
@@ -249,7 +249,7 @@ public sealed partial class CdrWin
 
                     if(matchTruripTrackMd5.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_MD5_for_1_2_at_line_0,
                                                    lineNumber,
                                                    matchTruripTrackMd5.Groups[1].Value == "Trk"
@@ -262,7 +262,7 @@ public sealed partial class CdrWin
 
                     if(matchTruripTrackSha1.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_SHA1_for_1_2_at_line_0,
                                                    lineNumber,
                                                    matchTruripTrackSha1.Groups[1].Value == "Trk"
@@ -275,7 +275,7 @@ public sealed partial class CdrWin
 
                     if(matchTruripTrackUnknownHash.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Found_unknown_hash_for_1_2_at_line_0_Please_report_this_disc_image,
                                                    lineNumber,
@@ -296,7 +296,7 @@ public sealed partial class CdrWin
                    ulong.TryParse(matchDumpExtent.Groups["start"].Value, out ulong extentStart) &&
                    ulong.TryParse(matchDumpExtent.Groups["end"].Value,   out ulong extentEnd))
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_REM_METADATA_DUMP_EXTENT_at_line_0,
                                                lineNumber);
 
@@ -354,7 +354,7 @@ public sealed partial class CdrWin
                 }
                 else if(matchDicMediaType.Success && !inTrack)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_REM_METADATA_DIC_MEDIA_TYPE_at_line_0,
                                                lineNumber);
 
@@ -362,7 +362,7 @@ public sealed partial class CdrWin
                 }
                 else if(matchAaruMediaType.Success && !inTrack)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_REM_METADATA_AARU_MEDIA_TYPE_at_line_0,
                                                lineNumber);
 
@@ -370,7 +370,7 @@ public sealed partial class CdrWin
                 }
                 else if(matchDiskType.Success && !inTrack)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_REM_ORIGINAL_MEDIA_TYPE_at_line_0,
                                                lineNumber);
 
@@ -378,13 +378,13 @@ public sealed partial class CdrWin
                 }
                 else if(matchSession.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_REM_SESSION_at_line_0, lineNumber);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_REM_SESSION_at_line_0, lineNumber);
                     currentSession      = byte.Parse(matchSession.Groups[1].Value);
                     firstTrackInSession = true;
                 }
                 else if(matchRedumpSdArea.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_REM_SINGLE_DENSITY_AREA_at_line_0,
                                                lineNumber);
 
@@ -393,7 +393,7 @@ public sealed partial class CdrWin
                 }
                 else if(matchRedumpHdArea.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_REM_HIGH_DENSITY_AREA_at_line_0,
                                                lineNumber);
 
@@ -402,21 +402,21 @@ public sealed partial class CdrWin
                     firstTrackInSession         = true;
                 }
                 else if(matchLba.Success)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_REM_MSF_at_line_0, lineNumber);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_REM_MSF_at_line_0, lineNumber);
                 else if(matchLeadOut.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_REM_LEAD_OUT_at_line_0, lineNumber);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_REM_LEAD_OUT_at_line_0, lineNumber);
                     leadouts[currentSession] = CdrWinMsfToLba(matchLeadOut.Groups[1].Value);
                 }
                 else if(matchApplication.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_REM_Ripping_Tool_at_line_0, lineNumber);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_REM_Ripping_Tool_at_line_0, lineNumber);
 
                     _imageInfo.Application = matchApplication.Groups[1].Value;
                 }
                 else if(matchApplicationVersion.Success && !inTrack)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_REM_Ripping_Tool_Version_at_line_0,
                                                lineNumber);
 
@@ -424,13 +424,13 @@ public sealed partial class CdrWin
                 }
                 else if(matchTruripDisc.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_REM_DISC_HASHES_at_line_0, lineNumber);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_REM_DISC_HASHES_at_line_0, lineNumber);
 
                     inTruripDiscHash = true;
                 }
                 else if(matchTruripTrack.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Found_REM_Gap_Append_Method_1_2_HASHES_at_line_0,
                                                lineNumber,
                                                matchTruripTrack.Groups[1].Value,
@@ -441,7 +441,7 @@ public sealed partial class CdrWin
                 }
                 else if(matchComment.Success)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_REM_at_line_0, lineNumber);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_REM_at_line_0, lineNumber);
 
                     if(_discImage.Comment == "")
                         _discImage.Comment = matchComment.Groups[1].Value; // First comment
@@ -473,7 +473,7 @@ public sealed partial class CdrWin
 
                     if(matchArranger.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_ARRANGER_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_ARRANGER_at_line_0, lineNumber);
 
                         if(inTrack)
                             currentTrack.Arranger = matchArranger.Groups[1].Value;
@@ -482,13 +482,13 @@ public sealed partial class CdrWin
                     }
                     else if(matchBarCode.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_UPC_EAN_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_UPC_EAN_at_line_0, lineNumber);
 
                         if(!inTrack)
                             _discImage.Barcode = matchBarCode.Groups[1].Value;
                         else
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Found_barcode_field_in_incorrect_place_at_line_0,
                                                                      lineNumber));
 
@@ -497,13 +497,13 @@ public sealed partial class CdrWin
                     }
                     else if(matchCdText.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_CDTEXTFILE_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_CDTEXTFILE_at_line_0, lineNumber);
 
                         if(!inTrack)
                             _discImage.CdTextFile = matchCdText.Groups[1].Value;
                         else
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Found_CD_Text_file_field_in_incorrect_place_at_line_0,
                                                                      lineNumber));
 
@@ -512,7 +512,7 @@ public sealed partial class CdrWin
                     }
                     else if(matchComposer.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_COMPOSER_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_COMPOSER_at_line_0, lineNumber);
 
                         if(inTrack)
                             currentTrack.Composer = matchComposer.Groups[1].Value;
@@ -521,13 +521,13 @@ public sealed partial class CdrWin
                     }
                     else if(matchDiskId.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_DISC_ID_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_DISC_ID_at_line_0, lineNumber);
 
                         if(!inTrack)
                             _discImage.DiscId = matchDiskId.Groups[1].Value;
                         else
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Found_CDDB_ID_field_in_incorrect_place_at_line_0,
                                                                      lineNumber));
 
@@ -536,7 +536,7 @@ public sealed partial class CdrWin
                     }
                     else if(matchFile.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_FILE_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_FILE_at_line_0, lineNumber);
 
                         if(currentTrack.Sequence != 0)
                         {
@@ -586,7 +586,7 @@ public sealed partial class CdrWin
 
                                         if(currentFile.DataFilter == null)
                                         {
-                                            AaruConsole.ErrorWriteLine(string.Format(Localization.File_0_not_found,
+                                            AaruConsole.Error(string.Format(Localization.File_0_not_found,
                                                                            matchFile.Groups[1].Value));
 
                                             return ErrorNumber.NoSuchFile;
@@ -595,7 +595,7 @@ public sealed partial class CdrWin
                                 }
                                 else
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.File_0_not_found,
+                                    AaruConsole.Error(string.Format(Localization.File_0_not_found,
                                                                              matchFile.Groups[1].Value));
 
                                     return ErrorNumber.NoSuchFile;
@@ -626,7 +626,7 @@ public sealed partial class CdrWin
 
                                         if(currentFile.DataFilter == null)
                                         {
-                                            AaruConsole.ErrorWriteLine(string.Format(Localization.File_0_not_found,
+                                            AaruConsole.Error(string.Format(Localization.File_0_not_found,
                                                                            matchFile.Groups[1].Value));
 
                                             return ErrorNumber.NoSuchFile;
@@ -635,7 +635,7 @@ public sealed partial class CdrWin
                                 }
                                 else
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.File_0_not_found,
+                                    AaruConsole.Error(string.Format(Localization.File_0_not_found,
                                                                              matchFile.Groups[1].Value));
 
                                     return ErrorNumber.NoSuchFile;
@@ -648,7 +648,7 @@ public sealed partial class CdrWin
 
                                 if(currentFile.DataFilter == null)
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.File_0_not_found,
+                                    AaruConsole.Error(string.Format(Localization.File_0_not_found,
                                                                              matchFile.Groups[1].Value));
 
                                     return ErrorNumber.NoSuchFile;
@@ -657,7 +657,7 @@ public sealed partial class CdrWin
                         }
 
                         // File does exist, process it
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.File_0_found,
                                                    currentFile.DataFilter.Filename);
 
@@ -669,12 +669,12 @@ public sealed partial class CdrWin
                             case CDRWIN_DISK_TYPE_AIFF:
                             case CDRWIN_DISK_TYPE_RIFF:
                             case CDRWIN_DISK_TYPE_MP3:
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_file_type_0,
+                                AaruConsole.Error(string.Format(Localization.Unsupported_file_type_0,
                                                                          currentFile.FileType));
 
                                 return ErrorNumber.NotImplemented;
                             default:
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Unknown_file_type_0,
+                                AaruConsole.Error(string.Format(Localization.Unknown_file_type_0,
                                                                          currentFile.FileType));
 
                                 return ErrorNumber.InvalidArgument;
@@ -685,11 +685,11 @@ public sealed partial class CdrWin
                     }
                     else if(matchFlags.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_FLAGS_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_FLAGS_at_line_0, lineNumber);
 
                         if(!inTrack)
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Found_FLAGS_field_in_incorrect_place_at_line_0,
                                                                      lineNumber));
 
@@ -703,7 +703,7 @@ public sealed partial class CdrWin
                     }
                     else if(matchGenre.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_GENRE_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_GENRE_at_line_0, lineNumber);
 
                         if(inTrack)
                             currentTrack.Genre = matchGenre.Groups[1].Value;
@@ -712,11 +712,11 @@ public sealed partial class CdrWin
                     }
                     else if(matchIndex.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_INDEX_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_INDEX_at_line_0, lineNumber);
 
                         if(!inTrack)
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization.Found_INDEX_before_a_track_0,
+                            AaruConsole.Error(string.Format(Localization.Found_INDEX_before_a_track_0,
                                                                      lineNumber));
 
                             return ErrorNumber.InvalidArgument;
@@ -727,7 +727,7 @@ public sealed partial class CdrWin
 
                         if(index != 0 && index != 1 && currentTrack.Indexes.Count == 0)
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Found_INDEX_0_before_INDEX_00_or_INDEX_01,
                                                                      index));
 
@@ -744,15 +744,15 @@ public sealed partial class CdrWin
                                 currentFile.Offset += cueTracks[currentTrack.Sequence - 2].Sectors *
                                                       cueTracks[currentTrack.Sequence - 2].Bps;
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization.Sets_currentFile_offset_to_0,
                                                            currentFile.Offset);
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            "cueTracks[currentTrack.sequence-2].sectors = {0}",
                                                            cueTracks[currentTrack.Sequence - 2].Sectors);
 
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            "cueTracks[currentTrack.sequence-2].bps = {0}",
                                                            cueTracks[currentTrack.Sequence - 2].Bps);
                             }
@@ -761,7 +761,7 @@ public sealed partial class CdrWin
                         if((index == 0 || index == 1 && !currentTrack.Indexes.ContainsKey(0)) &&
                            currentTrack.Sequence == 1)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Sets_currentFile_offset_to_0,
                                                        offset * currentTrack.Bps);
 
@@ -794,11 +794,11 @@ public sealed partial class CdrWin
                     }
                     else if(matchIsrc.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_ISRC_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_ISRC_at_line_0, lineNumber);
 
                         if(!inTrack)
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization.Found_ISRC_before_a_track_0,
+                            AaruConsole.Error(string.Format(Localization.Found_ISRC_before_a_track_0,
                                                                      lineNumber));
 
                             return ErrorNumber.InvalidArgument;
@@ -808,13 +808,13 @@ public sealed partial class CdrWin
                     }
                     else if(matchMcn.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_CATALOG_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_CATALOG_at_line_0, lineNumber);
 
                         if(!inTrack)
                             _discImage.Mcn = matchMcn.Groups[1].Value;
                         else
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Found_CATALOG_field_in_incorrect_place_at_line_0,
                                                                      lineNumber));
 
@@ -823,7 +823,7 @@ public sealed partial class CdrWin
                     }
                     else if(matchPerformer.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PERFORMER_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_PERFORMER_at_line_0, lineNumber);
 
                         if(inTrack)
                             currentTrack.Performer = matchPerformer.Groups[1].Value;
@@ -832,13 +832,13 @@ public sealed partial class CdrWin
                     }
                     else if(matchPostgap.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_POSTGAP_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_POSTGAP_at_line_0, lineNumber);
 
                         if(inTrack)
                             currentTrack.Postgap = CdrWinMsfToLba(matchPostgap.Groups[1].Value);
                         else
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Found_POSTGAP_field_before_a_track_at_line_0,
                                                                      lineNumber));
 
@@ -847,11 +847,11 @@ public sealed partial class CdrWin
                     }
                     else if(matchPregap.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PREGAP_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_PREGAP_at_line_0, lineNumber);
 
                         if(!inTrack)
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Found_PREGAP_field_before_a_track_at_line_0,
                                                                      lineNumber));
 
@@ -862,7 +862,7 @@ public sealed partial class CdrWin
                     }
                     else if(matchSongWriter.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_SONGWRITER_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_SONGWRITER_at_line_0, lineNumber);
 
                         if(inTrack)
                             currentTrack.Songwriter = matchSongWriter.Groups[1].Value;
@@ -871,7 +871,7 @@ public sealed partial class CdrWin
                     }
                     else if(matchTitle.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_TITLE_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_TITLE_at_line_0, lineNumber);
 
                         if(inTrack)
                             currentTrack.Title = matchTitle.Groups[1].Value;
@@ -880,11 +880,11 @@ public sealed partial class CdrWin
                     }
                     else if(matchTrack.Success)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_TRACK_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_TRACK_at_line_0, lineNumber);
 
                         if(currentFile.DataFilter == null)
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Found_TRACK_field_before_a_file_is_defined_at_line_0,
                                                                      lineNumber));
 
@@ -907,7 +907,7 @@ public sealed partial class CdrWin
                             Sequence = uint.Parse(matchTrack.Groups[1].Value)
                         };
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Setting_currentTrack_sequence_to_0,
                                                    currentTrack.Sequence);
 
@@ -919,7 +919,7 @@ public sealed partial class CdrWin
                     }
                     else if(line.Contains("INDEX 01 00:-2:00"))
                     {
-                        AaruConsole.ErrorWriteLine(Localization
+                        AaruConsole.Error(Localization
                                                       .This_image_from_PowerISO_is_damaged_beyond_possible_recovery_Will_not_open);
 
                         return ErrorNumber.InvalidArgument;
@@ -928,7 +928,7 @@ public sealed partial class CdrWin
                     {}
                     else // Non-empty unknown field
                     {
-                        AaruConsole.ErrorWriteLine(string.Format(Localization.Found_unknown_field_defined_at_line_0_1,
+                        AaruConsole.Error(string.Format(Localization.Found_unknown_field_defined_at_line_0_1,
                                                                  lineNumber,
                                                                  line));
 
@@ -957,7 +957,7 @@ public sealed partial class CdrWin
                 if(cueTracks.Any(t => t.Session > 1 || t.TrackFile.DataFilter.Path != firstFile) ||
                    cueTracks[0].Indexes.ContainsKey(0))
                 {
-                    AaruConsole.ErrorWriteLine(Localization
+                    AaruConsole.Error(Localization
                                                   .The_data_files_are_not_correct_according_to_the_cuesheet_file_cannot_continue_with_this_file);
 
                     return ErrorNumber.InvalidArgument;
@@ -970,7 +970,7 @@ public sealed partial class CdrWin
 
                 if(currentFile.DataFilter.Length - (long)cueTracks[currentTrack.Sequence - 1].TrackFile.Offset < 0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization
+                    AaruConsole.Error(Localization
                                                   .The_data_files_are_not_correct_according_to_the_cuesheet_file_cannot_continue_with_this_file);
 
                     return ErrorNumber.InvalidArgument;
@@ -984,7 +984,7 @@ public sealed partial class CdrWin
                 _lostPregap             =  (uint)cueTracks[0].Pregap;
                 cueTracks[0].Sectors    += _lostPregap;
 
-                AaruConsole.ErrorWriteLine(Localization
+                AaruConsole.Error(Localization
                                               .The_data_files_are_missing_a_pregap_or_hidden_track_contents_will_do_best_effort_to_make_the_rest_of_the_image_readable);
             }
 
@@ -1115,7 +1115,7 @@ public sealed partial class CdrWin
                     _imageInfo.Application         = "MagicISO";
                     _discImage.MediaType           = MediaType.DVDROM;
 
-                    AaruConsole.ErrorWriteLine(Localization
+                    AaruConsole.Error(Localization
                                                   .This_image_is_most_probably_corrupted_beyond_repair_It_is_highly_recommended_to_dump_it_with_another_software);
                 }
             }
@@ -1190,158 +1190,158 @@ public sealed partial class CdrWin
             }
 
             // DEBUG information
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_image_parsing_results);
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_CD_TEXT);
+            AaruConsole.Debug(MODULE_NAME, Localization.Disc_image_parsing_results);
+            AaruConsole.Debug(MODULE_NAME, Localization.Disc_CD_TEXT);
 
             if(_discImage.Arranger == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Arranger_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Arranger_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Arranger_0, _discImage.Arranger);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Arranger_0, _discImage.Arranger);
 
             if(_discImage.Composer == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Composer_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Composer_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Composer_0, _discImage.Composer);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Composer_0, _discImage.Composer);
 
             if(_discImage.Genre == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Genre_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Genre_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Genre_0, _discImage.Genre);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Genre_0, _discImage.Genre);
 
             if(_discImage.Performer == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Performer_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Performer_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Performer_0, _discImage.Performer);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Performer_0, _discImage.Performer);
 
             if(_discImage.Songwriter == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Songwriter_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Songwriter_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Songwriter_0, _discImage.Songwriter);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Songwriter_0, _discImage.Songwriter);
 
             if(_discImage.Title == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Title_is_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Title_is_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Title_0, _discImage.Title);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Title_0, _discImage.Title);
 
             if(_discImage.CdTextFile == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.CD_TEXT_binary_file_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.CD_TEXT_binary_file_not_set);
             else
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t" + Localization.CD_TEXT_binary_file_0,
                                            _discImage.CdTextFile);
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_information);
+            AaruConsole.Debug(MODULE_NAME, Localization.Disc_information);
 
             if(_discImage.OriginalMediaType == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.ISOBuster_disc_type_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.ISOBuster_disc_type_not_set);
             else
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t" + Localization.ISOBuster_disc_type_0,
                                            _discImage.OriginalMediaType);
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Guessed_disk_type_0, _discImage.MediaType);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Guessed_disk_type_0, _discImage.MediaType);
 
             if(_discImage.Barcode == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Barcode_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Barcode_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Barcode_0, _discImage.Barcode);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Barcode_0, _discImage.Barcode);
 
             if(_discImage.DiscId == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Disc_ID_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Disc_ID_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Disc_ID_0, _discImage.DiscId);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Disc_ID_0, _discImage.DiscId);
 
             if(_discImage.Mcn == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.MCN_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.MCN_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.MCN_0, _discImage.Mcn);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.MCN_0, _discImage.Mcn);
 
             if(_discImage.Comment == null)
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Comment_not_set);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Comment_not_set);
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Comment_0, _discImage.Comment);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Comment_0, _discImage.Comment);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Track_information);
+            AaruConsole.Debug(MODULE_NAME, Localization.Track_information);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "\t" + Localization.Disc_contains_0_tracks,
                                        _discImage.Tracks.Count);
 
             foreach(CdrWinTrack t in _discImage.Tracks)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Track_0_information, t.Sequence);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Track_0_information, t.Sequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization._0_bytes_per_sector, t.Bps);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Pregap_0_sectors,    t.Pregap);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Data_0_sectors,      t.Sectors);
+                AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization._0_bytes_per_sector, t.Bps);
+                AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Pregap_0_sectors,    t.Pregap);
+                AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Data_0_sectors,      t.Sectors);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Postgap_0_sectors, t.Postgap);
+                AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Postgap_0_sectors, t.Postgap);
 
                 if(t.Flag4Ch)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_is_flagged_as_quadraphonic);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_is_flagged_as_quadraphonic);
 
-                if(t.FlagDcp) AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_allows_digital_copy);
+                if(t.FlagDcp) AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_allows_digital_copy);
 
                 if(t.FlagPre)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_has_pre_emphasis_applied);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_has_pre_emphasis_applied);
 
-                if(t.FlagScms) AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_has_SCMS);
+                if(t.FlagScms) AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_has_SCMS);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" +
                                            Localization.Track_resides_in_file_0_type_defined_as_1_starting_at_byte_2,
                                            t.TrackFile.DataFilter.Filename,
                                            t.TrackFile.FileType,
                                            t.TrackFile.Offset);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Indexes);
+                AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Indexes);
 
                 foreach(KeyValuePair<ushort, int> kvp in t.Indexes)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "\t\t\t" + Localization.Index_0_starts_at_sector_1,
                                                kvp.Key,
                                                kvp.Value);
                 }
 
                 if(t.Isrc == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.ISRC_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.ISRC_is_not_set);
                 else
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.ISRC_0, t.Isrc);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.ISRC_0, t.Isrc);
 
                 if(t.Arranger == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Arranger_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Arranger_is_not_set);
                 else
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Arranger_0, t.Arranger);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Arranger_0, t.Arranger);
 
                 if(t.Composer == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Composer_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Composer_is_not_set);
                 else
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Composer_0, t.Composer);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Composer_0, t.Composer);
 
                 if(t.Genre == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Genre_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Genre_is_not_set);
                 else
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Genre_0, t.Genre);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Genre_0, t.Genre);
 
                 if(t.Performer == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Performer_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Performer_is_not_set);
                 else
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Performer_0, t.Performer);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Performer_0, t.Performer);
 
                 if(t.Songwriter == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Songwriter_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Songwriter_is_not_set);
                 else
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Songwriter_0, t.Songwriter);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Songwriter_0, t.Songwriter);
 
                 if(t.Title == null)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Title_is_not_set);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Title_is_not_set);
                 else
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Title_0, t.Title);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Title_0, t.Title);
             }
 
             foreach(CdrWinTrack track in _discImage.Tracks) _imageInfo.ImageSize += track.Bps * track.Sectors;
@@ -1397,34 +1397,34 @@ public sealed partial class CdrWin
 
             _imageInfo.Sectors = _discImage.Sessions.MaxBy(s => s.EndSector).EndSector + 1;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Session_information);
+            AaruConsole.Debug(MODULE_NAME, Localization.Session_information);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "\t" + Localization.Disc_contains_0_sessions,
                                        _discImage.Sessions.Count);
 
             for(int i = 0; i < _discImage.Sessions.Count; i++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Session_0_information, i + 1);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Session_0_information, i + 1);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Starting_track_0,
                                            _discImage.Sessions[i].StartTrack);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Starting_sector_0,
                                            _discImage.Sessions[i].StartSector);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Ending_track_0,
                                            _discImage.Sessions[i].EndTrack);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Ending_sector_0,
                                            _discImage.Sessions[i].EndSector);
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Building_offset_map);
+            AaruConsole.Debug(MODULE_NAME, Localization.Building_offset_map);
 
             Partitions = [];
 
@@ -1436,7 +1436,7 @@ public sealed partial class CdrWin
             {
                 if(_discImage.Tracks[i].Sequence == 1 && i != 0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Unordered_tracks);
+                    AaruConsole.Error(Localization.Unordered_tracks);
 
                     return ErrorNumber.InvalidArgument;
                 }
@@ -1445,7 +1445,7 @@ public sealed partial class CdrWin
 
                 if(!_discImage.Tracks[i].Indexes.TryGetValue(1, out _))
                 {
-                    AaruConsole.ErrorWriteLine(string.Format(Localization.Track_0_lacks_index_01,
+                    AaruConsole.Error(string.Format(Localization.Track_0_lacks_index_01,
                                                              _discImage.Tracks[i].Sequence));
 
                     return ErrorNumber.InvalidArgument;
@@ -1482,30 +1482,30 @@ public sealed partial class CdrWin
             }
 
             // Print offset map
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.printing_partition_map);
+            AaruConsole.Debug(MODULE_NAME, Localization.printing_partition_map);
 
             foreach(Partition partition in Partitions)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Partition_sequence_0,    partition.Sequence);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_name_0, partition.Name);
+                AaruConsole.Debug(MODULE_NAME, Localization.Partition_sequence_0,    partition.Sequence);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_name_0, partition.Name);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t" + Localization.Partition_description_0,
                                            partition.Description);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_type_0, partition.Type);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_type_0, partition.Type);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t" + Localization.Partition_starting_sector_0,
                                            partition.Start);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_sectors_0, partition.Length);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_sectors_0, partition.Length);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t" + Localization.Partition_starting_offset_0,
                                            partition.Offset);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Partition_size_in_bytes_0, partition.Size);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Partition_size_in_bytes_0, partition.Size);
             }
 
             if(_discImage.MediaType != MediaType.CDROMXA &&
@@ -1630,10 +1630,10 @@ public sealed partial class CdrWin
 
             _imageInfo.MetadataMediaType = MetadataMediaType.OpticalDisc;
 
-            AaruConsole.VerboseWriteLine(Localization.CDRWIN_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
+            AaruConsole.Verbose(Localization.CDRWIN_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
 
             if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                AaruConsole.VerboseWriteLine(Localization.CDRWIN_comments_0, _imageInfo.Comments);
+                AaruConsole.Verbose(Localization.CDRWIN_comments_0, _imageInfo.Comments);
 
             _sectorBuilder = new SectorBuilder();
 
@@ -1650,7 +1650,7 @@ public sealed partial class CdrWin
 
             if(currentSession > 1 && leadouts.Count == 0 && !_discImage.IsRedumpGigadisc && _isCd)
             {
-                AaruConsole.ErrorWriteLine(Localization
+                AaruConsole.Error(Localization
                                               .This_image_is_missing_vital_multi_session_data_and_cannot_be_read_correctly);
 
                 return ErrorNumber.InvalidArgument;
@@ -1694,8 +1694,8 @@ public sealed partial class CdrWin
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(Localization.Exception_trying_to_identify_image_file_0, imageFilter.Filename);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Localization.Exception_trying_to_identify_image_file_0, imageFilter.Filename);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.UnexpectedException;
         }
diff --git a/Aaru.Images/CDRWin/Verify.cs b/Aaru.Images/CDRWin/Verify.cs
index f942f5b2a..0d9cf0324 100644
--- a/Aaru.Images/CDRWin/Verify.cs
+++ b/Aaru.Images/CDRWin/Verify.cs
@@ -83,8 +83,8 @@ public sealed partial class CdrWin
             }
 
             string verifySha1 = ctx.End();
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Calculated_SHA1_0, verifySha1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Expected_SHA1_0,   sha1);
+            AaruConsole.Debug(MODULE_NAME, Localization.Calculated_SHA1_0, verifySha1);
+            AaruConsole.Debug(MODULE_NAME, Localization.Expected_SHA1_0,   sha1);
 
             return verifySha1 == sha1;
         }
@@ -111,8 +111,8 @@ public sealed partial class CdrWin
             }
 
             string verifyMd5 = ctx.End();
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Calculated_MD5_0, verifyMd5);
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Expected_MD5_0,   md5);
+            AaruConsole.Debug(MODULE_NAME, Localization.Calculated_MD5_0, verifyMd5);
+            AaruConsole.Debug(MODULE_NAME, Localization.Expected_MD5_0,   md5);
 
             return verifyMd5 == md5;
         }
@@ -139,14 +139,14 @@ public sealed partial class CdrWin
             }
 
             string verifyCrc = ctx.End();
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Calculated_CRC32_0, verifyCrc);
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Expected_CRC32_0,   crc32);
+            AaruConsole.Debug(MODULE_NAME, Localization.Calculated_CRC32_0, verifyCrc);
+            AaruConsole.Debug(MODULE_NAME, Localization.Expected_CRC32_0,   crc32);
 
             return verifyCrc == crc32;
         }
 
         foreach(string hash in _discImage.DiscHashes.Keys)
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_unsupported_hash_0, hash);
+            AaruConsole.Debug(MODULE_NAME, Localization.Found_unsupported_hash_0, hash);
 
         return null;
     }
diff --git a/Aaru.Images/CDRWin/Write.cs b/Aaru.Images/CDRWin/Write.cs
index 0fe9c9a14..939eea22e 100644
--- a/Aaru.Images/CDRWin/Write.cs
+++ b/Aaru.Images/CDRWin/Write.cs
@@ -98,7 +98,7 @@ public sealed partial class CdrWin
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/CHD/Helpers.cs b/Aaru.Images/CHD/Helpers.cs
index 772932ad3..30cea50b9 100644
--- a/Aaru.Images/CHD/Helpers.cs
+++ b/Aaru.Images/CHD/Helpers.cs
@@ -80,7 +80,7 @@ public sealed partial class Chd
                     buffer = compHunk;
                 else if((Compression)_hdrCompression > Compression.Zlib)
                 {
-                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_compression_0,
+                    AaruConsole.Error(string.Format(Localization.Unsupported_compression_0,
                                                              (Compression)_hdrCompression));
 
                     return ErrorNumber.InvalidArgument;
@@ -93,7 +93,7 @@ public sealed partial class Chd
 
                     if(read != _sectorsPerHunk * _imageInfo.SectorSize)
                     {
-                        AaruConsole.ErrorWriteLine(string.Format(Localization
+                        AaruConsole.Error(string.Format(Localization
                                                                     .Unable_to_decompress_hunk_correctly_got_0_bytes_expected_1,
                                                                  read,
                                                                  _sectorsPerHunk * _imageInfo.SectorSize));
@@ -113,7 +113,7 @@ public sealed partial class Chd
                 switch((EntryFlagsV3)(entry.flags & 0x0F))
                 {
                     case EntryFlagsV3.Invalid:
-                        AaruConsole.ErrorWriteLine(Localization.Invalid_hunk_found);
+                        AaruConsole.Error(Localization.Invalid_hunk_found);
 
                         return ErrorNumber.InvalidArgument;
                     case EntryFlagsV3.Compressed:
@@ -137,7 +137,7 @@ public sealed partial class Chd
 
                                     if(read != _bytesPerHunk)
                                     {
-                                        AaruConsole.ErrorWriteLine(string.Format(Localization
+                                        AaruConsole.Error(string.Format(Localization
                                                                           .Unable_to_decompress_hunk_correctly_got_0_bytes_expected_1,
                                                                        read,
                                                                        _bytesPerHunk));
@@ -151,7 +151,7 @@ public sealed partial class Chd
                                 // TODO: Guess wth is MAME doing with these hunks
                                 else
                                 {
-                                    AaruConsole.ErrorWriteLine(Localization
+                                    AaruConsole.Error(Localization
                                                                   .Compressed_CD_GD_ROM_hunks_are_not_yet_supported);
 
                                     return ErrorNumber.NotImplemented;
@@ -159,7 +159,7 @@ public sealed partial class Chd
 
                                 break;
                             case Compression.Av:
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_compression_0,
+                                AaruConsole.Error(string.Format(Localization.Unsupported_compression_0,
                                                                          (Compression)_hdrCompression));
 
                                 return ErrorNumber.NotImplemented;
@@ -183,15 +183,15 @@ public sealed partial class Chd
                     case EntryFlagsV3.SelfHunk:
                         return GetHunk(entry.offset, out buffer);
                     case EntryFlagsV3.ParentHunk:
-                        AaruConsole.ErrorWriteLine(Localization.Parent_images_are_not_supported);
+                        AaruConsole.Error(Localization.Parent_images_are_not_supported);
 
                         return ErrorNumber.NotImplemented;
                     case EntryFlagsV3.SecondCompressed:
-                        AaruConsole.ErrorWriteLine(Localization.FLAC_is_not_supported);
+                        AaruConsole.Error(Localization.FLAC_is_not_supported);
 
                         return ErrorNumber.NotImplemented;
                     default:
-                        AaruConsole.ErrorWriteLine(string.Format(Localization.Hunk_type_0_is_not_supported,
+                        AaruConsole.Error(string.Format(Localization.Hunk_type_0_is_not_supported,
                                                                  entry.flags & 0xF));
 
                         return ErrorNumber.NotSupported;
@@ -207,14 +207,14 @@ public sealed partial class Chd
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Compressed_v5_hunks_not_yet_supported);
+                    AaruConsole.Error(Localization.Compressed_v5_hunks_not_yet_supported);
 
                     return ErrorNumber.NotSupported;
                 }
 
                 break;
             default:
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_hunk_map_version_0, _mapVersion));
+                AaruConsole.Error(string.Format(Localization.Unsupported_hunk_map_version_0, _mapVersion));
 
                 return ErrorNumber.NotSupported;
         }
diff --git a/Aaru.Images/CHD/Read.cs b/Aaru.Images/CHD/Read.cs
index b6a01f6ee..dfe369384 100644
--- a/Aaru.Images/CHD/Read.cs
+++ b/Aaru.Images/CHD/Read.cs
@@ -86,28 +86,28 @@ public sealed partial class Chd
             {
                 HeaderV1 hdrV1 = Marshal.ByteArrayToStructureBigEndian<HeaderV1>(buffer);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV1.tag));
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV1.tag));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.length = {0} bytes", hdrV1.length);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.version = {0}",      hdrV1.version);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.flags = {0}",        (Flags)hdrV1.flags);
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.length = {0} bytes", hdrV1.length);
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.version = {0}",      hdrV1.version);
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.flags = {0}",        (Flags)hdrV1.flags);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.compression = {0}", (Compression)hdrV1.compression);
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.compression = {0}", (Compression)hdrV1.compression);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.hunksize = {0}", hdrV1.hunksize);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.totalhunks = {0}", hdrV1.totalhunks);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.cylinders = {0}", hdrV1.cylinders);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.heads = {0}", hdrV1.heads);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.sectors = {0}", hdrV1.sectors);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV1.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV1.md5));
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.hunksize = {0}", hdrV1.hunksize);
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.totalhunks = {0}", hdrV1.totalhunks);
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.cylinders = {0}", hdrV1.cylinders);
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.heads = {0}", hdrV1.heads);
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.sectors = {0}", hdrV1.sectors);
+                AaruConsole.Debug(MODULE_NAME, "hdrV1.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV1.md5));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV1.parentmd5 = {0}",
                                            ArrayHelpers.ArrayIsNullOrEmpty(hdrV1.parentmd5)
                                                ? "null"
                                                : ArrayHelpers.ByteArrayToHex(hdrV1.parentmd5));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_Hunk_map);
+                AaruConsole.Debug(MODULE_NAME, Localization.Reading_Hunk_map);
 
                 hunkMapStopwatch.Restart();
                 _hunkTable = new ulong[hdrV1.totalhunks];
@@ -135,7 +135,7 @@ public sealed partial class Chd
 
                 hunkMapStopwatch.Stop();
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Took_0_seconds,
                                            hunkMapStopwatch.Elapsed.TotalSeconds);
 
@@ -163,30 +163,30 @@ public sealed partial class Chd
             {
                 HeaderV2 hdrV2 = Marshal.ByteArrayToStructureBigEndian<HeaderV2>(buffer);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV2.tag));
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV2.tag));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.length = {0} bytes", hdrV2.length);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.version = {0}",      hdrV2.version);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.flags = {0}",        (Flags)hdrV2.flags);
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.length = {0} bytes", hdrV2.length);
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.version = {0}",      hdrV2.version);
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.flags = {0}",        (Flags)hdrV2.flags);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.compression = {0}", (Compression)hdrV2.compression);
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.compression = {0}", (Compression)hdrV2.compression);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.hunksize = {0}", hdrV2.hunksize);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.totalhunks = {0}", hdrV2.totalhunks);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.cylinders = {0}", hdrV2.cylinders);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.heads = {0}", hdrV2.heads);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.sectors = {0}", hdrV2.sectors);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV2.md5));
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.hunksize = {0}", hdrV2.hunksize);
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.totalhunks = {0}", hdrV2.totalhunks);
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.cylinders = {0}", hdrV2.cylinders);
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.heads = {0}", hdrV2.heads);
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.sectors = {0}", hdrV2.sectors);
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV2.md5));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV2.parentmd5 = {0}",
                                            ArrayHelpers.ArrayIsNullOrEmpty(hdrV2.parentmd5)
                                                ? "null"
                                                : ArrayHelpers.ByteArrayToHex(hdrV2.parentmd5));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV2.seclen = {0}", hdrV2.seclen);
+                AaruConsole.Debug(MODULE_NAME, "hdrV2.seclen = {0}", hdrV2.seclen);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_Hunk_map);
+                AaruConsole.Debug(MODULE_NAME, Localization.Reading_Hunk_map);
                 hunkMapStopwatch.Restart();
 
                 _hunkTable = new ulong[hdrV2.totalhunks];
@@ -215,7 +215,7 @@ public sealed partial class Chd
 
                 hunkMapStopwatch.Stop();
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Took_0_seconds,
                                            hunkMapStopwatch.Elapsed.TotalSeconds);
 
@@ -243,36 +243,36 @@ public sealed partial class Chd
             {
                 HeaderV3 hdrV3 = Marshal.ByteArrayToStructureBigEndian<HeaderV3>(buffer);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV3.tag));
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV3.tag));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.length = {0} bytes", hdrV3.length);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.version = {0}",      hdrV3.version);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.flags = {0}",        (Flags)hdrV3.flags);
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.length = {0} bytes", hdrV3.length);
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.version = {0}",      hdrV3.version);
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.flags = {0}",        (Flags)hdrV3.flags);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.compression = {0}", (Compression)hdrV3.compression);
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.compression = {0}", (Compression)hdrV3.compression);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.totalhunks = {0}", hdrV3.totalhunks);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.logicalbytes = {0}", hdrV3.logicalbytes);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.metaoffset = {0}", hdrV3.metaoffset);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV3.md5));
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.totalhunks = {0}", hdrV3.totalhunks);
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.logicalbytes = {0}", hdrV3.logicalbytes);
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.metaoffset = {0}", hdrV3.metaoffset);
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV3.md5));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV3.parentmd5 = {0}",
                                            ArrayHelpers.ArrayIsNullOrEmpty(hdrV3.parentmd5)
                                                ? "null"
                                                : ArrayHelpers.ByteArrayToHex(hdrV3.parentmd5));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.hunkbytes = {0}", hdrV3.hunkbytes);
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.hunkbytes = {0}", hdrV3.hunkbytes);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV3.sha1 = {0}", ArrayHelpers.ByteArrayToHex(hdrV3.sha1));
+                AaruConsole.Debug(MODULE_NAME, "hdrV3.sha1 = {0}", ArrayHelpers.ByteArrayToHex(hdrV3.sha1));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV3.parentsha1 = {0}",
                                            ArrayHelpers.ArrayIsNullOrEmpty(hdrV3.parentsha1)
                                                ? "null"
                                                : ArrayHelpers.ByteArrayToHex(hdrV3.parentsha1));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_Hunk_map);
+                AaruConsole.Debug(MODULE_NAME, Localization.Reading_Hunk_map);
                 hunkMapStopwatch.Restart();
 
                 _hunkMap = new byte[hdrV3.totalhunks * 16];
@@ -280,7 +280,7 @@ public sealed partial class Chd
 
                 hunkMapStopwatch.Stop();
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Took_0_seconds,
                                            hunkMapStopwatch.Elapsed.TotalSeconds);
 
@@ -301,32 +301,32 @@ public sealed partial class Chd
             {
                 HeaderV4 hdrV4 = Marshal.ByteArrayToStructureBigEndian<HeaderV4>(buffer);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV4.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV4.tag));
+                AaruConsole.Debug(MODULE_NAME, "hdrV4.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV4.tag));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV4.length = {0} bytes", hdrV4.length);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV4.version = {0}",      hdrV4.version);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV4.flags = {0}",        (Flags)hdrV4.flags);
+                AaruConsole.Debug(MODULE_NAME, "hdrV4.length = {0} bytes", hdrV4.length);
+                AaruConsole.Debug(MODULE_NAME, "hdrV4.version = {0}",      hdrV4.version);
+                AaruConsole.Debug(MODULE_NAME, "hdrV4.flags = {0}",        (Flags)hdrV4.flags);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV4.compression = {0}", (Compression)hdrV4.compression);
+                AaruConsole.Debug(MODULE_NAME, "hdrV4.compression = {0}", (Compression)hdrV4.compression);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV4.totalhunks = {0}",   hdrV4.totalhunks);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV4.logicalbytes = {0}", hdrV4.logicalbytes);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV4.metaoffset = {0}",   hdrV4.metaoffset);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV4.hunkbytes = {0}",    hdrV4.hunkbytes);
+                AaruConsole.Debug(MODULE_NAME, "hdrV4.totalhunks = {0}",   hdrV4.totalhunks);
+                AaruConsole.Debug(MODULE_NAME, "hdrV4.logicalbytes = {0}", hdrV4.logicalbytes);
+                AaruConsole.Debug(MODULE_NAME, "hdrV4.metaoffset = {0}",   hdrV4.metaoffset);
+                AaruConsole.Debug(MODULE_NAME, "hdrV4.hunkbytes = {0}",    hdrV4.hunkbytes);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV4.sha1 = {0}", ArrayHelpers.ByteArrayToHex(hdrV4.sha1));
+                AaruConsole.Debug(MODULE_NAME, "hdrV4.sha1 = {0}", ArrayHelpers.ByteArrayToHex(hdrV4.sha1));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV4.parentsha1 = {0}",
                                            ArrayHelpers.ArrayIsNullOrEmpty(hdrV4.parentsha1)
                                                ? "null"
                                                : ArrayHelpers.ByteArrayToHex(hdrV4.parentsha1));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV4.rawsha1 = {0}",
                                            ArrayHelpers.ByteArrayToHex(hdrV4.rawsha1));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_Hunk_map);
+                AaruConsole.Debug(MODULE_NAME, Localization.Reading_Hunk_map);
                 hunkMapStopwatch.Restart();
 
                 _hunkMap = new byte[hdrV4.totalhunks * 16];
@@ -334,7 +334,7 @@ public sealed partial class Chd
 
                 hunkMapStopwatch.Stop();
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Took_0_seconds,
                                            hunkMapStopwatch.Elapsed.TotalSeconds);
 
@@ -354,55 +354,55 @@ public sealed partial class Chd
             case 5:
             {
                 // TODO: Check why reading is misaligned
-                AaruConsole.ErrorWriteLine(Localization.CHD_version_5_is_not_yet_supported);
+                AaruConsole.Error(Localization.CHD_version_5_is_not_yet_supported);
 
                 return ErrorNumber.NotImplemented;
 
                 HeaderV5 hdrV5 = Marshal.ByteArrayToStructureBigEndian<HeaderV5>(buffer);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV5.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV5.tag));
+                AaruConsole.Debug(MODULE_NAME, "hdrV5.tag = \"{0}\"", Encoding.ASCII.GetString(hdrV5.tag));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV5.length = {0} bytes", hdrV5.length);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV5.version = {0}",      hdrV5.version);
+                AaruConsole.Debug(MODULE_NAME, "hdrV5.length = {0} bytes", hdrV5.length);
+                AaruConsole.Debug(MODULE_NAME, "hdrV5.version = {0}",      hdrV5.version);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV5.compressor0 = \"{0}\"",
                                            Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(hdrV5.compressor0)));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV5.compressor1 = \"{0}\"",
                                            Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(hdrV5.compressor1)));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV5.compressor2 = \"{0}\"",
                                            Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(hdrV5.compressor2)));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV5.compressor3 = \"{0}\"",
                                            Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(hdrV5.compressor3)));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV5.logicalbytes = {0}", hdrV5.logicalbytes);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV5.mapoffset = {0}",    hdrV5.mapoffset);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV5.metaoffset = {0}",   hdrV5.metaoffset);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV5.hunkbytes = {0}",    hdrV5.hunkbytes);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV5.unitbytes = {0}",    hdrV5.unitbytes);
+                AaruConsole.Debug(MODULE_NAME, "hdrV5.logicalbytes = {0}", hdrV5.logicalbytes);
+                AaruConsole.Debug(MODULE_NAME, "hdrV5.mapoffset = {0}",    hdrV5.mapoffset);
+                AaruConsole.Debug(MODULE_NAME, "hdrV5.metaoffset = {0}",   hdrV5.metaoffset);
+                AaruConsole.Debug(MODULE_NAME, "hdrV5.hunkbytes = {0}",    hdrV5.hunkbytes);
+                AaruConsole.Debug(MODULE_NAME, "hdrV5.unitbytes = {0}",    hdrV5.unitbytes);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdrV5.sha1 = {0}", ArrayHelpers.ByteArrayToHex(hdrV5.sha1));
+                AaruConsole.Debug(MODULE_NAME, "hdrV5.sha1 = {0}", ArrayHelpers.ByteArrayToHex(hdrV5.sha1));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV5.parentsha1 = {0}",
                                            ArrayHelpers.ArrayIsNullOrEmpty(hdrV5.parentsha1)
                                                ? "null"
                                                : ArrayHelpers.ByteArrayToHex(hdrV5.parentsha1));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "hdrV5.rawsha1 = {0}",
                                            ArrayHelpers.ByteArrayToHex(hdrV5.rawsha1));
 
                 // TODO: Implement compressed CHD v5
                 if(hdrV5.compressor0 == 0)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_Hunk_map);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Reading_Hunk_map);
                     hunkMapStopwatch.Restart();
 
                     _hunkTableSmall = new uint[hdrV5.logicalbytes / hdrV5.hunkbytes];
@@ -440,13 +440,13 @@ public sealed partial class Chd
 
                     hunkMapStopwatch.Stop();
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Took_0_seconds,
                                                hunkMapStopwatch.Elapsed.TotalSeconds);
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Cannot_read_compressed_CHD_version_5);
+                    AaruConsole.Error(Localization.Cannot_read_compressed_CHD_version_5);
 
                     return ErrorNumber.NotSupported;
                 }
@@ -468,7 +468,7 @@ public sealed partial class Chd
             }
 
             default:
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_CHD_version_0, version));
+                AaruConsole.Error(string.Format(Localization.Unsupported_CHD_version_0, version));
 
                 return ErrorNumber.NotSupported;
         }
@@ -481,7 +481,7 @@ public sealed partial class Chd
             _swapAudio = false;
             _tracks    = new Dictionary<uint, Track>();
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_metadata);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_metadata);
 
             ulong currentSector = 0;
             uint  currentTrack  = 1;
@@ -495,7 +495,7 @@ public sealed partial class Chd
                 byte[]         meta   = new byte[header.flagsAndLength & 0xFFFFFF];
                 stream.EnsureRead(meta, 0, meta.Length);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Found_metadata_0_,
                                            Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(header.tag)));
 
@@ -505,7 +505,7 @@ public sealed partial class Chd
                     case HARD_DISK_METADATA:
                         if(_isCdrom || _isGdrom)
                         {
-                            AaruConsole.ErrorWriteLine(Localization
+                            AaruConsole.Error(Localization
                                                           .Image_cannot_be_a_hard_disk_and_a_CGD_ROM_at_the_same_time_aborting);
 
                             return ErrorNumber.NotSupported;
@@ -530,7 +530,7 @@ public sealed partial class Chd
                     case CDROM_OLD_METADATA:
                         if(_isHdd)
                         {
-                            AaruConsole.ErrorWriteLine(Localization
+                            AaruConsole.Error(Localization
                                                           .Image_cannot_be_a_hard_disk_and_a_CD_ROM_at_the_same_time_aborting);
 
                             return ErrorNumber.NotSupported;
@@ -538,7 +538,7 @@ public sealed partial class Chd
 
                         if(_isGdrom)
                         {
-                            AaruConsole.ErrorWriteLine(Localization
+                            AaruConsole.Error(Localization
                                                           .Image_cannot_be_a_GD_ROM_and_a_CD_ROM_at_the_same_time_aborting);
 
                             return ErrorNumber.NotSupported;
@@ -612,7 +612,7 @@ public sealed partial class Chd
                                     break;
                                 default:
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_track_type_0,
+                                    AaruConsole.Error(string.Format(Localization.Unsupported_track_type_0,
                                                                              chdTrack.type));
 
                                     return ErrorNumber.NotSupported;
@@ -639,7 +639,7 @@ public sealed partial class Chd
                                     break;
                                 default:
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_subchannel_type_0,
+                                    AaruConsole.Error(string.Format(Localization.Unsupported_subchannel_type_0,
                                                                              chdTrack.type));
 
                                     return ErrorNumber.NotSupported;
@@ -670,7 +670,7 @@ public sealed partial class Chd
                     case CDROM_TRACK_METADATA:
                         if(_isHdd)
                         {
-                            AaruConsole.ErrorWriteLine(Localization
+                            AaruConsole.Error(Localization
                                                           .Image_cannot_be_a_hard_disk_and_a_CD_ROM_at_the_same_time_aborting);
 
                             return ErrorNumber.NotSupported;
@@ -678,7 +678,7 @@ public sealed partial class Chd
 
                         if(_isGdrom)
                         {
-                            AaruConsole.ErrorWriteLine(Localization
+                            AaruConsole.Error(Localization
                                                           .Image_cannot_be_a_GD_ROM_and_a_CD_ROM_at_the_same_time_aborting);
 
                             return ErrorNumber.NotSupported;
@@ -699,7 +699,7 @@ public sealed partial class Chd
 
                             if(trackNo != currentTrack)
                             {
-                                AaruConsole.ErrorWriteLine(Localization.Unsorted_tracks_cannot_proceed);
+                                AaruConsole.Error(Localization.Unsorted_tracks_cannot_proceed);
 
                                 return ErrorNumber.NotSupported;
                             }
@@ -759,7 +759,7 @@ public sealed partial class Chd
                                     break;
                                 default:
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_track_type_0,
+                                    AaruConsole.Error(string.Format(Localization.Unsupported_track_type_0,
                                                                              tracktype));
 
                                     return ErrorNumber.NotSupported;
@@ -786,7 +786,7 @@ public sealed partial class Chd
                                     break;
                                 default:
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_subchannel_type_0,
+                                    AaruConsole.Error(string.Format(Localization.Unsupported_subchannel_type_0,
                                                                              subtype));
 
                                     return ErrorNumber.NotSupported;
@@ -816,7 +816,7 @@ public sealed partial class Chd
                     case CDROM_TRACK_METADATA2:
                         if(_isHdd)
                         {
-                            AaruConsole.ErrorWriteLine(Localization
+                            AaruConsole.Error(Localization
                                                           .Image_cannot_be_a_hard_disk_and_a_CD_ROM_at_the_same_time_aborting);
 
                             return ErrorNumber.NotSupported;
@@ -824,7 +824,7 @@ public sealed partial class Chd
 
                         if(_isGdrom)
                         {
-                            AaruConsole.ErrorWriteLine(Localization
+                            AaruConsole.Error(Localization
                                                           .Image_cannot_be_a_GD_ROM_and_a_CD_ROM_at_the_same_time_aborting);
 
                             return ErrorNumber.NotSupported;
@@ -859,7 +859,7 @@ public sealed partial class Chd
 
                             if(trackNo != currentTrack)
                             {
-                                AaruConsole.ErrorWriteLine(Localization.Unsorted_tracks_cannot_proceed);
+                                AaruConsole.Error(Localization.Unsorted_tracks_cannot_proceed);
 
                                 return ErrorNumber.NotSupported;
                             }
@@ -919,7 +919,7 @@ public sealed partial class Chd
                                     break;
                                 default:
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_track_type_0,
+                                    AaruConsole.Error(string.Format(Localization.Unsupported_track_type_0,
                                                                              trackType));
 
                                     return ErrorNumber.NotSupported;
@@ -946,7 +946,7 @@ public sealed partial class Chd
                                     break;
                                 default:
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_subchannel_type_0,
+                                    AaruConsole.Error(string.Format(Localization.Unsupported_subchannel_type_0,
                                                                              subtype));
 
                                     return ErrorNumber.NotSupported;
@@ -1002,7 +1002,7 @@ public sealed partial class Chd
                     case GDROM_METADATA:
                         if(_isHdd)
                         {
-                            AaruConsole.ErrorWriteLine(Localization
+                            AaruConsole.Error(Localization
                                                           .Image_cannot_be_a_hard_disk_and_a_GD_ROM_at_the_same_time_aborting);
 
                             return ErrorNumber.NotSupported;
@@ -1010,7 +1010,7 @@ public sealed partial class Chd
 
                         if(_isCdrom)
                         {
-                            AaruConsole.ErrorWriteLine(Localization
+                            AaruConsole.Error(Localization
                                                           .Image_cannot_be_a_CD_ROM_and_a_GD_ROM_at_the_same_time_aborting);
 
                             return ErrorNumber.NotSupported;
@@ -1038,7 +1038,7 @@ public sealed partial class Chd
 
                             if(trackNo != currentTrack)
                             {
-                                AaruConsole.ErrorWriteLine(Localization.Unsorted_tracks_cannot_proceed);
+                                AaruConsole.Error(Localization.Unsorted_tracks_cannot_proceed);
 
                                 return ErrorNumber.NotSupported;
                             }
@@ -1098,7 +1098,7 @@ public sealed partial class Chd
                                     break;
                                 default:
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_track_type_0,
+                                    AaruConsole.Error(string.Format(Localization.Unsupported_track_type_0,
                                                                              trackType));
 
                                     return ErrorNumber.NotSupported;
@@ -1125,7 +1125,7 @@ public sealed partial class Chd
                                     break;
                                 default:
                                 {
-                                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_subchannel_type_0,
+                                    AaruConsole.Error(string.Format(Localization.Unsupported_subchannel_type_0,
                                                                              subtype));
 
                                     return ErrorNumber.NotSupported;
@@ -1245,7 +1245,7 @@ public sealed partial class Chd
             }
             else
             {
-                AaruConsole.ErrorWriteLine(Localization.Image_does_not_represent_a_known_media_aborting);
+                AaruConsole.Error(Localization.Image_does_not_represent_a_known_media_aborting);
 
                 return ErrorNumber.NotSupported;
             }
diff --git a/Aaru.Images/CPCDSK/Identify.cs b/Aaru.Images/CPCDSK/Identify.cs
index 2c41a664d..9fb2ed989 100644
--- a/Aaru.Images/CPCDSK/Identify.cs
+++ b/Aaru.Images/CPCDSK/Identify.cs
@@ -65,7 +65,7 @@ public sealed partial class Cpcdsk
 
         string magic = Encoding.ASCII.GetString(headerB, 0, pos);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.magic_equals_0_quoted, magic);
+        AaruConsole.Debug(MODULE_NAME, Localization.magic_equals_0_quoted, magic);
 
         return string.Compare(CPCDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) == 0 ||
                string.Compare(EDSK_ID,   magic, StringComparison.InvariantCultureIgnoreCase) == 0 ||
diff --git a/Aaru.Images/CPCDSK/Read.cs b/Aaru.Images/CPCDSK/Read.cs
index 92639f7a3..b0779e3bc 100644
--- a/Aaru.Images/CPCDSK/Read.cs
+++ b/Aaru.Images/CPCDSK/Read.cs
@@ -82,26 +82,26 @@ public sealed partial class Cpcdsk
             return ErrorNumber.InvalidArgument;
 
         _extended = string.Compare(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) == 0;
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Extended_equals_0, _extended);
+        AaruConsole.Debug(MODULE_NAME, Localization.Extended_equals_0, _extended);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.magic_equals_0_quoted, magic);
+        AaruConsole.Debug(MODULE_NAME, Localization.magic_equals_0_quoted, magic);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.magic = \"{0}\"", StringHandlers.CToString(header.magic));
+        AaruConsole.Debug(MODULE_NAME, "header.magic = \"{0}\"", StringHandlers.CToString(header.magic));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.creator = \"{0}\"", StringHandlers.CToString(header.creator));
+        AaruConsole.Debug(MODULE_NAME, "header.creator = \"{0}\"", StringHandlers.CToString(header.creator));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.tracks = {0}", header.tracks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sides = {0}",  header.sides);
+        AaruConsole.Debug(MODULE_NAME, "header.tracks = {0}", header.tracks);
+        AaruConsole.Debug(MODULE_NAME, "header.sides = {0}",  header.sides);
 
         if(!_extended)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "header.tracksize = {0}", header.tracksize);
+            AaruConsole.Debug(MODULE_NAME, "header.tracksize = {0}", header.tracksize);
         else
         {
             for(int i = 0; i < header.tracks; i++)
             {
                 for(int j = 0; j < header.sides; j++)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Track_0_Side_1_size_equals_2,
                                                i,
                                                j,
@@ -138,42 +138,42 @@ public sealed partial class Cpcdsk
                                   StringComparison.InvariantCultureIgnoreCase) !=
                    0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Not_the_expected_track_info);
+                    AaruConsole.Error(Localization.Not_the_expected_track_info);
 
                     return ErrorNumber.InvalidArgument;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "trackInfo[{1}:{2}].magic = \"{0}\"",
                                            StringHandlers.CToString(trackInfo.magic),
                                            i,
                                            j);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "trackInfo[{1}:{2}].bps = {0}",
                                            SizeCodeToBytes(trackInfo.bps),
                                            i,
                                            j);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trackInfo[{1}:{2}].dataRate = {0}", trackInfo.dataRate, i, j);
+                AaruConsole.Debug(MODULE_NAME, "trackInfo[{1}:{2}].dataRate = {0}", trackInfo.dataRate, i, j);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trackInfo[{1}:{2}].filler = 0x{0:X2}", trackInfo.filler, i, j);
+                AaruConsole.Debug(MODULE_NAME, "trackInfo[{1}:{2}].filler = 0x{0:X2}", trackInfo.filler, i, j);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trackInfo[{1}:{2}].gap3 = 0x{0:X2}", trackInfo.gap3, i, j);
+                AaruConsole.Debug(MODULE_NAME, "trackInfo[{1}:{2}].gap3 = 0x{0:X2}", trackInfo.gap3, i, j);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trackInfo[{1}:{2}].padding = {0}", trackInfo.padding, i, j);
+                AaruConsole.Debug(MODULE_NAME, "trackInfo[{1}:{2}].padding = {0}", trackInfo.padding, i, j);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "trackInfo[{1}:{2}].recordingMode = {0}",
                                            trackInfo.recordingMode,
                                            i,
                                            j);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trackInfo[{1}:{2}].sectors = {0}", trackInfo.sectors, i, j);
+                AaruConsole.Debug(MODULE_NAME, "trackInfo[{1}:{2}].sectors = {0}", trackInfo.sectors, i, j);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trackInfo[{1}:{2}].side = {0}", trackInfo.side, i, j);
+                AaruConsole.Debug(MODULE_NAME, "trackInfo[{1}:{2}].side = {0}", trackInfo.side, i, j);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trackInfo[{1}:{2}].track = {0}", trackInfo.track, i, j);
+                AaruConsole.Debug(MODULE_NAME, "trackInfo[{1}:{2}].track = {0}", trackInfo.track, i, j);
 
                 if(trackInfo.sectors != sectorsPerTrack)
                 {
@@ -188,49 +188,49 @@ public sealed partial class Cpcdsk
 
                 for(int k = 1; k <= trackInfo.sectors; k++)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "trackInfo[{1}:{2}].sector[{3}].id = 0x{0:X2}",
                                                trackInfo.sectorsInfo[k - 1].id,
                                                i,
                                                j,
                                                k);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "trackInfo[{1}:{2}].sector[{3}].len = {0}",
                                                trackInfo.sectorsInfo[k - 1].len,
                                                i,
                                                j,
                                                k);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "trackInfo[{1}:{2}].sector[{3}].side = {0}",
                                                trackInfo.sectorsInfo[k - 1].side,
                                                i,
                                                j,
                                                k);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "trackInfo[{1}:{2}].sector[{3}].size = {0}",
                                                SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size),
                                                i,
                                                j,
                                                k);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "trackInfo[{1}:{2}].sector[{3}].st1 = 0x{0:X2}",
                                                trackInfo.sectorsInfo[k - 1].st1,
                                                i,
                                                j,
                                                k);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "trackInfo[{1}:{2}].sector[{3}].st2 = 0x{0:X2}",
                                                trackInfo.sectorsInfo[k - 1].st2,
                                                i,
                                                j,
                                                k);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "trackInfo[{1}:{2}].sector[{3}].track = {0}",
                                                trackInfo.sectorsInfo[k - 1].track,
                                                i,
@@ -304,9 +304,9 @@ public sealed partial class Cpcdsk
             }
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Read_0_sectors,             _sectors.Count);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Read_0_tracks,              readtracks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.All_tracks_are_same_size_0, allTracksSameSize);
+        AaruConsole.Debug(MODULE_NAME, Localization.Read_0_sectors,             _sectors.Count);
+        AaruConsole.Debug(MODULE_NAME, Localization.Read_0_tracks,              readtracks);
+        AaruConsole.Debug(MODULE_NAME, Localization.All_tracks_are_same_size_0, allTracksSameSize);
 
         _imageInfo.Application          = StringHandlers.CToString(header.creator);
         _imageInfo.CreationTime         = imageFilter.CreationTime;
diff --git a/Aaru.Images/CisCopy/Read.cs b/Aaru.Images/CisCopy/Read.cs
index 15ed38787..52b7ecc38 100644
--- a/Aaru.Images/CisCopy/Read.cs
+++ b/Aaru.Images/CisCopy/Read.cs
@@ -69,7 +69,7 @@ public sealed partial class CisCopy
 
                 break;
             default:
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Incorrect_disk_type_0, (byte)type));
+                AaruConsole.Error(string.Format(Localization.Incorrect_disk_type_0, (byte)type));
 
                 return ErrorNumber.InvalidArgument;
         }
@@ -81,7 +81,7 @@ public sealed partial class CisCopy
 
         if(cmpr != Compression.None)
         {
-            AaruConsole.ErrorWriteLine(Localization.Compressed_images_are_not_supported);
+            AaruConsole.Error(Localization.Compressed_images_are_not_supported);
 
             return ErrorNumber.NotImplemented;
         }
@@ -184,7 +184,7 @@ public sealed partial class CisCopy
 
         decodedImage.Close();
 
-        AaruConsole.VerboseWriteLine(Localization.CisCopy_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.CisCopy_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
 
         return ErrorNumber.NoError;
     }
diff --git a/Aaru.Images/CisCopy/Write.cs b/Aaru.Images/CisCopy/Write.cs
index f7a50fa18..df560c7b3 100644
--- a/Aaru.Images/CisCopy/Write.cs
+++ b/Aaru.Images/CisCopy/Write.cs
@@ -77,7 +77,7 @@ public sealed partial class CisCopy
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/CloneCD/Identify.cs b/Aaru.Images/CloneCD/Identify.cs
index 6323b67a7..47a2995e9 100644
--- a/Aaru.Images/CloneCD/Identify.cs
+++ b/Aaru.Images/CloneCD/Identify.cs
@@ -87,8 +87,8 @@ public sealed partial class CloneCd
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(Localization.Exception_trying_to_identify_image_file_0, _ccdFilter);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Localization.Exception_trying_to_identify_image_file_0, _ccdFilter);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/CloneCD/Read.cs b/Aaru.Images/CloneCD/Read.cs
index 243de99bb..74ba76858 100644
--- a/Aaru.Images/CloneCD/Read.cs
+++ b/Aaru.Images/CloneCD/Read.cs
@@ -130,7 +130,7 @@ public sealed partial class CloneCd
                 {
                     if(inDisk || inSession || inEntry || inTrack || inCdText)
                     {
-                        AaruConsole.ErrorWriteLine(string.Format(Localization.Found_CloneCD_out_of_order_in_line_0,
+                        AaruConsole.Error(string.Format(Localization.Found_CloneCD_out_of_order_in_line_0,
                                                                  lineNumber));
 
                         return ErrorNumber.InvalidArgument;
@@ -172,13 +172,13 @@ public sealed partial class CloneCd
 
                         if(!ccdVerMatch.Success) continue;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Version_at_line_0, lineNumber);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_Version_at_line_0, lineNumber);
 
                         _imageInfo.Version = ccdVerMatch.Groups["value"].Value;
 
                         if(_imageInfo.Version != "2" && _imageInfo.Version != "3")
                         {
-                            AaruConsole.ErrorWriteLine(Localization
+                            AaruConsole.Error(Localization
                                                           .CloneCD_plugin_Warning_Unknown_CCD_image_version_0_may_not_work,
                                                        _imageInfo.Version);
                         }
@@ -193,15 +193,15 @@ public sealed partial class CloneCd
 
                         if(discEntMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Found_TocEntries_at_line_0,
                                                        lineNumber);
                         }
                         else if(discSessMatch.Success)
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Sessions_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_Sessions_at_line_0, lineNumber);
                         else if(discScrMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Found_DataTracksScrambled_at_line_0,
                                                        lineNumber);
 
@@ -209,13 +209,13 @@ public sealed partial class CloneCd
                         }
                         else if(cdtLenMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Found_CDTextLength_at_line_0,
                                                        lineNumber);
                         }
                         else if(discCatMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Found_Catalog_at_line_0_smallcase,
                                                        lineNumber);
 
@@ -231,13 +231,13 @@ public sealed partial class CloneCd
 
                         if(cdtEntsMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Found_CD_Text_Entries_at_line_0,
                                                        lineNumber);
                         }
                         else if(cdtEntMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Found_CD_Text_Entry_at_line_0,
                                                        lineNumber);
 
@@ -260,13 +260,13 @@ public sealed partial class CloneCd
 
                         if(sessPregMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Found_PreGapMode_at_line_0,
                                                        lineNumber);
                         }
                         else if(sessSubcMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Found_PreGapSubC_at_line_0,
                                                        lineNumber);
                         }
@@ -290,7 +290,7 @@ public sealed partial class CloneCd
 
                         if(entSessMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Session_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_Session_at_line_0, lineNumber);
 
                             currentEntry.SessionNumber = Convert.ToByte(entSessMatch.Groups["value"].Value, 10);
 
@@ -300,70 +300,70 @@ public sealed partial class CloneCd
                         }
                         else if(entPointMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Point_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_Point_at_line_0, lineNumber);
 
                             currentEntry.POINT = Convert.ToByte(entPointMatch.Groups["value"].Value, 16);
                         }
                         else if(entAdrMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_ADR_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_ADR_at_line_0, lineNumber);
                             currentEntry.ADR = Convert.ToByte(entAdrMatch.Groups["value"].Value, 16);
                         }
                         else if(entCtrlMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Control_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_Control_at_line_0, lineNumber);
 
                             currentEntry.CONTROL = Convert.ToByte(entCtrlMatch.Groups["value"].Value, 16);
                         }
                         else if(entTnoMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_TrackNo_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_TrackNo_at_line_0, lineNumber);
 
                             currentEntry.TNO = Convert.ToByte(entTnoMatch.Groups["value"].Value, 10);
                         }
                         else if(entAMinMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_AMin_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_AMin_at_line_0, lineNumber);
                             currentEntry.Min = Convert.ToByte(entAMinMatch.Groups["value"].Value, 10);
                         }
                         else if(entASecMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_ASec_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_ASec_at_line_0, lineNumber);
                             currentEntry.Sec = Convert.ToByte(entASecMatch.Groups["value"].Value, 10);
                         }
                         else if(entAFrameMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_AFrame_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_AFrame_at_line_0, lineNumber);
 
                             currentEntry.Frame = Convert.ToByte(entAFrameMatch.Groups["value"].Value, 10);
                         }
                         else if(entAlbaMatch.Success)
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_ALBA_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_ALBA_at_line_0, lineNumber);
                         else if(entZeroMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_Zero_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_Zero_at_line_0, lineNumber);
                             currentEntry.Zero  = Convert.ToByte(entZeroMatch.Groups["value"].Value, 10);
                             currentEntry.HOUR  = (byte)((currentEntry.Zero & 0xF0) >> 4);
                             currentEntry.PHOUR = (byte)(currentEntry.Zero & 0x0F);
                         }
                         else if(entPMinMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PMin_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_PMin_at_line_0, lineNumber);
                             currentEntry.PMIN = Convert.ToByte(entPMinMatch.Groups["value"].Value, 10);
                         }
                         else if(entPSecMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PSec_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_PSec_at_line_0, lineNumber);
                             currentEntry.PSEC = Convert.ToByte(entPSecMatch.Groups["value"].Value, 10);
                         }
                         else if(entPFrameMatch.Success)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PFrame_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_PFrame_at_line_0, lineNumber);
 
                             currentEntry.PFRAME = Convert.ToByte(entPFrameMatch.Groups["value"].Value, 10);
                         }
                         else if(entPlbaMatch.Success)
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PLBA_at_line_0, lineNumber);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_PLBA_at_line_0, lineNumber);
                     }
                     else if(inTrack)
                     {
@@ -390,7 +390,7 @@ public sealed partial class CloneCd
 
             if(entries.Count == 0)
             {
-                AaruConsole.ErrorWriteLine(Localization.Did_not_find_any_track);
+                AaruConsole.Error(Localization.Did_not_find_any_track);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -429,7 +429,7 @@ public sealed partial class CloneCd
 
             if(_dataFilter == null)
             {
-                AaruConsole.ErrorWriteLine(Localization.Cannot_open_data_file);
+                AaruConsole.Error(Localization.Cannot_open_data_file);
 
                 return ErrorNumber.NoSuchFile;
             }
@@ -471,7 +471,7 @@ public sealed partial class CloneCd
                         {
                             case 0xA0:
                                 byte discType = descriptor.PSEC;
-                                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_Type_0, discType);
+                                AaruConsole.Debug(MODULE_NAME, Localization.Disc_Type_0, discType);
 
                                 break;
                             case 0xA2:
@@ -566,7 +566,7 @@ public sealed partial class CloneCd
 
                                     if(_imageInfo.MediaManufacturer != "")
                                     {
-                                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                                        AaruConsole.Debug(MODULE_NAME,
                                                                    Localization.Disc_manufactured_by_0,
                                                                    _imageInfo.MediaManufacturer);
                                     }
@@ -579,7 +579,7 @@ public sealed partial class CloneCd
                     case 6:
                     {
                         uint id = (uint)((descriptor.Min << 16) + (descriptor.Sec << 8) + descriptor.Frame);
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_ID_0_X6, id & 0x00FFFFFF);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Disc_ID_0_X6, id & 0x00FFFFFF);
                         _imageInfo.MediaSerialNumber = $"{id                                  & 0x00FFFFFF:X6}";
 
                         break;
@@ -896,8 +896,8 @@ public sealed partial class CloneCd
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(Localization.Exception_trying_to_identify_image_file_0, imageFilter.Filename);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Localization.Exception_trying_to_identify_image_file_0, imageFilter.Filename);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.UnexpectedException;
         }
diff --git a/Aaru.Images/CloneCD/Write.cs b/Aaru.Images/CloneCD/Write.cs
index d6f5570f2..4f4392052 100644
--- a/Aaru.Images/CloneCD/Write.cs
+++ b/Aaru.Images/CloneCD/Write.cs
@@ -83,7 +83,7 @@ public sealed partial class CloneCd
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
@@ -484,7 +484,7 @@ public sealed partial class CloneCd
                         ErrorMessage = string.Format(Localization.Could_not_create_subchannel_file_exception_0,
                                                      ex.Message);
 
-                        AaruConsole.WriteException(ex);
+                        AaruConsole.Exception(ex);
 
                         return false;
                     }
@@ -560,7 +560,7 @@ public sealed partial class CloneCd
                         ErrorMessage = string.Format(Localization.Could_not_create_subchannel_file_exception_0,
                                                      ex.Message);
 
-                        AaruConsole.WriteException(ex);
+                        AaruConsole.Exception(ex);
 
                         return false;
                     }
diff --git a/Aaru.Images/CopyQM/Read.cs b/Aaru.Images/CopyQM/Read.cs
index 3d113abe9..e7fc45091 100644
--- a/Aaru.Images/CopyQM/Read.cs
+++ b/Aaru.Images/CopyQM/Read.cs
@@ -55,35 +55,35 @@ public sealed partial class CopyQm
         stream.EnsureRead(hdr, 0, 133);
         _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.magic = 0x{0:X4}",       _header.magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.mark = 0x{0:X2}",        _header.mark);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectorSize = {0}",       _header.sectorSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectorPerCluster = {0}", _header.sectorPerCluster);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.reservedSectors = {0}",  _header.reservedSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.fatCopy = {0}",          _header.fatCopy);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.rootEntries = {0}",      _header.rootEntries);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectors = {0}",          _header.sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.mediaType = 0x{0:X2}",   _header.mediaType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectorsPerFat = {0}",    _header.sectorsPerFat);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectorsPerTrack = {0}",  _header.sectorsPerTrack);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.heads = {0}",            _header.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.hidden = {0}",           _header.hidden);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectorsBig = {0}",       _header.sectorsBig);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.description = {0}",      _header.description);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.blind = {0}",            _header.blind);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.density = {0}",          _header.density);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.imageCylinders = {0}",   _header.imageCylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.totalCylinders = {0}",   _header.totalCylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.crc = 0x{0:X8}",         _header.crc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.volumeLabel = {0}",      _header.volumeLabel);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.time = 0x{0:X4}",        _header.time);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.date = 0x{0:X4}",        _header.date);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.commentLength = {0}",    _header.commentLength);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.secbs = {0}",            _header.secbs);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.unknown = 0x{0:X4}",     _header.unknown);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.interleave = {0}",       _header.interleave);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.skew = {0}",             _header.skew);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.drive = {0}",            _header.drive);
+        AaruConsole.Debug(MODULE_NAME, "header.magic = 0x{0:X4}",       _header.magic);
+        AaruConsole.Debug(MODULE_NAME, "header.mark = 0x{0:X2}",        _header.mark);
+        AaruConsole.Debug(MODULE_NAME, "header.sectorSize = {0}",       _header.sectorSize);
+        AaruConsole.Debug(MODULE_NAME, "header.sectorPerCluster = {0}", _header.sectorPerCluster);
+        AaruConsole.Debug(MODULE_NAME, "header.reservedSectors = {0}",  _header.reservedSectors);
+        AaruConsole.Debug(MODULE_NAME, "header.fatCopy = {0}",          _header.fatCopy);
+        AaruConsole.Debug(MODULE_NAME, "header.rootEntries = {0}",      _header.rootEntries);
+        AaruConsole.Debug(MODULE_NAME, "header.sectors = {0}",          _header.sectors);
+        AaruConsole.Debug(MODULE_NAME, "header.mediaType = 0x{0:X2}",   _header.mediaType);
+        AaruConsole.Debug(MODULE_NAME, "header.sectorsPerFat = {0}",    _header.sectorsPerFat);
+        AaruConsole.Debug(MODULE_NAME, "header.sectorsPerTrack = {0}",  _header.sectorsPerTrack);
+        AaruConsole.Debug(MODULE_NAME, "header.heads = {0}",            _header.heads);
+        AaruConsole.Debug(MODULE_NAME, "header.hidden = {0}",           _header.hidden);
+        AaruConsole.Debug(MODULE_NAME, "header.sectorsBig = {0}",       _header.sectorsBig);
+        AaruConsole.Debug(MODULE_NAME, "header.description = {0}",      _header.description);
+        AaruConsole.Debug(MODULE_NAME, "header.blind = {0}",            _header.blind);
+        AaruConsole.Debug(MODULE_NAME, "header.density = {0}",          _header.density);
+        AaruConsole.Debug(MODULE_NAME, "header.imageCylinders = {0}",   _header.imageCylinders);
+        AaruConsole.Debug(MODULE_NAME, "header.totalCylinders = {0}",   _header.totalCylinders);
+        AaruConsole.Debug(MODULE_NAME, "header.crc = 0x{0:X8}",         _header.crc);
+        AaruConsole.Debug(MODULE_NAME, "header.volumeLabel = {0}",      _header.volumeLabel);
+        AaruConsole.Debug(MODULE_NAME, "header.time = 0x{0:X4}",        _header.time);
+        AaruConsole.Debug(MODULE_NAME, "header.date = 0x{0:X4}",        _header.date);
+        AaruConsole.Debug(MODULE_NAME, "header.commentLength = {0}",    _header.commentLength);
+        AaruConsole.Debug(MODULE_NAME, "header.secbs = {0}",            _header.secbs);
+        AaruConsole.Debug(MODULE_NAME, "header.unknown = 0x{0:X4}",     _header.unknown);
+        AaruConsole.Debug(MODULE_NAME, "header.interleave = {0}",       _header.interleave);
+        AaruConsole.Debug(MODULE_NAME, "header.skew = {0}",             _header.skew);
+        AaruConsole.Debug(MODULE_NAME, "header.drive = {0}",            _header.drive);
 
         byte[] cmt = new byte[_header.commentLength];
         stream.EnsureRead(cmt, 0, _header.commentLength);
@@ -150,12 +150,12 @@ public sealed partial class CopyQm
 
         _headerChecksumOk = (-1 * sum & 0xFF) == _header.headerChecksum;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Calculated_header_checksum_equals_0_X2_1,
                                    -1 * sum & 0xFF,
                                    _headerChecksumOk);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Calculated_data_CRC_equals_0_X8_1,
                                    _calculatedDataCrc,
                                    _calculatedDataCrc == _header.crc);
@@ -193,10 +193,10 @@ public sealed partial class CopyQm
 
         _decodedImage.Close();
 
-        AaruConsole.VerboseWriteLine(Localization.CopyQM_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.CopyQM_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
 
         if(!string.IsNullOrEmpty(_imageInfo.Comments))
-            AaruConsole.VerboseWriteLine(Localization.CopyQM_comments_0, _imageInfo.Comments);
+            AaruConsole.Verbose(Localization.CopyQM_comments_0, _imageInfo.Comments);
 
         _imageInfo.Heads           = _header.heads;
         _imageInfo.Cylinders       = _header.totalCylinders;
diff --git a/Aaru.Images/CopyTape/Read.cs b/Aaru.Images/CopyTape/Read.cs
index b7bafc13b..ced36745c 100644
--- a/Aaru.Images/CopyTape/Read.cs
+++ b/Aaru.Images/CopyTape/Read.cs
@@ -99,7 +99,7 @@ public sealed partial class CopyTape
 
             if(!partialBlockMt.Success)
             {
-                AaruConsole.ErrorWriteLine(Localization.Found_unhandled_header_cannot_open);
+                AaruConsole.Error(Localization.Found_unhandled_header_cannot_open);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -118,7 +118,7 @@ public sealed partial class CopyTape
 
             if(!blockMt.Success)
             {
-                AaruConsole.ErrorWriteLine(Localization.Cannot_decode_block_header_cannot_open);
+                AaruConsole.Error(Localization.Cannot_decode_block_header_cannot_open);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -127,21 +127,21 @@ public sealed partial class CopyTape
 
             if(string.IsNullOrWhiteSpace(blkSize))
             {
-                AaruConsole.ErrorWriteLine(Localization.Cannot_decode_block_header_cannot_open);
+                AaruConsole.Error(Localization.Cannot_decode_block_header_cannot_open);
 
                 return ErrorNumber.InvalidArgument;
             }
 
             if(!uint.TryParse(blkSize, out uint blockSize))
             {
-                AaruConsole.ErrorWriteLine(Localization.Cannot_decode_block_header_cannot_open);
+                AaruConsole.Error(Localization.Cannot_decode_block_header_cannot_open);
 
                 return ErrorNumber.InvalidArgument;
             }
 
             if(blockSize == 0 || blockSize + 17 > imageFilter.DataForkLength)
             {
-                AaruConsole.ErrorWriteLine(Localization.Cannot_decode_block_header_cannot_open);
+                AaruConsole.Error(Localization.Cannot_decode_block_header_cannot_open);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -152,7 +152,7 @@ public sealed partial class CopyTape
 
             if(newLine != 0x0A)
             {
-                AaruConsole.ErrorWriteLine(Localization.Cannot_decode_block_header_cannot_open);
+                AaruConsole.Error(Localization.Cannot_decode_block_header_cannot_open);
 
                 return ErrorNumber.InvalidArgument;
             }
diff --git a/Aaru.Images/CopyTape/Write.cs b/Aaru.Images/CopyTape/Write.cs
index 92d8642ee..c9634db59 100644
--- a/Aaru.Images/CopyTape/Write.cs
+++ b/Aaru.Images/CopyTape/Write.cs
@@ -77,7 +77,7 @@ public sealed partial class CopyTape
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/D88/Identify.cs b/Aaru.Images/D88/Identify.cs
index af9f81439..006434246 100644
--- a/Aaru.Images/D88/Identify.cs
+++ b/Aaru.Images/D88/Identify.cs
@@ -59,17 +59,17 @@ public sealed partial class D88
 
         Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "d88hdr.name = \"{0}\"", StringHandlers.CToString(hdr.name, shiftjis));
+        AaruConsole.Debug(MODULE_NAME, "d88hdr.name = \"{0}\"", StringHandlers.CToString(hdr.name, shiftjis));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "d88hdr.reserved is empty? = {0}",
                                    hdr.reserved.SequenceEqual(_reservedEmpty));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "d88hdr.write_protect = 0x{0:X2}", hdr.write_protect);
+        AaruConsole.Debug(MODULE_NAME, "d88hdr.write_protect = 0x{0:X2}", hdr.write_protect);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "d88hdr.disk_type = {0} ({1})", hdr.disk_type, (byte)hdr.disk_type);
+        AaruConsole.Debug(MODULE_NAME, "d88hdr.disk_type = {0} ({1})", hdr.disk_type, (byte)hdr.disk_type);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "d88hdr.disk_size = {0}", hdr.disk_size);
+        AaruConsole.Debug(MODULE_NAME, "d88hdr.disk_size = {0}", hdr.disk_size);
 
         if(hdr.disk_size != stream.Length) return false;
 
@@ -86,7 +86,7 @@ public sealed partial class D88
             if(t < 0 || t > stream.Length) return false;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization._0_tracks, counter);
+        AaruConsole.Debug(MODULE_NAME, Localization._0_tracks, counter);
 
         return counter > 0;
     }
diff --git a/Aaru.Images/D88/Read.cs b/Aaru.Images/D88/Read.cs
index db3befce7..52370d1d1 100644
--- a/Aaru.Images/D88/Read.cs
+++ b/Aaru.Images/D88/Read.cs
@@ -62,17 +62,17 @@ public sealed partial class D88
         stream.EnsureRead(hdrB, 0, hdrB.Length);
         Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "d88hdr.name = \"{0}\"", StringHandlers.CToString(hdr.name, shiftjis));
+        AaruConsole.Debug(MODULE_NAME, "d88hdr.name = \"{0}\"", StringHandlers.CToString(hdr.name, shiftjis));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "d88hdr.reserved is empty? = {0}",
                                    hdr.reserved.SequenceEqual(_reservedEmpty));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "d88hdr.write_protect = 0x{0:X2}", hdr.write_protect);
+        AaruConsole.Debug(MODULE_NAME, "d88hdr.write_protect = 0x{0:X2}", hdr.write_protect);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "d88hdr.disk_type = {0} ({1})", hdr.disk_type, (byte)hdr.disk_type);
+        AaruConsole.Debug(MODULE_NAME, "d88hdr.disk_type = {0} ({1})", hdr.disk_type, (byte)hdr.disk_type);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "d88hdr.disk_size = {0}", hdr.disk_size);
+        AaruConsole.Debug(MODULE_NAME, "d88hdr.disk_size = {0}", hdr.disk_size);
 
         if(hdr.disk_size != stream.Length) return ErrorNumber.InvalidArgument;
 
@@ -90,7 +90,7 @@ public sealed partial class D88
             if(t < 0 || t > stream.Length) return ErrorNumber.InvalidArgument;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization._0_tracks, trkCounter);
+        AaruConsole.Debug(MODULE_NAME, Localization._0_tracks, trkCounter);
 
         if(trkCounter == 0) return ErrorNumber.InvalidArgument;
 
@@ -100,15 +100,15 @@ public sealed partial class D88
 
         SectorHeader sechdr = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(hdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.c = {0}",            sechdr.c);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.h = {0}",            sechdr.h);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.r = {0}",            sechdr.r);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.n = {0}",            sechdr.n);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.spt = {0}",          sechdr.spt);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.density = {0}",      sechdr.density);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.deleted_mark = {0}", sechdr.deleted_mark);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.status = {0}",       sechdr.status);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.size_of_data = {0}", sechdr.size_of_data);
+        AaruConsole.Debug(MODULE_NAME, "sechdr.c = {0}",            sechdr.c);
+        AaruConsole.Debug(MODULE_NAME, "sechdr.h = {0}",            sechdr.h);
+        AaruConsole.Debug(MODULE_NAME, "sechdr.r = {0}",            sechdr.r);
+        AaruConsole.Debug(MODULE_NAME, "sechdr.n = {0}",            sechdr.n);
+        AaruConsole.Debug(MODULE_NAME, "sechdr.spt = {0}",          sechdr.spt);
+        AaruConsole.Debug(MODULE_NAME, "sechdr.density = {0}",      sechdr.density);
+        AaruConsole.Debug(MODULE_NAME, "sechdr.deleted_mark = {0}", sechdr.deleted_mark);
+        AaruConsole.Debug(MODULE_NAME, "sechdr.status = {0}",       sechdr.status);
+        AaruConsole.Debug(MODULE_NAME, "sechdr.size_of_data = {0}", sechdr.size_of_data);
 
         short             spt      = sechdr.spt;
         IBMSectorSizeCode bps      = sechdr.n;
@@ -125,7 +125,7 @@ public sealed partial class D88
 
             if(sechdr.spt != spt || sechdr.n != bps)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Disk_tracks_are_not_same_size,
                                            sechdr.spt,
                                            spt,
@@ -151,7 +151,7 @@ public sealed partial class D88
 
                 if(sechdr.spt == spt && sechdr.n == bps) continue;
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Disk_tracks_are_not_same_size,
                                            sechdr.spt,
                                            spt,
@@ -171,7 +171,7 @@ public sealed partial class D88
             foreach(KeyValuePair<byte, byte[]> kvp in sectors) _sectorsData.Add(kvp.Value);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization._0_sectors, _sectorsData.Count);
+        AaruConsole.Debug(MODULE_NAME, Localization._0_sectors, _sectorsData.Count);
 
         _imageInfo.MediaType = MediaType.Unknown;
 
@@ -240,7 +240,7 @@ public sealed partial class D88
             }
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.MediaType_0, _imageInfo.MediaType);
+        AaruConsole.Debug(MODULE_NAME, Localization.MediaType_0, _imageInfo.MediaType);
 
         _imageInfo.ImageSize            = (ulong)hdr.disk_size;
         _imageInfo.CreationTime         = imageFilter.CreationTime;
diff --git a/Aaru.Images/DART/Read.cs b/Aaru.Images/DART/Read.cs
index 383f17d44..f011a82c0 100644
--- a/Aaru.Images/DART/Read.cs
+++ b/Aaru.Images/DART/Read.cs
@@ -147,7 +147,7 @@ public sealed partial class Dart
                     temp = new byte[l];
                     stream.EnsureRead(temp, 0, temp.Length);
 
-                    AaruConsole.ErrorWriteLine(Localization.LZH_Compressed_images_not_yet_supported);
+                    AaruConsole.Error(Localization.LZH_Compressed_images_not_yet_supported);
 
                     return ErrorNumber.NotImplemented;
                 }
@@ -249,7 +249,7 @@ public sealed partial class Dart
         }
         catch(InvalidCastException) {}
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Image_application_0_version_1,
                                    _imageInfo.Application,
                                    _imageInfo.ApplicationVersion);
diff --git a/Aaru.Images/DIM/Read.cs b/Aaru.Images/DIM/Read.cs
index c7ed125a6..b41fda6e1 100644
--- a/Aaru.Images/DIM/Read.cs
+++ b/Aaru.Images/DIM/Read.cs
@@ -76,7 +76,7 @@ public sealed partial class Dim
             case DiskType.Hd2:
                 if(diskSize % (2 * 8 * 1024) != 0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.DIM_shows_unknown_image_with_0_tracks,
+                    AaruConsole.Error(Localization.DIM_shows_unknown_image_with_0_tracks,
                                                diskSize / (2 * 8 * 1024));
 
                     return ErrorNumber.NotSupported;
@@ -92,7 +92,7 @@ public sealed partial class Dim
             case DiskType.Hs2:
                 if(diskSize % (2 * 9 * 512) != 0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.DIM_shows_unknown_image_with_0_tracks,
+                    AaruConsole.Error(Localization.DIM_shows_unknown_image_with_0_tracks,
                                                diskSize / (2 * 9 * 512));
 
                     return ErrorNumber.NotSupported;
@@ -108,7 +108,7 @@ public sealed partial class Dim
             case DiskType.Hc2:
                 if(diskSize % (2 * 15 * 512) != 0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.DIM_shows_unknown_image_with_0_tracks,
+                    AaruConsole.Error(Localization.DIM_shows_unknown_image_with_0_tracks,
                                                diskSize / (2 * 15 * 512));
 
                     return ErrorNumber.NotSupported;
@@ -124,7 +124,7 @@ public sealed partial class Dim
             case DiskType.Hde2:
                 if(diskSize % (2 * 9 * 512) != 0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.DIM_shows_unknown_image_with_0_tracks,
+                    AaruConsole.Error(Localization.DIM_shows_unknown_image_with_0_tracks,
                                                diskSize / (2 * 9 * 512));
 
                     return ErrorNumber.NotSupported;
@@ -140,7 +140,7 @@ public sealed partial class Dim
             case DiskType.Hq2:
                 if(diskSize % (2 * 18 * 512) != 0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.DIM_shows_unknown_image_with_0_tracks,
+                    AaruConsole.Error(Localization.DIM_shows_unknown_image_with_0_tracks,
                                                diskSize / (2 * 18 * 512));
 
                     return ErrorNumber.NotSupported;
@@ -168,7 +168,7 @@ public sealed partial class Dim
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine(Localization.DIM_shows_unknown_image_with_0_tracks,
+                    AaruConsole.Error(Localization.DIM_shows_unknown_image_with_0_tracks,
                                                diskSize / (2 * 26 * 256));
 
                     return ErrorNumber.NotSupported;
@@ -179,10 +179,10 @@ public sealed partial class Dim
                 return ErrorNumber.InvalidArgument;
         }
 
-        AaruConsole.VerboseWriteLine(Localization.DIM_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.DIM_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
 
         if(!string.IsNullOrEmpty(_imageInfo.Comments))
-            AaruConsole.VerboseWriteLine(Localization.DIM_comments_0, _imageInfo.Comments);
+            AaruConsole.Verbose(Localization.DIM_comments_0, _imageInfo.Comments);
 
         _dimImageFilter = imageFilter;
 
diff --git a/Aaru.Images/DiscFerret/Read.cs b/Aaru.Images/DiscFerret/Read.cs
index 897cefc4c..994d7cd54 100644
--- a/Aaru.Images/DiscFerret/Read.cs
+++ b/Aaru.Images/DiscFerret/Read.cs
@@ -68,17 +68,17 @@ public sealed partial class DiscFerret
             stream.EnsureRead(blk, 0, Marshal.SizeOf<BlockHeader>());
             BlockHeader blockHeader = Marshal.ByteArrayToStructureBigEndian<BlockHeader>(blk);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "block@{0}.cylinder = {1}", thisOffset, blockHeader.cylinder);
+            AaruConsole.Debug(MODULE_NAME, "block@{0}.cylinder = {1}", thisOffset, blockHeader.cylinder);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "block@{0}.head = {1}", thisOffset, blockHeader.head);
+            AaruConsole.Debug(MODULE_NAME, "block@{0}.head = {1}", thisOffset, blockHeader.head);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "block@{0}.sector = {1}", thisOffset, blockHeader.sector);
+            AaruConsole.Debug(MODULE_NAME, "block@{0}.sector = {1}", thisOffset, blockHeader.sector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "block@{0}.length = {1}", thisOffset, blockHeader.length);
+            AaruConsole.Debug(MODULE_NAME, "block@{0}.length = {1}", thisOffset, blockHeader.length);
 
             if(stream.Position + blockHeader.length > stream.Length)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Invalid_track_block_found_at_0, thisOffset);
+                AaruConsole.Debug(MODULE_NAME, Localization.Invalid_track_block_found_at_0, thisOffset);
 
                 break;
             }
@@ -114,7 +114,7 @@ public sealed partial class DiscFerret
         _imageInfo.Application        = "DiscFerret";
         _imageInfo.ApplicationVersion = magic == DFI_MAGIC2 ? "2.0" : "1.0";
 
-        AaruConsole.ErrorWriteLine(Localization.Flux_decoding_is_not_yet_implemented);
+        AaruConsole.Error(Localization.Flux_decoding_is_not_yet_implemented);
 
         return ErrorNumber.NotImplemented;
     }
diff --git a/Aaru.Images/DiscJuggler/Identify.cs b/Aaru.Images/DiscJuggler/Identify.cs
index 1d6280092..3663ce9c9 100644
--- a/Aaru.Images/DiscJuggler/Identify.cs
+++ b/Aaru.Images/DiscJuggler/Identify.cs
@@ -52,7 +52,7 @@ public sealed partial class DiscJuggler
         _imageStream.EnsureRead(dscLenB, 0, 4);
         int dscLen = BitConverter.ToInt32(dscLenB, 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dscLen = {0}", dscLen);
+        AaruConsole.Debug(MODULE_NAME, "dscLen = {0}", dscLen);
 
         if(dscLen >= _imageStream.Length) return false;
 
diff --git a/Aaru.Images/DiscJuggler/Read.cs b/Aaru.Images/DiscJuggler/Read.cs
index 00b88fb17..0c458189d 100644
--- a/Aaru.Images/DiscJuggler/Read.cs
+++ b/Aaru.Images/DiscJuggler/Read.cs
@@ -81,14 +81,14 @@ public sealed partial class DiscJuggler
         ushort mediumType;
         byte   maxS = descriptor[0];
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "maxS = {0}", maxS);
+        AaruConsole.Debug(MODULE_NAME, "maxS = {0}", maxS);
         uint  lastSessionTrack = 0;
         ulong currentOffset    = 0;
 
         // Read sessions
         for(byte s = 0; s <= maxS; s++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, "s = {0}", s);
+            AaruConsole.Debug(MODULE_NAME, "s = {0}", s);
 
             // Seems all sessions start with this data
             if(descriptor[position + 0]  != 0x00 ||
@@ -148,7 +148,7 @@ public sealed partial class DiscJuggler
             if(descriptor[position + 1] > 99) return ErrorNumber.InvalidArgument;
 
             byte maxT = descriptor[position + 1];
-            AaruConsole.DebugWriteLine(MODULE_NAME, "maxT = {0}", maxT);
+            AaruConsole.Debug(MODULE_NAME, "maxT = {0}", maxT);
 
             sessionSequence++;
 
@@ -165,7 +165,7 @@ public sealed partial class DiscJuggler
             // Read track
             for(byte t = 0; t < maxT; t++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, "t = {0}", t);
+                AaruConsole.Debug(MODULE_NAME, "t = {0}", t);
                 var track = new Track();
 
                 // Skip unknown
@@ -176,19 +176,19 @@ public sealed partial class DiscJuggler
                 Array.Copy(descriptor, position, trackFilenameB, 0, trackFilenameB.Length);
                 position   += trackFilenameB.Length;
                 track.File =  Path.GetFileName(Encoding.Default.GetString(trackFilenameB));
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tfilename = {0}", track.File);
+                AaruConsole.Debug(MODULE_NAME, "\tfilename = {0}", track.File);
 
                 // Skip unknown
                 position += 29;
 
                 mediumType =  BitConverter.ToUInt16(descriptor, position);
                 position   += 2;
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tmediumType = {0}", mediumType);
+                AaruConsole.Debug(MODULE_NAME, "\tmediumType = {0}", mediumType);
 
                 // Read indices
                 ushort maxI = BitConverter.ToUInt16(descriptor, position);
                 position += 2;
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tmaxI = {0}", maxI);
+                AaruConsole.Debug(MODULE_NAME, "\tmaxI = {0}", maxI);
 
                 // This is not really the index position, but, the index length, go figure
                 for(ushort i = 0; i < maxI; i++)
@@ -196,13 +196,13 @@ public sealed partial class DiscJuggler
                     int index = BitConverter.ToInt32(descriptor, position);
                     track.Indexes.Add(i, index);
                     position += 4;
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\tindex[{1}] = {0}", index, i);
+                    AaruConsole.Debug(MODULE_NAME, "\tindex[{1}] = {0}", index, i);
                 }
 
                 // Read CD-Text
                 uint maxC = BitConverter.ToUInt32(descriptor, position);
                 position += 4;
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tmaxC = {0}", maxC);
+                AaruConsole.Debug(MODULE_NAME, "\tmaxC = {0}", maxC);
 
                 for(uint c = 0; c < maxC; c++)
                 {
@@ -210,7 +210,7 @@ public sealed partial class DiscJuggler
                     {
                         int bLen = descriptor[position];
                         position++;
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "\tc[{1}][{2}].Length = {0}", bLen, c, cb);
+                        AaruConsole.Debug(MODULE_NAME, "\tc[{1}][{2}].Length = {0}", bLen, c, cb);
 
                         if(bLen <= 0) continue;
 
@@ -223,13 +223,13 @@ public sealed partial class DiscJuggler
 
                         track.Description = Encoding.Default.GetString(textBlk, 0, bLen);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Track_title_0, track.Description);
+                        AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Track_title_0, track.Description);
                     }
                 }
 
                 position += 2;
                 uint trackMode = BitConverter.ToUInt32(descriptor, position);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\ttrackMode = {0}", trackMode);
+                AaruConsole.Debug(MODULE_NAME, "\ttrackMode = {0}", trackMode);
                 position += 4;
 
                 // Skip unknown
@@ -237,11 +237,11 @@ public sealed partial class DiscJuggler
 
                 session.Sequence = (ushort)(BitConverter.ToUInt32(descriptor, position) + 1);
                 track.Session    = session.Sequence;
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tsession = {0}", session.Sequence);
+                AaruConsole.Debug(MODULE_NAME, "\tsession = {0}", session.Sequence);
                 position       += 4;
                 track.Sequence =  BitConverter.ToUInt32(descriptor, position) + lastSessionTrack + 1;
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\ttrack = {1} + {2} + 1 = {0}",
                                            track.Sequence,
                                            BitConverter.ToUInt32(descriptor, position),
@@ -256,7 +256,7 @@ public sealed partial class DiscJuggler
 
                 position          += 4;
                 track.StartSector =  BitConverter.ToUInt32(descriptor, position);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\ttrackStart = {0}", track.StartSector);
+                AaruConsole.Debug(MODULE_NAME, "\ttrackStart = {0}", track.StartSector);
                 position += 4;
                 uint trackLen = BitConverter.ToUInt32(descriptor, position);
 
@@ -279,7 +279,7 @@ public sealed partial class DiscJuggler
                 }
 
                 track.EndSector = track.StartSector + trackLen - 1;
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\ttrackEnd = {0}", track.EndSector);
+                AaruConsole.Debug(MODULE_NAME, "\ttrackEnd = {0}", track.EndSector);
                 position += 4;
 
                 if(track.Sequence > session.EndTrack)
@@ -298,10 +298,10 @@ public sealed partial class DiscJuggler
                 position += 16;
 
                 uint readMode = BitConverter.ToUInt32(descriptor, position);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\treadMode = {0}", readMode);
+                AaruConsole.Debug(MODULE_NAME, "\treadMode = {0}", readMode);
                 position += 4;
                 uint trackCtl = BitConverter.ToUInt32(descriptor, position);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\ttrackCtl = {0}", trackCtl);
+                AaruConsole.Debug(MODULE_NAME, "\ttrackCtl = {0}", trackCtl);
                 position += 4;
 
                 // Skip unknown
@@ -309,28 +309,28 @@ public sealed partial class DiscJuggler
 
                 byte[] isrc = new byte[12];
                 Array.Copy(descriptor, position, isrc, 0, 12);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tisrc = {0}", StringHandlers.CToString(isrc));
+                AaruConsole.Debug(MODULE_NAME, "\tisrc = {0}", StringHandlers.CToString(isrc));
                 position += 12;
                 uint isrcValid = BitConverter.ToUInt32(descriptor, position);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tisrc_valid = {0}", isrcValid);
+                AaruConsole.Debug(MODULE_NAME, "\tisrc_valid = {0}", isrcValid);
                 position += 4;
 
                 // Skip unknown
                 position += 87;
 
                 byte sessionType = descriptor[position];
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tsessionType = {0}", sessionType);
+                AaruConsole.Debug(MODULE_NAME, "\tsessionType = {0}", sessionType);
                 position++;
 
                 // Skip unknown
                 position += 5;
 
                 byte trackFollows = descriptor[position];
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\ttrackFollows = {0}", trackFollows);
+                AaruConsole.Debug(MODULE_NAME, "\ttrackFollows = {0}", trackFollows);
                 position += 2;
 
                 uint endAddress = BitConverter.ToUInt32(descriptor, position);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tendAddress = {0}", endAddress);
+                AaruConsole.Debug(MODULE_NAME, "\tendAddress = {0}", endAddress);
                 position += 4;
 
                 // As to skip the lead-in
@@ -380,7 +380,7 @@ public sealed partial class DiscJuggler
 
                                 break;
                             default:
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Unknown_read_mode_0, readMode));
+                                AaruConsole.Error(string.Format(Localization.Unknown_read_mode_0, readMode));
 
                                 return ErrorNumber.InvalidArgument;
                         }
@@ -406,7 +406,7 @@ public sealed partial class DiscJuggler
 
                                 break;
                             case 1:
-                                AaruConsole.ErrorWriteLine(string.Format(Localization
+                                AaruConsole.Error(string.Format(Localization
                                                                             .Invalid_read_mode_0_for_this_track,
                                                                          readMode));
 
@@ -497,7 +497,7 @@ public sealed partial class DiscJuggler
 
                                 break;
                             default:
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Unknown_read_mode_0, readMode));
+                                AaruConsole.Error(string.Format(Localization.Unknown_read_mode_0, readMode));
 
                                 return ErrorNumber.InvalidArgument;
                         }
@@ -514,7 +514,7 @@ public sealed partial class DiscJuggler
                         switch(readMode)
                         {
                             case 0:
-                                AaruConsole.ErrorWriteLine(string.Format(Localization
+                                AaruConsole.Error(string.Format(Localization
                                                                             .Invalid_read_mode_0_for_this_track,
                                                                          readMode));
 
@@ -578,14 +578,14 @@ public sealed partial class DiscJuggler
 
                                 break;
                             default:
-                                AaruConsole.ErrorWriteLine(string.Format(Localization.Unknown_read_mode_0, readMode));
+                                AaruConsole.Error(string.Format(Localization.Unknown_read_mode_0, readMode));
 
                                 return ErrorNumber.InvalidArgument;
                         }
 
                         break;
                     default:
-                        AaruConsole.ErrorWriteLine(string.Format(Localization.Unknown_track_mode_0, trackMode));
+                        AaruConsole.Error(string.Format(Localization.Unknown_track_mode_0, trackMode));
 
                         return ErrorNumber.InvalidArgument;
                 }
@@ -633,56 +633,56 @@ public sealed partial class DiscJuggler
 
             lastSessionTrack = session.EndTrack;
             Sessions.Add(session);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session.StartTrack = {0}",  session.StartTrack);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session.StartSector = {0}", session.StartSector);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session.EndTrack = {0}",    session.EndTrack);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session.EndSector = {0}",   session.EndSector);
+            AaruConsole.Debug(MODULE_NAME, "session.StartTrack = {0}",  session.StartTrack);
+            AaruConsole.Debug(MODULE_NAME, "session.StartSector = {0}", session.StartSector);
+            AaruConsole.Debug(MODULE_NAME, "session.EndTrack = {0}",    session.EndTrack);
+            AaruConsole.Debug(MODULE_NAME, "session.EndSector = {0}",   session.EndSector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "session.Sequence = {0}", session.Sequence);
+            AaruConsole.Debug(MODULE_NAME, "session.Sequence = {0}", session.Sequence);
         }
 
         // Skip unknown
         position += 16;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Current_position_equals_0, position);
+        AaruConsole.Debug(MODULE_NAME, Localization.Current_position_equals_0, position);
         byte[] filenameB = new byte[descriptor[position]];
         position++;
         Array.Copy(descriptor, position, filenameB, 0, filenameB.Length);
         position += filenameB.Length;
         string filename = Path.GetFileName(Encoding.Default.GetString(filenameB));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "filename = {0}", filename);
+        AaruConsole.Debug(MODULE_NAME, "filename = {0}", filename);
 
         // Skip unknown
         position += 29;
 
         mediumType =  BitConverter.ToUInt16(descriptor, position);
         position   += 2;
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mediumType = {0}", mediumType);
+        AaruConsole.Debug(MODULE_NAME, "mediumType = {0}", mediumType);
 
         uint discSize = BitConverter.ToUInt32(descriptor, position);
         position += 4;
-        AaruConsole.DebugWriteLine(MODULE_NAME, "discSize = {0}", discSize);
+        AaruConsole.Debug(MODULE_NAME, "discSize = {0}", discSize);
 
         byte[] volidB = new byte[descriptor[position]];
         position++;
         Array.Copy(descriptor, position, volidB, 0, volidB.Length);
         position += volidB.Length;
         string volid = Path.GetFileName(Encoding.Default.GetString(volidB));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "volid = {0}", volid);
+        AaruConsole.Debug(MODULE_NAME, "volid = {0}", volid);
 
         // Skip unknown
         position += 9;
 
         byte[] mcn = new byte[13];
         Array.Copy(descriptor, position, mcn, 0, 13);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mcn = {0}", StringHandlers.CToString(mcn));
+        AaruConsole.Debug(MODULE_NAME, "mcn = {0}", StringHandlers.CToString(mcn));
         position += 13;
         uint mcnValid = BitConverter.ToUInt32(descriptor, position);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mcn_valid = {0}", mcnValid);
+        AaruConsole.Debug(MODULE_NAME, "mcn_valid = {0}", mcnValid);
         position += 4;
 
         uint cdtextLen = BitConverter.ToUInt32(descriptor, position);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "cdtextLen = {0}", cdtextLen);
+        AaruConsole.Debug(MODULE_NAME, "cdtextLen = {0}", cdtextLen);
         position += 4;
 
         if(cdtextLen > 0)
@@ -696,7 +696,7 @@ public sealed partial class DiscJuggler
         // Skip unknown
         position += 12;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.End_position_equals_0, position);
+        AaruConsole.Debug(MODULE_NAME, Localization.End_position_equals_0, position);
 
         _imageInfo.MediaType = DecodeCdiMediumType(mediumType);
 
diff --git a/Aaru.Images/DiskCopy42/Identify.cs b/Aaru.Images/DiskCopy42/Identify.cs
index c6ca0b3f7..a7411dcf4 100644
--- a/Aaru.Images/DiskCopy42/Identify.cs
+++ b/Aaru.Images/DiskCopy42/Identify.cs
@@ -69,15 +69,15 @@ public sealed partial class DiskCopy42
         tmpHeader.Valid        = buffer[0x52];
         tmpHeader.Reserved     = buffer[0x53];
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.diskName = \"{0}\"",      tmpHeader.DiskName);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.dataSize = {0} bytes",    tmpHeader.DataSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.tagSize = {0} bytes",     tmpHeader.TagSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.dataChecksum = 0x{0:X8}", tmpHeader.DataChecksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.tagChecksum = 0x{0:X8}",  tmpHeader.TagChecksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.format = 0x{0:X2}",       tmpHeader.Format);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.fmtByte = 0x{0:X2}",      tmpHeader.FmtByte);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.valid = {0}",             tmpHeader.Valid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.reserved = {0}",          tmpHeader.Reserved);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.diskName = \"{0}\"",      tmpHeader.DiskName);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.dataSize = {0} bytes",    tmpHeader.DataSize);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.tagSize = {0} bytes",     tmpHeader.TagSize);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.dataChecksum = 0x{0:X8}", tmpHeader.DataChecksum);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.tagChecksum = 0x{0:X8}",  tmpHeader.TagChecksum);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.format = 0x{0:X2}",       tmpHeader.Format);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.fmtByte = 0x{0:X2}",      tmpHeader.FmtByte);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.valid = {0}",             tmpHeader.Valid);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.reserved = {0}",          tmpHeader.Reserved);
 
         if(tmpHeader.Valid != 1 || tmpHeader.Reserved != 0) return false;
 
@@ -103,7 +103,7 @@ public sealed partial class DiskCopy42
            tmpHeader.Format != kSigmaFormatTwiggy &&
            tmpHeader.Format != kNotStandardFormat)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Unknown_tmp_header_format_equals_0_value,
                                        tmpHeader.Format);
 
@@ -119,7 +119,7 @@ public sealed partial class DiskCopy42
            tmpHeader.FmtByte != kFmtNotStandard           &&
            tmpHeader.FmtByte != kMacOSXFmtByte)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Unknown_tmp_header_fmtByte_equals_0_value,
                                        tmpHeader.FmtByte);
 
@@ -128,7 +128,7 @@ public sealed partial class DiskCopy42
 
         if(tmpHeader.FmtByte != kInvalidFmtByte) return true;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Image_says_its_unformatted);
+        AaruConsole.Debug(MODULE_NAME, Localization.Image_says_its_unformatted);
 
         return false;
     }
diff --git a/Aaru.Images/DiskCopy42/Read.cs b/Aaru.Images/DiskCopy42/Read.cs
index 491fb2730..d4338de4b 100644
--- a/Aaru.Images/DiskCopy42/Read.cs
+++ b/Aaru.Images/DiskCopy42/Read.cs
@@ -74,15 +74,15 @@ public sealed partial class DiskCopy42
         header.Valid        = buffer[0x52];
         header.Reserved     = buffer[0x53];
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.diskName = \"{0}\"",      header.DiskName);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dataSize = {0} bytes",    header.DataSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.tagSize = {0} bytes",     header.TagSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dataChecksum = 0x{0:X8}", header.DataChecksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.tagChecksum = 0x{0:X8}",  header.TagChecksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.format = 0x{0:X2}",       header.Format);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.fmtByte = 0x{0:X2}",      header.FmtByte);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.valid = {0}",             header.Valid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.reserved = {0}",          header.Reserved);
+        AaruConsole.Debug(MODULE_NAME, "header.diskName = \"{0}\"",      header.DiskName);
+        AaruConsole.Debug(MODULE_NAME, "header.dataSize = {0} bytes",    header.DataSize);
+        AaruConsole.Debug(MODULE_NAME, "header.tagSize = {0} bytes",     header.TagSize);
+        AaruConsole.Debug(MODULE_NAME, "header.dataChecksum = 0x{0:X8}", header.DataChecksum);
+        AaruConsole.Debug(MODULE_NAME, "header.tagChecksum = 0x{0:X8}",  header.TagChecksum);
+        AaruConsole.Debug(MODULE_NAME, "header.format = 0x{0:X2}",       header.Format);
+        AaruConsole.Debug(MODULE_NAME, "header.fmtByte = 0x{0:X2}",      header.FmtByte);
+        AaruConsole.Debug(MODULE_NAME, "header.valid = {0}",             header.Valid);
+        AaruConsole.Debug(MODULE_NAME, "header.reserved = {0}",          header.Reserved);
 
         if(header.Valid != 1 || header.Reserved != 0) return ErrorNumber.InvalidArgument;
 
@@ -107,7 +107,7 @@ public sealed partial class DiskCopy42
            header.Format != kSigmaFormatTwiggy &&
            header.Format != kNotStandardFormat)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Unknown_header_format_equals_0_value, header.Format);
+            AaruConsole.Debug(MODULE_NAME, Localization.Unknown_header_format_equals_0_value, header.Format);
 
             return ErrorNumber.NotSupported;
         }
@@ -121,7 +121,7 @@ public sealed partial class DiskCopy42
            header.FmtByte != kFmtNotStandard           &&
            header.FmtByte != kMacOSXFmtByte)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Unknown_tmp_header_fmtByte_equals_0_value,
                                        header.FmtByte);
 
@@ -130,7 +130,7 @@ public sealed partial class DiskCopy42
 
         if(header.FmtByte == kInvalidFmtByte)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Image_says_its_unformatted);
+            AaruConsole.Debug(MODULE_NAME, Localization.Image_says_its_unformatted);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -146,11 +146,11 @@ public sealed partial class DiskCopy42
         if(header.TagSize != 0)
         {
             bptag = (uint)(header.TagSize / imageInfo.Sectors);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bptag = {0} bytes", bptag);
+            AaruConsole.Debug(MODULE_NAME, "bptag = {0} bytes", bptag);
 
             if(bptag != 12 && bptag != 20 && bptag != 24)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Unknown_tag_size);
+                AaruConsole.Debug(MODULE_NAME, Localization.Unknown_tag_size);
 
                 return ErrorNumber.NotSupported;
             }
@@ -207,7 +207,7 @@ public sealed partial class DiskCopy42
             // Detect a Macintosh Twiggy
             if(mfsMagic == 0xD2D7 && mfsAllBlocks == 422)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Macintosh_Twiggy_detected_reversing_disk_sides);
+                AaruConsole.Debug(MODULE_NAME, Localization.Macintosh_Twiggy_detected_reversing_disk_sides);
                 Array.Copy(data, header.DataSize / 2, twiggyCache,     0, header.DataSize / 2);
                 Array.Copy(tags, header.TagSize  / 2, twiggyCacheTags, 0, header.TagSize  / 2);
                 Array.Copy(data, 0,                   twiggyCache,     header.DataSize    / 2, header.DataSize / 2);
@@ -215,7 +215,7 @@ public sealed partial class DiskCopy42
             }
             else
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Lisa_Twiggy_detected_reversing_second_half_of_disk);
 
                 Array.Copy(data, 0, twiggyCache,     0, header.DataSize / 2);
@@ -320,13 +320,13 @@ public sealed partial class DiskCopy42
         }
         catch(InvalidCastException) {}
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Image_application_0_version_1,
                                    imageInfo.Application,
                                    imageInfo.ApplicationVersion);
 
         imageInfo.MetadataMediaType = MetadataMediaType.BlockMedia;
-        AaruConsole.VerboseWriteLine(Localization.DiskCopy_4_2_image_contains_a_disk_of_type_0, imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.DiskCopy_4_2_image_contains_a_disk_of_type_0, imageInfo.MediaType);
 
         switch(imageInfo.MediaType)
         {
diff --git a/Aaru.Images/DiskCopy42/Verify.cs b/Aaru.Images/DiskCopy42/Verify.cs
index 33b04332f..34d286380 100644
--- a/Aaru.Images/DiskCopy42/Verify.cs
+++ b/Aaru.Images/DiskCopy42/Verify.cs
@@ -47,27 +47,27 @@ public sealed partial class DiskCopy42
         byte[] tags    = new byte[header.TagSize];
         uint   tagsChk = 0;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_data);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_data);
         Stream dataStream = dc42ImageFilter.GetDataForkStream();
         dataStream.Seek(dataOffset, SeekOrigin.Begin);
         dataStream.EnsureRead(data, 0, (int)header.DataSize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Calculating_data_checksum);
+        AaruConsole.Debug(MODULE_NAME, Localization.Calculating_data_checksum);
         uint dataChk = CheckSum(data);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Calculated_data_checksum_equals_0_X8, dataChk);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Stored_data_checksum_equals_0_X8,     header.DataChecksum);
+        AaruConsole.Debug(MODULE_NAME, Localization.Calculated_data_checksum_equals_0_X8, dataChk);
+        AaruConsole.Debug(MODULE_NAME, Localization.Stored_data_checksum_equals_0_X8,     header.DataChecksum);
 
         if(header.TagSize <= 0) return dataChk == header.DataChecksum && tagsChk == header.TagChecksum;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_tags);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_tags);
         Stream tagStream = dc42ImageFilter.GetDataForkStream();
         tagStream.Seek(tagOffset, SeekOrigin.Begin);
         tagStream.EnsureRead(tags, 0, (int)header.TagSize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Calculating_tag_checksum);
+        AaruConsole.Debug(MODULE_NAME, Localization.Calculating_tag_checksum);
         tagsChk = CheckSum(tags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Calculated_tag_checksum_equals_0_X8, tagsChk);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Stored_tag_checksum_equals_0_X8,     header.TagChecksum);
+        AaruConsole.Debug(MODULE_NAME, Localization.Calculated_tag_checksum_equals_0_X8, tagsChk);
+        AaruConsole.Debug(MODULE_NAME, Localization.Stored_tag_checksum_equals_0_X8,     header.TagChecksum);
 
         return dataChk == header.DataChecksum && tagsChk == header.TagChecksum;
     }
diff --git a/Aaru.Images/DiskCopy42/Write.cs b/Aaru.Images/DiskCopy42/Write.cs
index 17dd6a6d6..5b3301b23 100644
--- a/Aaru.Images/DiskCopy42/Write.cs
+++ b/Aaru.Images/DiskCopy42/Write.cs
@@ -203,7 +203,7 @@ public sealed partial class DiskCopy42
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/DiskDupe/Helpers.cs b/Aaru.Images/DiskDupe/Helpers.cs
index e725be82e..909936ef4 100644
--- a/Aaru.Images/DiskDupe/Helpers.cs
+++ b/Aaru.Images/DiskDupe/Helpers.cs
@@ -67,7 +67,7 @@ public sealed partial class DiskDupe
         var    trackMap     = new TrackInfo[numTracks];
         long[] trackOffsets = new long[numTracks];
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Identified_image_with_CHS_equals_0_1_2,
                                    _diskTypes[fHeader.diskType].cyl,
                                    _diskTypes[fHeader.diskType].hd,
diff --git a/Aaru.Images/DiskDupe/Read.cs b/Aaru.Images/DiskDupe/Read.cs
index b958d476f..d3a0a116a 100644
--- a/Aaru.Images/DiskDupe/Read.cs
+++ b/Aaru.Images/DiskDupe/Read.cs
@@ -55,7 +55,7 @@ public sealed partial class DiskDupe
 
         if(!TryReadHeader(stream, ref fHeader, ref trackMap, ref trackOffsets)) return ErrorNumber.InvalidArgument;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Detected_DiskDupe_DDI_image_with_0_tracks_and_1_sectors_per_track,
                                    _diskTypes[fHeader.diskType].cyl,
                                    _diskTypes[fHeader.diskType].spt);
diff --git a/Aaru.Images/DriDiskCopy/Identify.cs b/Aaru.Images/DriDiskCopy/Identify.cs
index 5bb1fe269..3cce536dd 100644
--- a/Aaru.Images/DriDiskCopy/Identify.cs
+++ b/Aaru.Images/DriDiskCopy/Identify.cs
@@ -57,43 +57,43 @@ public sealed partial class DriDiskCopy
 
         string sig = StringHandlers.CToString(tmpFooter.signature);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.signature = \"{0}\"", sig);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.five = {0}",      tmpFooter.bpb.five);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.signature = \"{0}\"", sig);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.five = {0}",      tmpFooter.bpb.five);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb._driveCode = {0}", tmpFooter.bpb._driveCode);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb._driveCode = {0}", tmpFooter.bpb._driveCode);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.unknown = {0}", tmpFooter.bpb.unknown);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.unknown = {0}", tmpFooter.bpb.unknown);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.cylinders = {0}", tmpFooter.bpb.cylinders);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.cylinders = {0}", tmpFooter.bpb.cylinders);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.unknown2 = {0}", tmpFooter.bpb.unknown2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.bps = {0}",      tmpFooter.bpb.bps);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.spc = {0}",      tmpFooter.bpb.spc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.rsectors = {0}", tmpFooter.bpb.rsectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.fats_no = {0}",  tmpFooter.bpb.fats_no);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.sectors = {0}",  tmpFooter.bpb.sectors);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.unknown2 = {0}", tmpFooter.bpb.unknown2);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.bps = {0}",      tmpFooter.bpb.bps);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.spc = {0}",      tmpFooter.bpb.spc);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.rsectors = {0}", tmpFooter.bpb.rsectors);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.fats_no = {0}",  tmpFooter.bpb.fats_no);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.sectors = {0}",  tmpFooter.bpb.sectors);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "tmp_footer.bpb.media_descriptor = {0}",
                                    tmpFooter.bpb.media_descriptor);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.spfat = {0}",    tmpFooter.bpb.spfat);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.sptrack = {0}",  tmpFooter.bpb.sptrack);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.heads = {0}",    tmpFooter.bpb.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.hsectors = {0}", tmpFooter.bpb.hsectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.drive_no = {0}", tmpFooter.bpb.drive_no);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.unknown3 = {0}", tmpFooter.bpb.unknown3);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.unknown4 = {0}", tmpFooter.bpb.unknown4);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_footer.bpb.sptrack2 = {0}", tmpFooter.bpb.sptrack2);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.spfat = {0}",    tmpFooter.bpb.spfat);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.sptrack = {0}",  tmpFooter.bpb.sptrack);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.heads = {0}",    tmpFooter.bpb.heads);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.hsectors = {0}", tmpFooter.bpb.hsectors);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.drive_no = {0}", tmpFooter.bpb.drive_no);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.unknown3 = {0}", tmpFooter.bpb.unknown3);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.unknown4 = {0}", tmpFooter.bpb.unknown4);
+        AaruConsole.Debug(MODULE_NAME, "tmp_footer.bpb.sptrack2 = {0}", tmpFooter.bpb.sptrack2);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ArrayHelpers.ArrayIsNullOrEmpty(tmp_footer.bpb.unknown5) = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(tmpFooter.bpb.unknown5));
 
         var   regexSignature = new Regex(REGEX_DRI);
         Match matchSignature = regexSignature.Match(sig);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "MatchSignature.Success? = {0}", matchSignature.Success);
+        AaruConsole.Debug(MODULE_NAME, "MatchSignature.Success? = {0}", matchSignature.Success);
 
         if(!matchSignature.Success) return false;
 
diff --git a/Aaru.Images/DriDiskCopy/Read.cs b/Aaru.Images/DriDiskCopy/Read.cs
index a24c33602..7b9d88c12 100644
--- a/Aaru.Images/DriDiskCopy/Read.cs
+++ b/Aaru.Images/DriDiskCopy/Read.cs
@@ -83,7 +83,7 @@ public sealed partial class DriDiskCopy
         _imageInfo.CreationTime         = imageFilter.CreationTime;
         _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Image_application_0_version_1,
                                    _imageInfo.Application,
                                    _imageInfo.ApplicationVersion);
@@ -118,7 +118,7 @@ public sealed partial class DriDiskCopy
 
         _imageInfo.MetadataMediaType = MetadataMediaType.BlockMedia;
 
-        AaruConsole.VerboseWriteLine(Localization.Digital_Research_DiskCopy_image_contains_a_disk_of_type_0,
+        AaruConsole.Verbose(Localization.Digital_Research_DiskCopy_image_contains_a_disk_of_type_0,
                                      _imageInfo.MediaType);
 
         return ErrorNumber.NoError;
diff --git a/Aaru.Images/DriDiskCopy/Write.cs b/Aaru.Images/DriDiskCopy/Write.cs
index caeff7e90..8a2d9879a 100644
--- a/Aaru.Images/DriDiskCopy/Write.cs
+++ b/Aaru.Images/DriDiskCopy/Write.cs
@@ -86,7 +86,7 @@ public sealed partial class DriDiskCopy
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/GDI/Identify.cs b/Aaru.Images/GDI/Identify.cs
index 73d754f22..0bdd20f23 100644
--- a/Aaru.Images/GDI/Identify.cs
+++ b/Aaru.Images/GDI/Identify.cs
@@ -108,8 +108,8 @@ public sealed partial class Gdi
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(Localization.Exception_trying_to_identify_image_file_0, imageFilter.BasePath);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Localization.Exception_trying_to_identify_image_file_0, imageFilter.BasePath);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/GDI/Read.cs b/Aaru.Images/GDI/Read.cs
index 89207e36b..f7560541c 100644
--- a/Aaru.Images/GDI/Read.cs
+++ b/Aaru.Images/GDI/Read.cs
@@ -88,7 +88,7 @@ public sealed partial class Gdi
                 {
                     if(int.TryParse(line, out _)) continue;
 
-                    AaruConsole.ErrorWriteLine(Localization.Not_a_correct_Dreamcast_GDI_image);
+                    AaruConsole.Error(Localization.Not_a_correct_Dreamcast_GDI_image);
 
                     return ErrorNumber.InvalidArgument;
                 }
@@ -97,12 +97,12 @@ public sealed partial class Gdi
 
                 if(!trackMatch.Success)
                 {
-                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unknown_line_0_at_line_1, line, lineNumber));
+                    AaruConsole.Error(string.Format(Localization.Unknown_line_0_at_line_1, line, lineNumber));
 
                     return ErrorNumber.InvalidArgument;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization
                                               .Found_track_0_starts_at_1_flags_2_type_3_file_4_offset_5_at_line_6,
                                            trackMatch.Groups["track"].Value,
@@ -147,7 +147,7 @@ public sealed partial class Gdi
 
                 if((currentTrack.TrackFilter.DataForkLength - currentTrack.Offset) % currentTrack.Bps != 0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Track_size_not_a_multiple_of_sector_size);
+                    AaruConsole.Error(Localization.Track_size_not_a_multiple_of_sector_size);
 
                     return ErrorNumber.InvalidArgument;
                 }
@@ -212,68 +212,68 @@ public sealed partial class Gdi
             _discImage.Disktype = MediaType.GDROM;
 
             // DEBUG information
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_image_parsing_results);
+            AaruConsole.Debug(MODULE_NAME, Localization.Disc_image_parsing_results);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Session_information);
+            AaruConsole.Debug(MODULE_NAME, Localization.Session_information);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "\t" + Localization.Disc_contains_0_sessions,
                                        _discImage.Sessions.Count);
 
             for(int i = 0; i < _discImage.Sessions.Count; i++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Session_0_information, i + 1);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Session_0_information, i + 1);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Starting_track_0,
                                            _discImage.Sessions[i].StartTrack);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Starting_sector_0,
                                            _discImage.Sessions[i].StartSector);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Ending_track_0,
                                            _discImage.Sessions[i].EndTrack);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Ending_sector_0,
                                            _discImage.Sessions[i].EndSector);
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Track_information);
+            AaruConsole.Debug(MODULE_NAME, Localization.Track_information);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "\t" + Localization.Disc_contains_0_tracks,
                                        _discImage.Tracks.Count);
 
             for(int i = 0; i < _discImage.Tracks.Count; i++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t" + Localization.Track_0_information,
                                            _discImage.Tracks[i].Sequence);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization._0_bytes_per_sector,
                                            _discImage.Tracks[i].Bps);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Pregap_0_sectors,
                                            _discImage.Tracks[i].Pregap);
 
                 if((_discImage.Tracks[i].Flags & 0x8) == 0x8)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_is_flagged_as_quadraphonic);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_is_flagged_as_quadraphonic);
 
                 if((_discImage.Tracks[i].Flags & 0x4) == 0x4)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_is_data);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_is_data);
 
                 if((_discImage.Tracks[i].Flags & 0x2) == 0x2)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_allows_digital_copy);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_allows_digital_copy);
 
                 if((_discImage.Tracks[i].Flags & 0x1) == 0x1)
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Track_has_pre_emphasis_applied);
+                    AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Track_has_pre_emphasis_applied);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" +
                                            Localization.Track_resides_in_file_0_type_defined_as_1_starting_at_byte_2,
                                            _discImage.Tracks[i].TrackFilter,
@@ -281,7 +281,7 @@ public sealed partial class Gdi
                                            _discImage.Tracks[i].Offset);
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Building_offset_map);
+            AaruConsole.Debug(MODULE_NAME, Localization.Building_offset_map);
 
             Partitions = [];
             ulong byteOffset = 0;
@@ -290,7 +290,7 @@ public sealed partial class Gdi
             {
                 if(_discImage.Tracks[i].Sequence == 1 && i != 0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Unordered_tracks);
+                    AaruConsole.Error(Localization.Unordered_tracks);
 
                     return ErrorNumber.InvalidArgument;
                 }
@@ -342,7 +342,7 @@ public sealed partial class Gdi
 
             _imageInfo.MetadataMediaType = MetadataMediaType.OpticalDisc;
 
-            AaruConsole.VerboseWriteLine(Localization.GDI_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
+            AaruConsole.Verbose(Localization.GDI_image_describes_a_disc_of_type_0, _imageInfo.MediaType);
 
             _sectorBuilder = new SectorBuilder();
 
@@ -350,8 +350,8 @@ public sealed partial class Gdi
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(Localization.Exception_trying_to_identify_image_file_0, imageFilter.BasePath);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Localization.Exception_trying_to_identify_image_file_0, imageFilter.BasePath);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.UnexpectedException;
         }
diff --git a/Aaru.Images/HDCopy/Helpers.cs b/Aaru.Images/HDCopy/Helpers.cs
index 6c0a5b431..b6b2dd714 100644
--- a/Aaru.Images/HDCopy/Helpers.cs
+++ b/Aaru.Images/HDCopy/Helpers.cs
@@ -100,7 +100,7 @@ public sealed partial class HdCopy
         // check that track is present
         if(_trackOffset[trackNum] == -1)
         {
-            AaruConsole.ErrorWriteLine(Localization.Tried_reading_a_track_that_is_not_present_in_image);
+            AaruConsole.Error(Localization.Tried_reading_a_track_that_is_not_present_in_image);
 
             return ErrorNumber.SectorNotFound;
         }
@@ -137,7 +137,7 @@ public sealed partial class HdCopy
         // check that the number of bytes decompressed matches a whole track
         if(dIndex != _imageInfo.SectorSize * _imageInfo.SectorsPerTrack)
         {
-            AaruConsole.ErrorWriteLine(Localization.Track_decompression_yielded_incomplete_data);
+            AaruConsole.Error(Localization.Track_decompression_yielded_incomplete_data);
 
             return ErrorNumber.InOutError;
         }
diff --git a/Aaru.Images/HDCopy/Read.cs b/Aaru.Images/HDCopy/Read.cs
index 06f4788e4..7a3ed7fdb 100644
--- a/Aaru.Images/HDCopy/Read.cs
+++ b/Aaru.Images/HDCopy/Read.cs
@@ -57,7 +57,7 @@ public sealed partial class HdCopy
 
         if(!TryReadHeader(stream, ref fheader, ref currentOffset)) return ErrorNumber.InvalidArgument;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Detected_HD_Copy_image_with_0_tracks_and_1_sectors_per_track,
                                    fheader.lastCylinder + 1,
                                    fheader.sectorsPerTrack);
@@ -96,7 +96,7 @@ public sealed partial class HdCopy
                 // assume block sizes are positive
                 if(blkLength < 0) return ErrorNumber.InvalidArgument;
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Track_0_offset_1_size_equals_2,
                                            i,
                                            currentOffset,
diff --git a/Aaru.Images/IMD/Read.cs b/Aaru.Images/IMD/Read.cs
index 29f467216..e41ecdc94 100644
--- a/Aaru.Images/IMD/Read.cs
+++ b/Aaru.Images/IMD/Read.cs
@@ -152,7 +152,7 @@ public sealed partial class Imd
 
                         break;
                     default:
-                        AaruConsole.ErrorWriteLine(string.Format(Localization.Invalid_sector_type_0, (byte)type));
+                        AaruConsole.Error(string.Format(Localization.Invalid_sector_type_0, (byte)type));
 
                         return ErrorNumber.InvalidArgument;
                 }
@@ -202,10 +202,10 @@ public sealed partial class Imd
 
         _imageInfo.MetadataMediaType = MetadataMediaType.BlockMedia;
 
-        AaruConsole.VerboseWriteLine(Localization.IMD_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.IMD_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
 
         if(!string.IsNullOrEmpty(_imageInfo.Comments))
-            AaruConsole.VerboseWriteLine(Localization.IMD_comments_0, _imageInfo.Comments);
+            AaruConsole.Verbose(Localization.IMD_comments_0, _imageInfo.Comments);
 
         return ErrorNumber.NoError;
     }
diff --git a/Aaru.Images/KryoFlux/Read.cs b/Aaru.Images/KryoFlux/Read.cs
index 5c107e961..e6640bea8 100644
--- a/Aaru.Images/KryoFlux/Read.cs
+++ b/Aaru.Images/KryoFlux/Read.cs
@@ -96,7 +96,7 @@ public sealed partial class KryoFlux
                 switch(cylinder)
                 {
                     case 0 when head == 0:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Cannot_find_cyl_0_hd_0_supposing_only_top_head_was_dumped);
 
@@ -105,7 +105,7 @@ public sealed partial class KryoFlux
 
                         continue;
                     case 0:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Cannot_find_cyl_0_hd_1_supposing_only_bottom_head_was_dumped);
 
@@ -113,7 +113,7 @@ public sealed partial class KryoFlux
 
                         continue;
                     case 1:
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Cannot_find_cyl_1_supposing_double_stepping);
 
                         step = 2;
@@ -121,7 +121,7 @@ public sealed partial class KryoFlux
                         continue;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Arrived_end_of_disk_at_cylinder_0, cylinder);
+                AaruConsole.Debug(MODULE_NAME, Localization.Arrived_end_of_disk_at_cylinder_0, cylinder);
 
                 break;
             }
@@ -183,7 +183,7 @@ public sealed partial class KryoFlux
                         {
                             kvp[0] = kvp[0].Trim();
                             kvp[1] = kvp[1].Trim();
-                            AaruConsole.DebugWriteLine(MODULE_NAME, "\"{0}\" = \"{1}\"", kvp[0], kvp[1]);
+                            AaruConsole.Debug(MODULE_NAME, "\"{0}\" = \"{1}\"", kvp[0], kvp[1]);
 
                             switch(kvp[0])
                             {
@@ -224,7 +224,7 @@ public sealed partial class KryoFlux
                                                               blockTime.Minute,
                                                               blockTime.Second);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_timestamp_0, blockTimestamp);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Found_timestamp_0, blockTimestamp);
 
                             if(blockTimestamp < Info.CreationTime) _imageInfo.CreationTime = blockTimestamp;
 
@@ -262,7 +262,7 @@ public sealed partial class KryoFlux
         _imageInfo.Heads     = heads;
         _imageInfo.Cylinders = (uint)(tracks.Count / heads);
 
-        AaruConsole.ErrorWriteLine(Localization.Flux_decoding_is_not_yet_implemented);
+        AaruConsole.Error(Localization.Flux_decoding_is_not_yet_implemented);
 
         return ErrorNumber.NotImplemented;
     }
diff --git a/Aaru.Images/MaxiDisk/Identify.cs b/Aaru.Images/MaxiDisk/Identify.cs
index e046c01fe..4942ecc35 100644
--- a/Aaru.Images/MaxiDisk/Identify.cs
+++ b/Aaru.Images/MaxiDisk/Identify.cs
@@ -54,16 +54,16 @@ public sealed partial class MaxiDisk
 
         Header tmpHeader = Marshal.ByteArrayToStructureLittleEndian<Header>(buffer);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.unknown = {0}",        tmpHeader.unknown);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.diskType = {0}",       tmpHeader.diskType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.heads = {0}",          tmpHeader.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.cylinders = {0}",      tmpHeader.cylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.bytesPerSector = {0}", tmpHeader.bytesPerSector);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.unknown = {0}",        tmpHeader.unknown);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.diskType = {0}",       tmpHeader.diskType);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.heads = {0}",          tmpHeader.heads);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.cylinders = {0}",      tmpHeader.cylinders);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.bytesPerSector = {0}", tmpHeader.bytesPerSector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.sectorsPerTrack = {0}", tmpHeader.sectorsPerTrack);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.sectorsPerTrack = {0}", tmpHeader.sectorsPerTrack);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.unknown2 = {0}", tmpHeader.unknown2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "tmp_header.unknown3 = {0}", tmpHeader.unknown3);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.unknown2 = {0}", tmpHeader.unknown2);
+        AaruConsole.Debug(MODULE_NAME, "tmp_header.unknown3 = {0}", tmpHeader.unknown3);
 
         // This is hardcoded
         // But its possible values are unknown...
diff --git a/Aaru.Images/MaxiDisk/Write.cs b/Aaru.Images/MaxiDisk/Write.cs
index 1298f26b0..e9cf70ff7 100644
--- a/Aaru.Images/MaxiDisk/Write.cs
+++ b/Aaru.Images/MaxiDisk/Write.cs
@@ -105,7 +105,7 @@ public sealed partial class MaxiDisk
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/NDIF/Read.cs b/Aaru.Images/NDIF/Read.cs
index 21ca2e1d6..a15e810e6 100644
--- a/Aaru.Images/NDIF/Read.cs
+++ b/Aaru.Images/NDIF/Read.cs
@@ -73,8 +73,8 @@ public sealed partial class Ndif
         }
         catch(InvalidCastException ex)
         {
-            AaruConsole.ErrorWriteLine(Localization.Exception_trying_to_open_image_file_0, imageFilter.BasePath);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Localization.Exception_trying_to_open_image_file_0, imageFilter.BasePath);
+            AaruConsole.Exception(ex);
 
             return ErrorNumber.UnexpectedException;
         }
@@ -87,30 +87,30 @@ public sealed partial class Ndif
 
             _header = Marshal.ByteArrayToStructureBigEndian<ChunkHeader>(bcem);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.type = {0}",   _header.version);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.driver = {0}", _header.driver);
+            AaruConsole.Debug(MODULE_NAME, "footer.type = {0}",   _header.version);
+            AaruConsole.Debug(MODULE_NAME, "footer.driver = {0}", _header.driver);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "footer.name = {0}",
                                        StringHandlers.PascalToString(_header.name, Encoding.GetEncoding("macintosh")));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.sectors = {0}", _header.sectors);
+            AaruConsole.Debug(MODULE_NAME, "footer.sectors = {0}", _header.sectors);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.maxSectorsPerChunk = {0}", _header.maxSectorsPerChunk);
+            AaruConsole.Debug(MODULE_NAME, "footer.maxSectorsPerChunk = {0}", _header.maxSectorsPerChunk);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.dataOffset = {0}",      _header.dataOffset);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.crc = 0x{0:X7}",        _header.crc);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.segmented = {0}",       _header.segmented);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.p1 = 0x{0:X8}",         _header.p1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.p2 = 0x{0:X8}",         _header.p2);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.unknown[0] = 0x{0:X8}", _header.unknown[0]);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.unknown[1] = 0x{0:X8}", _header.unknown[1]);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.unknown[2] = 0x{0:X8}", _header.unknown[2]);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.unknown[3] = 0x{0:X8}", _header.unknown[3]);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.unknown[4] = 0x{0:X8}", _header.unknown[4]);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.encrypted = {0}",       _header.encrypted);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.hash = 0x{0:X8}",       _header.hash);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footer.chunks = {0}",          _header.chunks);
+            AaruConsole.Debug(MODULE_NAME, "footer.dataOffset = {0}",      _header.dataOffset);
+            AaruConsole.Debug(MODULE_NAME, "footer.crc = 0x{0:X7}",        _header.crc);
+            AaruConsole.Debug(MODULE_NAME, "footer.segmented = {0}",       _header.segmented);
+            AaruConsole.Debug(MODULE_NAME, "footer.p1 = 0x{0:X8}",         _header.p1);
+            AaruConsole.Debug(MODULE_NAME, "footer.p2 = 0x{0:X8}",         _header.p2);
+            AaruConsole.Debug(MODULE_NAME, "footer.unknown[0] = 0x{0:X8}", _header.unknown[0]);
+            AaruConsole.Debug(MODULE_NAME, "footer.unknown[1] = 0x{0:X8}", _header.unknown[1]);
+            AaruConsole.Debug(MODULE_NAME, "footer.unknown[2] = 0x{0:X8}", _header.unknown[2]);
+            AaruConsole.Debug(MODULE_NAME, "footer.unknown[3] = 0x{0:X8}", _header.unknown[3]);
+            AaruConsole.Debug(MODULE_NAME, "footer.unknown[4] = 0x{0:X8}", _header.unknown[4]);
+            AaruConsole.Debug(MODULE_NAME, "footer.encrypted = {0}",       _header.encrypted);
+            AaruConsole.Debug(MODULE_NAME, "footer.hash = 0x{0:X8}",       _header.hash);
+            AaruConsole.Debug(MODULE_NAME, "footer.chunks = {0}",          _header.chunks);
 
             // Block chunks and headers
             _chunks = new Dictionary<ulong, BlockChunk>();
@@ -127,10 +127,10 @@ public sealed partial class Ndif
                 bChnk.offset = BigEndianBitConverter.ToUInt32(bcem, 128 + 4 + i * 12);
                 bChnk.length = BigEndianBitConverter.ToUInt32(bcem, 128 + 8 + i * 12);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunk[{0}].type = 0x{1:X2}", i, bChnk.type);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunk[{0}].sector = {1}",    i, bChnk.sector);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunk[{0}].offset = {1}",    i, bChnk.offset);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunk[{0}].length = {1}",    i, bChnk.length);
+                AaruConsole.Debug(MODULE_NAME, "bHdr.chunk[{0}].type = 0x{1:X2}", i, bChnk.type);
+                AaruConsole.Debug(MODULE_NAME, "bHdr.chunk[{0}].sector = {1}",    i, bChnk.sector);
+                AaruConsole.Debug(MODULE_NAME, "bHdr.chunk[{0}].offset = {1}",    i, bChnk.offset);
+                AaruConsole.Debug(MODULE_NAME, "bHdr.chunk[{0}].length = {1}",    i, bChnk.length);
 
                 if(bChnk.type == CHUNK_TYPE_END) break;
 
@@ -141,15 +141,15 @@ public sealed partial class Ndif
                 switch(bChnk.type)
                 {
                     case CHUNK_TYPE_KENCODE:
-                        AaruConsole.ErrorWriteLine(Localization.Chunks_compressed_with_KenCode_are_not_yet_supported);
+                        AaruConsole.Error(Localization.Chunks_compressed_with_KenCode_are_not_yet_supported);
 
                         return ErrorNumber.NotImplemented;
                     case CHUNK_TYPE_LZH:
-                        AaruConsole.ErrorWriteLine(Localization.Chunks_compressed_with_LZH_are_not_yet_supported);
+                        AaruConsole.Error(Localization.Chunks_compressed_with_LZH_are_not_yet_supported);
 
                         return ErrorNumber.NotImplemented;
                     case CHUNK_TYPE_STUFFIT:
-                        AaruConsole.ErrorWriteLine(Localization.Chunks_compressed_with_StuffIt_are_not_yet_supported);
+                        AaruConsole.Error(Localization.Chunks_compressed_with_StuffIt_are_not_yet_supported);
 
                         return ErrorNumber.NotImplemented;
                 }
@@ -160,7 +160,7 @@ public sealed partial class Ndif
                               or > CHUNK_TYPE_STUFFIT and < CHUNK_TYPE_END
                               or 1)
                 {
-                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_chunk_type_0_found, bChnk.type));
+                    AaruConsole.Error(string.Format(Localization.Unsupported_chunk_type_0_found, bChnk.type));
 
                     return ErrorNumber.InvalidArgument;
                 }
@@ -173,14 +173,14 @@ public sealed partial class Ndif
 
         if(_header.segmented > 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.Segmented_images_are_not_yet_supported);
+            AaruConsole.Error(Localization.Segmented_images_are_not_yet_supported);
 
             return ErrorNumber.NotImplemented;
         }
 
         if(_header.encrypted > 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.Encrypted_images_are_not_yet_supported);
+            AaruConsole.Error(Localization.Encrypted_images_are_not_yet_supported);
 
             return ErrorNumber.NotImplemented;
         }
@@ -237,7 +237,7 @@ public sealed partial class Ndif
             }
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Image_application_0_version_1,
                                    _imageInfo.Application,
                                    _imageInfo.ApplicationVersion);
diff --git a/Aaru.Images/NHDr0/Identify.cs b/Aaru.Images/NHDr0/Identify.cs
index 0afe04c2b..a7e537e8a 100644
--- a/Aaru.Images/NHDr0/Identify.cs
+++ b/Aaru.Images/NHDr0/Identify.cs
@@ -61,21 +61,21 @@ public sealed partial class Nhdr0
 
         if(!_nhdhdr.szFileID.SequenceEqual(_signature)) return false;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "nhdhdr.szFileID = \"{0}\"",
                                    StringHandlers.CToString(_nhdhdr.szFileID, shiftjis));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "nhdhdr.reserved1 = {0}", _nhdhdr.reserved1);
+        AaruConsole.Debug(MODULE_NAME, "nhdhdr.reserved1 = {0}", _nhdhdr.reserved1);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "nhdhdr.szComment = \"{0}\"",
                                    StringHandlers.CToString(_nhdhdr.szComment, shiftjis));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "nhdhdr.dwHeadSize = {0}", _nhdhdr.dwHeadSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "nhdhdr.dwCylinder = {0}", _nhdhdr.dwCylinder);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "nhdhdr.wHead = {0}",      _nhdhdr.wHead);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "nhdhdr.wSect = {0}",      _nhdhdr.wSect);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "nhdhdr.wSectLen = {0}",   _nhdhdr.wSectLen);
+        AaruConsole.Debug(MODULE_NAME, "nhdhdr.dwHeadSize = {0}", _nhdhdr.dwHeadSize);
+        AaruConsole.Debug(MODULE_NAME, "nhdhdr.dwCylinder = {0}", _nhdhdr.dwCylinder);
+        AaruConsole.Debug(MODULE_NAME, "nhdhdr.wHead = {0}",      _nhdhdr.wHead);
+        AaruConsole.Debug(MODULE_NAME, "nhdhdr.wSect = {0}",      _nhdhdr.wSect);
+        AaruConsole.Debug(MODULE_NAME, "nhdhdr.wSectLen = {0}",   _nhdhdr.wSectLen);
 
         return true;
     }
diff --git a/Aaru.Images/NHDr0/Write.cs b/Aaru.Images/NHDr0/Write.cs
index 829f7ff6b..50dda0c36 100644
--- a/Aaru.Images/NHDr0/Write.cs
+++ b/Aaru.Images/NHDr0/Write.cs
@@ -80,7 +80,7 @@ public sealed partial class Nhdr0
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/Nero/Identify.cs b/Aaru.Images/Nero/Identify.cs
index 3cd07154e..3a2a0c075 100644
--- a/Aaru.Images/Nero/Identify.cs
+++ b/Aaru.Images/Nero/Identify.cs
@@ -60,11 +60,11 @@ public sealed partial class Nero
         footerV2.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
         footerV2.FirstChunkOffset = BigEndianBitConverter.ToUInt64(buffer, 4);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "imageStream.Length = {0}",        _imageStream.Length);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footerV1.ChunkID = 0x{0:X8}",     footerV1.ChunkId);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footerV2.ChunkID = 0x{0:X8}",     footerV2.ChunkId);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
+        AaruConsole.Debug(MODULE_NAME, "imageStream.Length = {0}",        _imageStream.Length);
+        AaruConsole.Debug(MODULE_NAME, "footerV1.ChunkID = 0x{0:X8}",     footerV1.ChunkId);
+        AaruConsole.Debug(MODULE_NAME, "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
+        AaruConsole.Debug(MODULE_NAME, "footerV2.ChunkID = 0x{0:X8}",     footerV2.ChunkId);
+        AaruConsole.Debug(MODULE_NAME, "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
 
         if(footerV2.ChunkId == NERO_FOOTER_V2 && footerV2.FirstChunkOffset < (ulong)_imageStream.Length) return true;
 
diff --git a/Aaru.Images/Nero/Read.cs b/Aaru.Images/Nero/Read.cs
index 0f96867cc..f1b9f1657 100644
--- a/Aaru.Images/Nero/Read.cs
+++ b/Aaru.Images/Nero/Read.cs
@@ -71,21 +71,21 @@ public sealed partial class Nero
             footerV2.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
             footerV2.FirstChunkOffset = BigEndianBitConverter.ToUInt64(buffer, 4);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "imageStream.Length = {0}", _imageStream.Length);
+            AaruConsole.Debug(MODULE_NAME, "imageStream.Length = {0}", _imageStream.Length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "footerV1.ChunkID = 0x{0:X8} (\"{1}\")",
                                        footerV1.ChunkId,
                                        Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(footerV1.ChunkId)));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
+            AaruConsole.Debug(MODULE_NAME, "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "footerV2.ChunkID = 0x{0:X8} (\"{1}\")",
                                        footerV2.ChunkId,
                                        Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(footerV2.ChunkId)));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
+            AaruConsole.Debug(MODULE_NAME, "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
 
             // Check footer version
             if(footerV1.ChunkId == NERO_FOOTER_V1 && footerV1.FirstChunkOffset < (ulong)_imageStream.Length)
@@ -94,7 +94,7 @@ public sealed partial class Nero
                 _imageNewFormat = true;
             else
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Nero_version_not_recognized);
+                AaruConsole.Debug(MODULE_NAME, Localization.Nero_version_not_recognized);
 
                 return ErrorNumber.NotSupported;
             }
@@ -128,18 +128,18 @@ public sealed partial class Nero
                 uint chunkId     = BigEndianBitConverter.ToUInt32(chunkHeaderBuffer, 0);
                 uint chunkLength = BigEndianBitConverter.ToUInt32(chunkHeaderBuffer, 4);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "ChunkID = 0x{0:X8} (\"{1}\")",
                                            chunkId,
                                            Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(chunkId)));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "ChunkLength = {0}", chunkLength);
+                AaruConsole.Debug(MODULE_NAME, "ChunkLength = {0}", chunkLength);
 
                 switch(chunkId)
                 {
                     case NERO_CUE_V1:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_CUES_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -165,39 +165,39 @@ public sealed partial class Nero
                             entry.Second      = (byte)(((tmpBuffer[6] & 0xF0) >> 4) * 10 + (tmpBuffer[6] & 0xF));
                             entry.Frame       = (byte)(((tmpBuffer[7] & 0xF0) >> 4) * 10 + (tmpBuffer[7] & 0xF));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Cuesheet_entry_0, i / 8 + 1);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Cuesheet_entry_0, i / 8 + 1);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Mode = {1:X2}",
                                                        i / 8 + 1,
                                                        entry.Mode);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].TrackNumber = {1:X2}",
                                                        i / 8 + 1,
                                                        entry.TrackNumber);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].IndexNumber = {1:X2}",
                                                        i / 8 + 1,
                                                        entry.IndexNumber);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Dummy = {1:X4}",
                                                        i / 8 + 1,
                                                        entry.Dummy);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Minute = {1:X2}",
                                                        i / 8 + 1,
                                                        entry.Minute);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Second = {1:X2}",
                                                        i / 8 + 1,
                                                        entry.Second);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Frame = {1:X2}",
                                                        i / 8 + 1,
                                                        entry.Frame);
@@ -215,7 +215,7 @@ public sealed partial class Nero
 
                     case NERO_CUE_V2:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_CUEX_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -238,29 +238,29 @@ public sealed partial class Nero
                             entry.Dummy       = tmpBuffer[3];
                             entry.LbaStart    = BigEndianBitConverter.ToInt32(tmpBuffer, 4);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Cuesheet_entry_0, i / 8 + 1);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Cuesheet_entry_0, i / 8 + 1);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Mode = 0x{1:X2}",
                                                        i / 8 + 1,
                                                        entry.Mode);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].TrackNumber = {1:X2}",
                                                        i / 8 + 1,
                                                        entry.TrackNumber);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].IndexNumber = {1:X2}",
                                                        i / 8 + 1,
                                                        entry.IndexNumber);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Dummy = {1:X2}",
                                                        i / 8 + 1,
                                                        entry.Dummy);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].LBAStart = {1}",
                                                        i / 8 + 1,
                                                        entry.LbaStart);
@@ -278,7 +278,7 @@ public sealed partial class Nero
 
                     case NERO_DAO_V1:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_DAOI_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -298,19 +298,19 @@ public sealed partial class Nero
                         _neroDaov1.LastTrack  = tmpBuffer[21];
                         _neroDaov1.Tracks     = [];
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "neroDAOV1.ChunkSizeLe = {0} bytes",
                                                    _neroDaov1.ChunkSizeLe);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "neroDAOV1.UPC = \"{0}\"",
                                                    StringHandlers.CToString(_neroDaov1.Upc));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "neroDAOV1.TocType = 0x{0:X4}", _neroDaov1.TocType);
+                        AaruConsole.Debug(MODULE_NAME, "neroDAOV1.TocType = 0x{0:X4}", _neroDaov1.TocType);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "neroDAOV1.FirstTrack = {0}", _neroDaov1.FirstTrack);
+                        AaruConsole.Debug(MODULE_NAME, "neroDAOV1.FirstTrack = {0}", _neroDaov1.FirstTrack);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "neroDAOV1.LastTrack = {0}", _neroDaov1.LastTrack);
+                        AaruConsole.Debug(MODULE_NAME, "neroDAOV1.LastTrack = {0}", _neroDaov1.LastTrack);
 
                         _upc = _neroDaov1.Upc;
 
@@ -347,40 +347,40 @@ public sealed partial class Nero
                                 }
                             }
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_At_Once_entry_0, i / 32 + 1);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Disc_At_Once_entry_0, i / 32 + 1);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].ISRC = \"{1}\"",
                                                        i / 32 + 1,
                                                        StringHandlers.CToString(entry.Isrc));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].SectorSize = {1}",
                                                        i / 32 + 1,
                                                        entry.SectorSize);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Mode = {1} (0x{2:X4})",
                                                        i / 32 + 1,
                                                        (DaoMode)entry.Mode,
                                                        entry.Mode);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Unknown = 0x{1:X4}",
                                                        i / 32 + 1,
                                                        entry.Unknown);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Index0 = {1}",
                                                        i / 32 + 1,
                                                        entry.Index0);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Index1 = {1}",
                                                        i / 32 + 1,
                                                        entry.Index1);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].EndOfTrack = {1}",
                                                        i / 32 + 1,
                                                        entry.EndOfTrack);
@@ -413,7 +413,7 @@ public sealed partial class Nero
 
                     case NERO_DAO_V2:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_DAOX_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -435,19 +435,19 @@ public sealed partial class Nero
 
                         _upc = _neroDaov2.Upc;
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "neroDAOV2.ChunkSizeLe = {0} bytes",
                                                    _neroDaov2.ChunkSizeLe);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "neroDAOV2.UPC = \"{0}\"",
                                                    StringHandlers.CToString(_neroDaov2.Upc));
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "neroDAOV2.TocType = 0x{0:X4}", _neroDaov2.TocType);
+                        AaruConsole.Debug(MODULE_NAME, "neroDAOV2.TocType = 0x{0:X4}", _neroDaov2.TocType);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "neroDAOV2.FirstTrack = {0}", _neroDaov2.FirstTrack);
+                        AaruConsole.Debug(MODULE_NAME, "neroDAOV2.FirstTrack = {0}", _neroDaov2.FirstTrack);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "neroDAOV2.LastTrack = {0}", _neroDaov2.LastTrack);
+                        AaruConsole.Debug(MODULE_NAME, "neroDAOV2.LastTrack = {0}", _neroDaov2.LastTrack);
 
                         tmpBuffer = new byte[42];
 
@@ -482,40 +482,40 @@ public sealed partial class Nero
                                 }
                             }
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Disc_At_Once_entry_0, i / 32 + 1);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Disc_At_Once_entry_0, i / 32 + 1);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].ISRC = \"{1}\"",
                                                        i / 32 + 1,
                                                        StringHandlers.CToString(entry.Isrc));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].SectorSize = {1}",
                                                        i / 32 + 1,
                                                        entry.SectorSize);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Mode = {1} (0x{2:X4})",
                                                        i / 32 + 1,
                                                        (DaoMode)entry.Mode,
                                                        entry.Mode);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Unknown = {1:X2}",
                                                        i / 32 + 1,
                                                        entry.Unknown);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Index0 = {1}",
                                                        i / 32 + 1,
                                                        entry.Index0);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Index1 = {1}",
                                                        i / 32 + 1,
                                                        entry.Index1);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].EndOfTrack = {1}",
                                                        i / 32 + 1,
                                                        entry.EndOfTrack);
@@ -549,7 +549,7 @@ public sealed partial class Nero
 
                     case NERO_CDTEXT:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_CDTX_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -575,34 +575,34 @@ public sealed partial class Nero
                             Array.Copy(tmpBuffer, 4, entry.Text, 0, 12);
                             entry.Crc = BigEndianBitConverter.ToUInt16(tmpBuffer, 16);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.CD_TEXT_entry_0, i / 18 + 1);
+                            AaruConsole.Debug(MODULE_NAME, Localization.CD_TEXT_entry_0, i / 18 + 1);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].PackType = 0x{1:X2}",
                                                        i / 18 + 1,
                                                        entry.PackType);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].TrackNumber = 0x{1:X2}",
                                                        i / 18 + 1,
                                                        entry.TrackNumber);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].PackNumber = 0x{1:X2}",
                                                        i / 18 + 1,
                                                        entry.PackNumber);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].BlockNumber = 0x{1:X2}",
                                                        i / 18 + 1,
                                                        entry.BlockNumber);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Text = \"{1}\"",
                                                        i / 18 + 1,
                                                        StringHandlers.CToString(entry.Text));
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].CRC = 0x{1:X4}",
                                                        i / 18 + 1,
                                                        entry.Crc);
@@ -615,7 +615,7 @@ public sealed partial class Nero
 
                     case NERO_TAO_V0:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_TINF_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -639,19 +639,19 @@ public sealed partial class Nero
                             entry.Length = BigEndianBitConverter.ToUInt32(tmpBuffer, 4);
                             entry.Mode   = BigEndianBitConverter.ToUInt32(tmpBuffer, 8);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Track_at_Once_entry_0, i / 20 + 1);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Track_at_Once_entry_0, i / 20 + 1);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Offset = {1}",
                                                        i / 20 + 1,
                                                        entry.Offset);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Length = {1} bytes",
                                                        i / 20 + 1,
                                                        entry.Length);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Mode = {1} (0x{2:X4})",
                                                        i / 20 + 1,
                                                        (DaoMode)entry.Mode,
@@ -688,7 +688,7 @@ public sealed partial class Nero
 
                     case NERO_TAO_V1:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_ETNF_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -712,30 +712,30 @@ public sealed partial class Nero
                             entry.StartLba = BigEndianBitConverter.ToUInt32(tmpBuffer, 12);
                             entry.Unknown  = BigEndianBitConverter.ToUInt32(tmpBuffer, 16);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Track_at_Once_entry_0, i / 20 + 1);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Track_at_Once_entry_0, i / 20 + 1);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Offset = {1}",
                                                        i / 20 + 1,
                                                        entry.Offset);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Length = {1} bytes",
                                                        i / 20 + 1,
                                                        entry.Length);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Mode = {1} (0x{2:X4})",
                                                        i / 20 + 1,
                                                        (DaoMode)entry.Mode,
                                                        entry.Mode);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].StartLBA = {1}",
                                                        i / 20 + 1,
                                                        entry.StartLba);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Unknown = 0x{1:X4}",
                                                        i / 20 + 1,
                                                        entry.Unknown);
@@ -770,7 +770,7 @@ public sealed partial class Nero
 
                     case NERO_TAO_V2:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_ETN2_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -795,35 +795,35 @@ public sealed partial class Nero
                             entry.Unknown  = BigEndianBitConverter.ToUInt32(tmpBuffer, 24);
                             entry.Sectors  = BigEndianBitConverter.ToUInt32(tmpBuffer, 28);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Track_at_Once_entry_0, i / 32 + 1);
+                            AaruConsole.Debug(MODULE_NAME, Localization.Track_at_Once_entry_0, i / 32 + 1);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Offset = {1}",
                                                        i / 32 + 1,
                                                        entry.Offset);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Length = {1} bytes",
                                                        i / 32 + 1,
                                                        entry.Length);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Mode = {1} (0x{2:X4})",
                                                        i / 32 + 1,
                                                        (DaoMode)entry.Mode,
                                                        entry.Mode);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].StartLBA = {1}",
                                                        i / 32 + 1,
                                                        entry.StartLba);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Unknown = 0x{1:X4}",
                                                        i / 32 + 1,
                                                        entry.Unknown);
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        "\t _entry[{0}].Sectors = {1}",
                                                        i / 32 + 1,
                                                        entry.Sectors);
@@ -867,7 +867,7 @@ public sealed partial class Nero
 
                     case NERO_SESSION:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_SINF_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -876,7 +876,7 @@ public sealed partial class Nero
                         uint sessionTracks = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
                         _neroSessions.Add(currentSession, sessionTracks);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "\t" + Localization.Session_0_has_1_tracks,
                                                    currentSession,
                                                    sessionTracks);
@@ -888,7 +888,7 @@ public sealed partial class Nero
 
                     case NERO_DISC_TYPE:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_MTYP_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -902,7 +902,7 @@ public sealed partial class Nero
                         _imageStream.EnsureRead(tmpBuffer, 0, 4);
                         _mediaType.Type = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "\t" + Localization.Media_type_is_0_1,
                                                    (NeroMediaTypes)_mediaType.Type,
                                                    _mediaType.Type);
@@ -914,7 +914,7 @@ public sealed partial class Nero
 
                     case NERO_DISC_INFO:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_DINF_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -928,7 +928,7 @@ public sealed partial class Nero
                         _imageStream.EnsureRead(tmpBuffer, 0, 4);
                         _discInfo.Unknown = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    "\tneroDiscInfo.Unknown = 0x{0:X4} ({0})",
                                                    _discInfo.Unknown);
 
@@ -937,7 +937,7 @@ public sealed partial class Nero
 
                     case NERO_RELOCATION:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_RELO_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -951,14 +951,14 @@ public sealed partial class Nero
                         _imageStream.EnsureRead(tmpBuffer, 0, 4);
                         _relo.Unknown = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "\tneroRELO.Unknown = 0x{0:X4} ({0})", _relo.Unknown);
+                        AaruConsole.Debug(MODULE_NAME, "\tneroRELO.Unknown = 0x{0:X4} ({0})", _relo.Unknown);
 
                         break;
                     }
 
                     case NERO_TOC:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Found_TOCT_chunk_parsing_0_bytes,
                                                    chunkLength);
 
@@ -980,14 +980,14 @@ public sealed partial class Nero
                                                    _    => _imageInfo.MediaType
                                                };
 
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "\tneroTOC.Unknown = 0x{0:X4} ({0})", _toc.Unknown);
+                        AaruConsole.Debug(MODULE_NAME, "\tneroTOC.Unknown = 0x{0:X4} ({0})", _toc.Unknown);
 
                         break;
                     }
 
                     case NERO_END:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_END_chunk_finishing_parse);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Found_END_chunk_finishing_parse);
                         parsing = false;
 
                         break;
@@ -995,7 +995,7 @@ public sealed partial class Nero
 
                     default:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization.Unknown_chunk_ID_0_skipping,
                                                    Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(chunkId)));
 
@@ -1007,7 +1007,7 @@ public sealed partial class Nero
             }
 
             if(corruptedTrackMode)
-                AaruConsole.ErrorWriteLine(Localization.Inconsistent_track_mode_and_track_sector_size_found);
+                AaruConsole.Error(Localization.Inconsistent_track_mode_and_track_sector_size_found);
 
             _imageInfo.HasPartitions         = true;
             _imageInfo.HasSessions           = true;
@@ -1051,7 +1051,7 @@ public sealed partial class Nero
 
             if(_neroSessions.Count == 0) _neroSessions.Add(1, currentTrack);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Building_offset_track_and_session_maps);
+            AaruConsole.Debug(MODULE_NAME, Localization.Building_offset_track_and_session_maps);
 
             bool onlyOneSession = currentSession is 1 or 2;
             currentSession = 1;
@@ -1072,19 +1072,19 @@ public sealed partial class Nero
             {
                 if(neroTrack.Offset >= (_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset))
                 {
-                    AaruConsole.ErrorWriteLine(Localization
+                    AaruConsole.Error(Localization
                                                   .This_image_contains_a_track_that_is_set_to_start_outside_the_file);
 
-                    AaruConsole.ErrorWriteLine(Localization
+                    AaruConsole.Error(Localization
                                                   .Breaking_track_processing_and_trying_recovery_of_information);
 
                     break;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tcurrentSession = {0}",         currentSession);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\tcurrentSessionMaxTrack = {0}", currentSessionMaxTrack);
+                AaruConsole.Debug(MODULE_NAME, "\tcurrentSession = {0}",         currentSession);
+                AaruConsole.Debug(MODULE_NAME, "\tcurrentSessionMaxTrack = {0}", currentSessionMaxTrack);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\tcurrentSessionCurrentTrack = {0}",
                                            currentSessionCurrentTrack);
 
@@ -1256,16 +1256,16 @@ public sealed partial class Nero
                         break;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t _track.Description = {0}", track.Description);
+                AaruConsole.Debug(MODULE_NAME, "\t\t _track.Description = {0}", track.Description);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t _track.EndSector = {0}", track.EndSector);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t _track.Pregap = {0}",    track.Pregap);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t _track.Sequence = {0}",  track.Sequence);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t _track.Session = {0}",   track.Session);
+                AaruConsole.Debug(MODULE_NAME, "\t\t _track.EndSector = {0}", track.EndSector);
+                AaruConsole.Debug(MODULE_NAME, "\t\t _track.Pregap = {0}",    track.Pregap);
+                AaruConsole.Debug(MODULE_NAME, "\t\t _track.Sequence = {0}",  track.Sequence);
+                AaruConsole.Debug(MODULE_NAME, "\t\t _track.Session = {0}",   track.Session);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t _track.StartSector = {0}", track.StartSector);
+                AaruConsole.Debug(MODULE_NAME, "\t\t _track.StartSector = {0}", track.StartSector);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t _track.Type = {0}", track.Type);
+                AaruConsole.Debug(MODULE_NAME, "\t\t _track.Type = {0}", track.Type);
 
                 // Check readability of sector tags
                 if(rawMode1 || rawMode2)
@@ -1329,7 +1329,7 @@ public sealed partial class Nero
                 // Add to offset map
                 _offsetmap.Add(track.Sequence, track.StartSector);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t Offset[{0}]: {1}", track.Sequence, track.StartSector);
+                AaruConsole.Debug(MODULE_NAME, "\t\t Offset[{0}]: {1}", track.Sequence, track.StartSector);
 
                 // Create partition
                 var partition = new Partition
@@ -1361,7 +1361,7 @@ public sealed partial class Nero
                    _neroTracks[1].SectorSize !=
                    0)
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Image_corrupted_beyond_recovery_cannot_open);
+                    AaruConsole.Error(Localization.Image_corrupted_beyond_recovery_cannot_open);
 
                     return ErrorNumber.InvalidArgument;
                 }
@@ -1515,7 +1515,7 @@ public sealed partial class Nero
                     EndSector   = track.EndSector
                 });
 
-                AaruConsole.ErrorWriteLine(Localization.Warning_This_image_is_missing_the_last_150_sectors);
+                AaruConsole.Error(Localization.Warning_This_image_is_missing_the_last_150_sectors);
             }
 
             // MagicISO meets these conditions when disc contains more than 15 tracks and a single session
@@ -1604,7 +1604,7 @@ public sealed partial class Nero
             }
 
             _imageInfo.MetadataMediaType = MetadataMediaType.OpticalDisc;
-            AaruConsole.VerboseWriteLine(Localization.Nero_image_contains_a_disc_of_type_0, _imageInfo.MediaType);
+            AaruConsole.Verbose(Localization.Nero_image_contains_a_disc_of_type_0, _imageInfo.MediaType);
 
             _sectorBuilder = new SectorBuilder();
 
@@ -1665,7 +1665,7 @@ public sealed partial class Nero
         }
         catch
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Exception_occurred_opening_file);
+            AaruConsole.Debug(MODULE_NAME, Localization.Exception_occurred_opening_file);
 
             return ErrorNumber.UnexpectedException;
         }
diff --git a/Aaru.Images/Parallels/Read.cs b/Aaru.Images/Parallels/Read.cs
index 1c80e307a..d466a16c2 100644
--- a/Aaru.Images/Parallels/Read.cs
+++ b/Aaru.Images/Parallels/Read.cs
@@ -58,22 +58,22 @@ public sealed partial class Parallels
         stream.EnsureRead(pHdrB, 0, Marshal.SizeOf<Header>());
         _pHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.magic = {0}",        StringHandlers.CToString(_pHdr.magic));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.version = {0}",      _pHdr.version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.heads = {0}",        _pHdr.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.cylinders = {0}",    _pHdr.cylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.cluster_size = {0}", _pHdr.cluster_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.bat_entries = {0}",  _pHdr.bat_entries);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.sectors = {0}",      _pHdr.sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.in_use = 0x{0:X8}",  _pHdr.in_use);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.data_off = {0}",     _pHdr.data_off);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.flags = {0}",        _pHdr.flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.ext_off = {0}",      _pHdr.ext_off);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.magic = {0}",        StringHandlers.CToString(_pHdr.magic));
+        AaruConsole.Debug(MODULE_NAME, "pHdr.version = {0}",      _pHdr.version);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.heads = {0}",        _pHdr.heads);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.cylinders = {0}",    _pHdr.cylinders);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.cluster_size = {0}", _pHdr.cluster_size);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.bat_entries = {0}",  _pHdr.bat_entries);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.sectors = {0}",      _pHdr.sectors);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.in_use = 0x{0:X8}",  _pHdr.in_use);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.data_off = {0}",     _pHdr.data_off);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.flags = {0}",        _pHdr.flags);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.ext_off = {0}",      _pHdr.ext_off);
 
         _extended = _extMagic.SequenceEqual(_pHdr.magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.extended = {0}", _extended);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.extended = {0}", _extended);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_BAT);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_BAT);
         _bat = new uint[_pHdr.bat_entries];
         byte[] batB = new byte[_pHdr.bat_entries * 4];
         stream.EnsureRead(batB, 0, batB.Length);
diff --git a/Aaru.Images/Parallels/Write.cs b/Aaru.Images/Parallels/Write.cs
index 5231ad2d2..f012ae193 100644
--- a/Aaru.Images/Parallels/Write.cs
+++ b/Aaru.Images/Parallels/Write.cs
@@ -87,7 +87,7 @@ public sealed partial class Parallels
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/PartClone/Read.cs b/Aaru.Images/PartClone/Read.cs
index 1a5641702..ce73d04fa 100644
--- a/Aaru.Images/PartClone/Read.cs
+++ b/Aaru.Images/PartClone/Read.cs
@@ -59,37 +59,37 @@ public sealed partial class PartClone
         stream.EnsureRead(pHdrB, 0, Marshal.SizeOf<Header>());
         _pHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.magic = {0}", StringHandlers.CToString(_pHdr.magic));
+        AaruConsole.Debug(MODULE_NAME, "pHdr.magic = {0}", StringHandlers.CToString(_pHdr.magic));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.filesystem = {0}", StringHandlers.CToString(_pHdr.filesystem));
+        AaruConsole.Debug(MODULE_NAME, "pHdr.filesystem = {0}", StringHandlers.CToString(_pHdr.filesystem));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.version = {0}", StringHandlers.CToString(_pHdr.version));
+        AaruConsole.Debug(MODULE_NAME, "pHdr.version = {0}", StringHandlers.CToString(_pHdr.version));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.blockSize = {0}",   _pHdr.blockSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.deviceSize = {0}",  _pHdr.deviceSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.totalBlocks = {0}", _pHdr.totalBlocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.usedBlocks = {0}",  _pHdr.usedBlocks);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.blockSize = {0}",   _pHdr.blockSize);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.deviceSize = {0}",  _pHdr.deviceSize);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.totalBlocks = {0}", _pHdr.totalBlocks);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.usedBlocks = {0}",  _pHdr.usedBlocks);
 
         _byteMap = new byte[_pHdr.totalBlocks];
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_bytemap_0_bytes, _byteMap.Length);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_bytemap_0_bytes, _byteMap.Length);
         stream.EnsureRead(_byteMap, 0, _byteMap.Length);
 
         byte[] bitmagic = new byte[8];
         stream.EnsureRead(bitmagic, 0, 8);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.bitmagic = {0}", StringHandlers.CToString(bitmagic));
+        AaruConsole.Debug(MODULE_NAME, "pHdr.bitmagic = {0}", StringHandlers.CToString(bitmagic));
 
         if(!_biTmAgIc.SequenceEqual(bitmagic))
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_find_partclone_BiTmAgIc_not_continuing);
+            AaruConsole.Error(Localization.Could_not_find_partclone_BiTmAgIc_not_continuing);
 
             return ErrorNumber.InvalidArgument;
         }
 
         _dataOff = stream.Position;
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pHdr.dataOff = {0}", _dataOff);
+        AaruConsole.Debug(MODULE_NAME, "pHdr.dataOff = {0}", _dataOff);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Filling_extents);
+        AaruConsole.Debug(MODULE_NAME, Localization.Filling_extents);
         var extentFillStopwatch = new Stopwatch();
         extentFillStopwatch.Start();
         _extents    = new ExtentsULong();
@@ -124,7 +124,7 @@ public sealed partial class PartClone
 
         extentFillStopwatch.Stop();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Took_0_seconds_to_fill_extents,
                                    extentFillStopwatch.Elapsed.TotalSeconds);
 
diff --git a/Aaru.Images/Partimage/Read.cs b/Aaru.Images/Partimage/Read.cs
index 091041d05..359330047 100644
--- a/Aaru.Images/Partimage/Read.cs
+++ b/Aaru.Images/Partimage/Read.cs
@@ -61,22 +61,22 @@ public sealed partial class Partimage
         stream.EnsureRead(hdrB, 0, Marshal.SizeOf<Header>());
         _cVolumeHeader = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CVolumeHeader.magic = {0}",
                                    StringHandlers.CToString(_cVolumeHeader.magic));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CVolumeHeader.version = {0}",
                                    StringHandlers.CToString(_cVolumeHeader.version));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CVolumeHeader.volumeNumber = {0}", _cVolumeHeader.volumeNumber);
+        AaruConsole.Debug(MODULE_NAME, "CVolumeHeader.volumeNumber = {0}", _cVolumeHeader.volumeNumber);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CVolumeHeader.identificator = {0:X16}", _cVolumeHeader.identificator);
+        AaruConsole.Debug(MODULE_NAME, "CVolumeHeader.identificator = {0:X16}", _cVolumeHeader.identificator);
 
         // TODO: Support multifile volumes
         if(_cVolumeHeader.volumeNumber > 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.Support_for_multiple_volumes_not_supported);
+            AaruConsole.Error(Localization.Support_for_multiple_volumes_not_supported);
 
             return ErrorNumber.NotImplemented;
         }
@@ -85,78 +85,78 @@ public sealed partial class Partimage
         stream.EnsureRead(hdrB, 0, Marshal.SizeOf<MainHeader>());
         _cMainHeader = Marshal.ByteArrayToStructureLittleEndian<MainHeader>(hdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szFileSystem = {0}",
                                    StringHandlers.CToString(_cMainHeader.szFileSystem));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szPartDescription = {0}",
                                    StringHandlers.CToString(_cMainHeader.szPartDescription));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szOriginalDevice = {0}",
                                    StringHandlers.CToString(_cMainHeader.szOriginalDevice));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szFirstImageFilepath = {0}",
                                    StringHandlers.CToString(_cMainHeader.szFirstImageFilepath));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szUnameSysname = {0}",
                                    StringHandlers.CToString(_cMainHeader.szUnameSysname));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szUnameNodename = {0}",
                                    StringHandlers.CToString(_cMainHeader.szUnameNodename));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szUnameRelease = {0}",
                                    StringHandlers.CToString(_cMainHeader.szUnameRelease));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szUnameVersion = {0}",
                                    StringHandlers.CToString(_cMainHeader.szUnameVersion));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szUnameMachine = {0}",
                                    StringHandlers.CToString(_cMainHeader.szUnameMachine));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwCompression = {0} ({1})",
                                    _cMainHeader.dwCompression,
                                    (uint)_cMainHeader.dwCompression);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.dwMainFlags = {0}", _cMainHeader.dwMainFlags);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.dwMainFlags = {0}", _cMainHeader.dwMainFlags);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.dateCreate.tm_sec = {0}", _cMainHeader.dateCreate.Second);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.dateCreate.tm_sec = {0}", _cMainHeader.dateCreate.Second);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.dateCreate.tm_min = {0}", _cMainHeader.dateCreate.Minute);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.dateCreate.tm_min = {0}", _cMainHeader.dateCreate.Minute);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.dateCreate.tm_hour = {0}", _cMainHeader.dateCreate.Hour);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.dateCreate.tm_hour = {0}", _cMainHeader.dateCreate.Hour);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dateCreate.tm_mday = {0}",
                                    _cMainHeader.dateCreate.DayOfMonth);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.dateCreate.tm_mon = {0}", _cMainHeader.dateCreate.Month);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.dateCreate.tm_mon = {0}", _cMainHeader.dateCreate.Month);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.dateCreate.tm_year = {0}", _cMainHeader.dateCreate.Year);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.dateCreate.tm_year = {0}", _cMainHeader.dateCreate.Year);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dateCreate.tm_wday = {0}",
                                    _cMainHeader.dateCreate.DayOfWeek);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dateCreate.tm_yday = {0}",
                                    _cMainHeader.dateCreate.DayOfYear);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.dateCreate.tm_isdst = {0}", _cMainHeader.dateCreate.IsDst);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.dateCreate.tm_isdst = {0}", _cMainHeader.dateCreate.IsDst);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dateCreate.tm_gmtoffsec = {0}",
                                    _cMainHeader.dateCreate.GmtOff);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dateCreate.tm_zone = {0}",
                                    _cMainHeader.dateCreate.Timezone);
 
@@ -167,80 +167,80 @@ public sealed partial class Partimage
                                       (int)_cMainHeader.dateCreate.Minute,
                                       (int)_cMainHeader.dateCreate.Second);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.dateCreate = {0}", dateCreate);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.dateCreate = {0}", dateCreate);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.qwPartSize = {0}", _cMainHeader.qwPartSize);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.qwPartSize = {0}", _cMainHeader.qwPartSize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szHostname = {0}",
                                    StringHandlers.CToString(_cMainHeader.szHostname));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.szVersion = {0}",
                                    StringHandlers.CToString(_cMainHeader.szVersion));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.dwMbrCount = {0}", _cMainHeader.dwMbrCount);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.dwMbrSize = {0}",  _cMainHeader.dwMbrSize);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.dwMbrCount = {0}", _cMainHeader.dwMbrCount);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.dwMbrSize = {0}",  _cMainHeader.dwMbrSize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwEncryptAlgo = {0} ({1})",
                                    _cMainHeader.dwEncryptAlgo,
                                    (uint)_cMainHeader.dwEncryptAlgo);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ArrayIsNullOrEmpty(CMainHeader.cHashTestKey) = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(_cMainHeader.cHashTestKey));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwReservedFuture000 = {0}",
                                    _cMainHeader.dwReservedFuture000);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwReservedFuture001 = {0}",
                                    _cMainHeader.dwReservedFuture001);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwReservedFuture002 = {0}",
                                    _cMainHeader.dwReservedFuture002);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwReservedFuture003 = {0}",
                                    _cMainHeader.dwReservedFuture003);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwReservedFuture004 = {0}",
                                    _cMainHeader.dwReservedFuture004);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwReservedFuture005 = {0}",
                                    _cMainHeader.dwReservedFuture005);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwReservedFuture006 = {0}",
                                    _cMainHeader.dwReservedFuture006);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwReservedFuture007 = {0}",
                                    _cMainHeader.dwReservedFuture007);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwReservedFuture008 = {0}",
                                    _cMainHeader.dwReservedFuture008);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CMainHeader.dwReservedFuture009 = {0}",
                                    _cMainHeader.dwReservedFuture009);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ArrayIsNullOrEmpty(CMainHeader.cReserved) = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(_cMainHeader.cReserved));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CMainHeader.crc = 0x{0:X8}", _cMainHeader.crc);
+        AaruConsole.Debug(MODULE_NAME, "CMainHeader.crc = 0x{0:X8}", _cMainHeader.crc);
 
         // partimage 0.6.1 does not support them either
         if(_cMainHeader.dwEncryptAlgo != PEncryption.None)
         {
-            AaruConsole.ErrorWriteLine(Localization.Encrypted_images_are_not_yet_supported);
+            AaruConsole.Error(Localization.Encrypted_images_are_not_yet_supported);
 
             return ErrorNumber.NotImplemented;
         }
@@ -256,7 +256,7 @@ public sealed partial class Partimage
 
             if(!magic.Equals(MAGIC_BEGIN_MBRBACKUP))
             {
-                AaruConsole.ErrorWriteLine(Localization.Cannot_find_MBRs);
+                AaruConsole.Error(Localization.Cannot_find_MBRs);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -273,7 +273,7 @@ public sealed partial class Partimage
 
         if(!magic.Equals(MAGIC_BEGIN_LOCALHEADER))
         {
-            AaruConsole.ErrorWriteLine(Localization.Cannot_find_local_header);
+            AaruConsole.Error(Localization.Cannot_find_local_header);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -282,24 +282,24 @@ public sealed partial class Partimage
         stream.EnsureRead(hdrB, 0, Marshal.SizeOf<CLocalHeader>());
         CLocalHeader localHeader = Marshal.ByteArrayToStructureLittleEndian<CLocalHeader>(hdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CLocalHeader.qwBlockSize = {0}",  localHeader.qwBlockSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CLocalHeader.qwUsedBlocks = {0}", localHeader.qwUsedBlocks);
+        AaruConsole.Debug(MODULE_NAME, "CLocalHeader.qwBlockSize = {0}",  localHeader.qwBlockSize);
+        AaruConsole.Debug(MODULE_NAME, "CLocalHeader.qwUsedBlocks = {0}", localHeader.qwUsedBlocks);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CLocalHeader.qwBlocksCount = {0}", localHeader.qwBlocksCount);
+        AaruConsole.Debug(MODULE_NAME, "CLocalHeader.qwBlocksCount = {0}", localHeader.qwBlocksCount);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CLocalHeader.qwBitmapSize = {0}", localHeader.qwBitmapSize);
+        AaruConsole.Debug(MODULE_NAME, "CLocalHeader.qwBitmapSize = {0}", localHeader.qwBitmapSize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CLocalHeader.qwBadBlocksCount = {0}", localHeader.qwBadBlocksCount);
+        AaruConsole.Debug(MODULE_NAME, "CLocalHeader.qwBadBlocksCount = {0}", localHeader.qwBadBlocksCount);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "CLocalHeader.szLabel = {0}",
                                    StringHandlers.CToString(localHeader.szLabel));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "ArrayIsNullOrEmpty(CLocalHeader.cReserved) = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(localHeader.cReserved));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "CLocalHeader.crc = 0x{0:X8}", localHeader.crc);
+        AaruConsole.Debug(MODULE_NAME, "CLocalHeader.crc = 0x{0:X8}", localHeader.crc);
 
         hdrB = new byte[MAGIC_BEGIN_BITMAP.Length];
         stream.EnsureRead(hdrB, 0, MAGIC_BEGIN_BITMAP.Length);
@@ -307,7 +307,7 @@ public sealed partial class Partimage
 
         if(!magic.Equals(MAGIC_BEGIN_BITMAP))
         {
-            AaruConsole.ErrorWriteLine(Localization.Cannot_find_bitmap);
+            AaruConsole.Error(Localization.Cannot_find_bitmap);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -321,7 +321,7 @@ public sealed partial class Partimage
 
         if(!magic.Equals(MAGIC_BEGIN_INFO))
         {
-            AaruConsole.ErrorWriteLine(Localization.Cannot_find_info_block);
+            AaruConsole.Error(Localization.Cannot_find_info_block);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -335,14 +335,14 @@ public sealed partial class Partimage
 
         if(!magic.Equals(MAGIC_BEGIN_DATABLOCKS))
         {
-            AaruConsole.ErrorWriteLine(Localization.Cannot_find_data_blocks);
+            AaruConsole.Error(Localization.Cannot_find_data_blocks);
 
             return ErrorNumber.InvalidArgument;
         }
 
         _dataOff = stream.Position;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dataOff = {0}", _dataOff);
+        AaruConsole.Debug(MODULE_NAME, "dataOff = {0}", _dataOff);
 
         // Seek to tail
         stream.Seek(-(Marshal.SizeOf<CMainTail>() + MAGIC_BEGIN_TAIL.Length), SeekOrigin.End);
@@ -353,13 +353,13 @@ public sealed partial class Partimage
 
         if(!magic.Equals(MAGIC_BEGIN_TAIL))
         {
-            AaruConsole.ErrorWriteLine(Localization
+            AaruConsole.Error(Localization
                                           .Cannot_find_tail_Multiple_volumes_are_not_supported_or_image_is_corrupt);
 
             return ErrorNumber.InvalidArgument;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Filling_extents);
+        AaruConsole.Debug(MODULE_NAME, Localization.Filling_extents);
         var extentsFillStopwatch = new Stopwatch();
         extentsFillStopwatch.Start();
         _extents    = new ExtentsULong();
@@ -394,7 +394,7 @@ public sealed partial class Partimage
 
         extentsFillStopwatch.Stop();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Took_0_seconds_to_fill_extents,
                                    extentsFillStopwatch.Elapsed.TotalSeconds);
 
diff --git a/Aaru.Images/QCOW/Read.cs b/Aaru.Images/QCOW/Read.cs
index 6bd61c1a2..9b990cc77 100644
--- a/Aaru.Images/QCOW/Read.cs
+++ b/Aaru.Images/QCOW/Read.cs
@@ -61,35 +61,35 @@ public sealed partial class Qcow
         stream.EnsureRead(qHdrB, 0, 48);
         _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.magic = 0x{0:X8}",          _qHdr.magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.version = {0}",             _qHdr.version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.backing_file_offset = {0}", _qHdr.backing_file_offset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.backing_file_size = {0}",   _qHdr.backing_file_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.mtime = {0}",               _qHdr.mtime);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.size = {0}",                _qHdr.size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.cluster_bits = {0}",        _qHdr.cluster_bits);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l2_bits = {0}",             _qHdr.l2_bits);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.padding = {0}",             _qHdr.padding);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.crypt_method = {0}",        _qHdr.crypt_method);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1_table_offset = {0}",     _qHdr.l1_table_offset);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.magic = 0x{0:X8}",          _qHdr.magic);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.version = {0}",             _qHdr.version);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.backing_file_offset = {0}", _qHdr.backing_file_offset);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.backing_file_size = {0}",   _qHdr.backing_file_size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.mtime = {0}",               _qHdr.mtime);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.size = {0}",                _qHdr.size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.cluster_bits = {0}",        _qHdr.cluster_bits);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l2_bits = {0}",             _qHdr.l2_bits);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.padding = {0}",             _qHdr.padding);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.crypt_method = {0}",        _qHdr.crypt_method);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1_table_offset = {0}",     _qHdr.l1_table_offset);
 
         if(_qHdr.size <= 1)
         {
-            AaruConsole.ErrorWriteLine(Localization.Image_size_is_too_small);
+            AaruConsole.Error(Localization.Image_size_is_too_small);
 
             return ErrorNumber.InvalidArgument;
         }
 
         if(_qHdr.cluster_bits is < 9 or > 16)
         {
-            AaruConsole.ErrorWriteLine(Localization.Cluster_size_must_be_between_512_bytes_and_64_Kbytes);
+            AaruConsole.Error(Localization.Cluster_size_must_be_between_512_bytes_and_64_Kbytes);
 
             return ErrorNumber.InvalidArgument;
         }
 
         if(_qHdr.l2_bits is < 9 - 3 or > 16 - 3)
         {
-            AaruConsole.ErrorWriteLine(Localization.L2_size_must_be_between_512_bytes_and_64_Kbytes);
+            AaruConsole.Error(Localization.L2_size_must_be_between_512_bytes_and_64_Kbytes);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -97,18 +97,18 @@ public sealed partial class Qcow
         switch(_qHdr.crypt_method)
         {
             case > QCOW_ENCRYPTION_AES:
-                AaruConsole.ErrorWriteLine(Localization.Invalid_encryption_method);
+                AaruConsole.Error(Localization.Invalid_encryption_method);
 
                 return ErrorNumber.InvalidArgument;
             case > QCOW_ENCRYPTION_NONE:
-                AaruConsole.ErrorWriteLine(Localization.AES_encrypted_images_not_yet_supported);
+                AaruConsole.Error(Localization.AES_encrypted_images_not_yet_supported);
 
                 return ErrorNumber.NotImplemented;
         }
 
         if(_qHdr.backing_file_offset != 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.Differencing_images_not_yet_supported);
+            AaruConsole.Error(Localization.Differencing_images_not_yet_supported);
 
             return ErrorNumber.NotImplemented;
         }
@@ -117,7 +117,7 @@ public sealed partial class Qcow
 
         if(_qHdr.size > ulong.MaxValue - (ulong)(1 << shift))
         {
-            AaruConsole.ErrorWriteLine(Localization.Image_is_too_large);
+            AaruConsole.Error(Localization.Image_is_too_large);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -127,17 +127,17 @@ public sealed partial class Qcow
         _l1Size         = (uint)(_qHdr.size + (ulong)(1 << shift) - 1 >> shift);
         _l2Size         = 1 << _qHdr.l2_bits;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.clusterSize = {0}",    _clusterSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.clusterSectors = {0}", _clusterSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1Size = {0}",         _l1Size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l2Size = {0}",         _l2Size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.sectors = {0}",        _imageInfo.Sectors);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.clusterSize = {0}",    _clusterSize);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.clusterSectors = {0}", _clusterSectors);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1Size = {0}",         _l1Size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l2Size = {0}",         _l2Size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.sectors = {0}",        _imageInfo.Sectors);
 
         byte[] l1TableB = new byte[_l1Size * 8];
         stream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
         stream.EnsureRead(l1TableB, 0, (int)_l1Size * 8);
         _l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_L1_table);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_L1_table);
 
         for(long i = 0; i < _l1Table.LongLength; i++) _l1Table[i] = Swapping.Swap(_l1Table[i]);
 
@@ -165,10 +165,10 @@ public sealed partial class Qcow
 
         for(int i = 0; i < _qHdr.cluster_bits; i++) _sectorMask = (_sectorMask << 1) + 1;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1Mask = {0:X}",     _l1Mask);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1Shift = {0}",      _l1Shift);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l2Mask = {0:X}",     _l2Mask);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.sectorMask = {0:X}", _sectorMask);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1Mask = {0:X}",     _l1Mask);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1Shift = {0}",      _l1Shift);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l2Mask = {0:X}",     _l2Mask);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.sectorMask = {0:X}", _sectorMask);
 
         _maxL2TableCache = MAX_CACHE_SIZE / (_l2Size * 8);
         _maxClusterCache = MAX_CACHE_SIZE / _clusterSize;
@@ -215,7 +215,7 @@ public sealed partial class Qcow
 
         if((long)l1Off >= _l1Table.LongLength)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        string.Format(Localization.Trying_to_read_past_L1_table_position_0_of_a_max_1,
                                                      l1Off,
                                                      _l1Table.LongLength));
@@ -236,7 +236,7 @@ public sealed partial class Qcow
             _imageStream.Seek((long)_l1Table[l1Off], SeekOrigin.Begin);
             byte[] l2TableB = new byte[_l2Size * 8];
             _imageStream.EnsureRead(l2TableB, 0, _l2Size * 8);
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_L2_table_0, l1Off);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_L2_table_0, l1Off);
             l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
 
             for(long i = 0; i < l2Table.LongLength; i++) l2Table[i] = Swapping.Swap(l2Table[i]);
diff --git a/Aaru.Images/QCOW/Write.cs b/Aaru.Images/QCOW/Write.cs
index a4fda47c3..28bd3408a 100644
--- a/Aaru.Images/QCOW/Write.cs
+++ b/Aaru.Images/QCOW/Write.cs
@@ -89,7 +89,7 @@ public sealed partial class Qcow
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/QCOW2/Identify.cs b/Aaru.Images/QCOW2/Identify.cs
index 5318a9861..d05f7962e 100644
--- a/Aaru.Images/QCOW2/Identify.cs
+++ b/Aaru.Images/QCOW2/Identify.cs
@@ -53,8 +53,8 @@ public sealed partial class Qcow2
         stream.EnsureRead(qHdrB, 0, Marshal.SizeOf<Header>());
         _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.magic = 0x{0:X8}", _qHdr.magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.version = {0}",    _qHdr.version);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.magic = 0x{0:X8}", _qHdr.magic);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.version = {0}",    _qHdr.version);
 
         return _qHdr is { magic: QCOW_MAGIC, version: QCOW_VERSION2 or QCOW_VERSION3 };
     }
diff --git a/Aaru.Images/QCOW2/Read.cs b/Aaru.Images/QCOW2/Read.cs
index 587544924..386518928 100644
--- a/Aaru.Images/QCOW2/Read.cs
+++ b/Aaru.Images/QCOW2/Read.cs
@@ -61,33 +61,33 @@ public sealed partial class Qcow2
         stream.EnsureRead(qHdrB, 0, Marshal.SizeOf<Header>());
         _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.magic = 0x{0:X8}",            _qHdr.magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.version = {0}",               _qHdr.version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.backing_file_offset = {0}",   _qHdr.backing_file_offset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.backing_file_size = {0}",     _qHdr.backing_file_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.cluster_bits = {0}",          _qHdr.cluster_bits);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.size = {0}",                  _qHdr.size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.crypt_method = {0}",          _qHdr.crypt_method);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1_size = {0}",               _qHdr.l1_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1_table_offset = {0}",       _qHdr.l1_table_offset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.refcount_table_offset = {0}", _qHdr.refcount_table_offset);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.magic = 0x{0:X8}",            _qHdr.magic);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.version = {0}",               _qHdr.version);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.backing_file_offset = {0}",   _qHdr.backing_file_offset);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.backing_file_size = {0}",     _qHdr.backing_file_size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.cluster_bits = {0}",          _qHdr.cluster_bits);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.size = {0}",                  _qHdr.size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.crypt_method = {0}",          _qHdr.crypt_method);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1_size = {0}",               _qHdr.l1_size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1_table_offset = {0}",       _qHdr.l1_table_offset);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.refcount_table_offset = {0}", _qHdr.refcount_table_offset);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.refcount_table_clusters = {0}", _qHdr.refcount_table_clusters);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.refcount_table_clusters = {0}", _qHdr.refcount_table_clusters);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.nb_snapshots = {0}",     _qHdr.nb_snapshots);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.snapshots_offset = {0}", _qHdr.snapshots_offset);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.nb_snapshots = {0}",     _qHdr.nb_snapshots);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.snapshots_offset = {0}", _qHdr.snapshots_offset);
 
         if(_qHdr.version >= QCOW_VERSION3)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.features = {0:X}",           _qHdr.features);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.compat_features = {0:X}",    _qHdr.compat_features);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.autoclear_features = {0:X}", _qHdr.autoclear_features);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.refcount_order = {0}",       _qHdr.refcount_order);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.header_length = {0}",        _qHdr.header_length);
+            AaruConsole.Debug(MODULE_NAME, "qHdr.features = {0:X}",           _qHdr.features);
+            AaruConsole.Debug(MODULE_NAME, "qHdr.compat_features = {0:X}",    _qHdr.compat_features);
+            AaruConsole.Debug(MODULE_NAME, "qHdr.autoclear_features = {0:X}", _qHdr.autoclear_features);
+            AaruConsole.Debug(MODULE_NAME, "qHdr.refcount_order = {0}",       _qHdr.refcount_order);
+            AaruConsole.Debug(MODULE_NAME, "qHdr.header_length = {0}",        _qHdr.header_length);
 
             if((_qHdr.features & QCOW_FEATURE_MASK) != 0)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization
+                AaruConsole.Error(string.Format(Localization
                                                             .Unknown_incompatible_features_0_enabled_not_proceeding,
                                                          _qHdr.features & QCOW_FEATURE_MASK));
 
@@ -97,14 +97,14 @@ public sealed partial class Qcow2
 
         if(_qHdr.size <= 1)
         {
-            AaruConsole.ErrorWriteLine(Localization.Image_size_is_too_small);
+            AaruConsole.Error(Localization.Image_size_is_too_small);
 
             return ErrorNumber.InvalidArgument;
         }
 
         if(_qHdr.cluster_bits is < 9 or > 16)
         {
-            AaruConsole.ErrorWriteLine(Localization.Cluster_size_must_be_between_512_bytes_and_64_Kbytes);
+            AaruConsole.Error(Localization.Cluster_size_must_be_between_512_bytes_and_64_Kbytes);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -112,18 +112,18 @@ public sealed partial class Qcow2
         switch(_qHdr.crypt_method)
         {
             case > QCOW_ENCRYPTION_AES:
-                AaruConsole.ErrorWriteLine(Localization.Invalid_encryption_method);
+                AaruConsole.Error(Localization.Invalid_encryption_method);
 
                 return ErrorNumber.InvalidArgument;
             case > QCOW_ENCRYPTION_NONE:
-                AaruConsole.ErrorWriteLine(Localization.AES_encrypted_images_not_yet_supported);
+                AaruConsole.Error(Localization.AES_encrypted_images_not_yet_supported);
 
                 return ErrorNumber.NotImplemented;
         }
 
         if(_qHdr.backing_file_offset != 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.Differencing_images_not_yet_supported);
+            AaruConsole.Error(Localization.Differencing_images_not_yet_supported);
 
             return ErrorNumber.NotImplemented;
         }
@@ -133,17 +133,17 @@ public sealed partial class Qcow2
         _l2Bits         = (int)(_qHdr.cluster_bits - 3);
         _l2Size         = 1 << _l2Bits;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.clusterSize = {0}",    _clusterSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.clusterSectors = {0}", _clusterSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.qHdr.l1_size = {0}",   _qHdr.l1_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l2Size = {0}",         _l2Size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.sectors = {0}",        _imageInfo.Sectors);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.clusterSize = {0}",    _clusterSize);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.clusterSectors = {0}", _clusterSectors);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.qHdr.l1_size = {0}",   _qHdr.l1_size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l2Size = {0}",         _l2Size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.sectors = {0}",        _imageInfo.Sectors);
 
         byte[] l1TableB = new byte[_qHdr.l1_size * 8];
         stream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
         stream.EnsureRead(l1TableB, 0, (int)_qHdr.l1_size * 8);
         _l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_L1_table);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_L1_table);
 
         for(long i = 0; i < _l1Table.LongLength; i++) _l1Table[i] = Swapping.Swap(_l1Table[i]);
 
@@ -171,10 +171,10 @@ public sealed partial class Qcow2
 
         for(int i = 0; i < _qHdr.cluster_bits; i++) _sectorMask = (_sectorMask << 1) + 1;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1Mask = {0:X}",     _l1Mask);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1Shift = {0}",      _l1Shift);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l2Mask = {0:X}",     _l2Mask);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.sectorMask = {0:X}", _sectorMask);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1Mask = {0:X}",     _l1Mask);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1Shift = {0}",      _l1Shift);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l2Mask = {0:X}",     _l2Mask);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.sectorMask = {0:X}", _sectorMask);
 
         _maxL2TableCache = MAX_CACHE_SIZE / (_l2Size * 8);
         _maxClusterCache = MAX_CACHE_SIZE / _clusterSize;
@@ -218,7 +218,7 @@ public sealed partial class Qcow2
 
         if((long)l1Off >= _l1Table.LongLength)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        string.Format(Localization.Trying_to_read_past_L1_table_position_0_of_a_max_1,
                                                      l1Off,
                                                      _l1Table.LongLength));
@@ -239,7 +239,7 @@ public sealed partial class Qcow2
             _imageStream.Seek((long)(_l1Table[l1Off] & QCOW_FLAGS_MASK), SeekOrigin.Begin);
             byte[] l2TableB = new byte[_l2Size * 8];
             _imageStream.EnsureRead(l2TableB, 0, _l2Size * 8);
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_L2_table_0, l1Off);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_L2_table_0, l1Off);
             l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
 
             for(long i = 0; i < l2Table.LongLength; i++) l2Table[i] = Swapping.Swap(l2Table[i]);
diff --git a/Aaru.Images/QCOW2/Write.cs b/Aaru.Images/QCOW2/Write.cs
index e3faca59e..13c7002d5 100644
--- a/Aaru.Images/QCOW2/Write.cs
+++ b/Aaru.Images/QCOW2/Write.cs
@@ -89,7 +89,7 @@ public sealed partial class Qcow2
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/QED/Read.cs b/Aaru.Images/QED/Read.cs
index 1470942d4..9ef18fc4b 100644
--- a/Aaru.Images/QED/Read.cs
+++ b/Aaru.Images/QED/Read.cs
@@ -59,56 +59,56 @@ public sealed partial class Qed
         stream.EnsureRead(qHdrB, 0, 68);
         _qHdr = Marshal.SpanToStructureLittleEndian<QedHeader>(qHdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.magic = 0x{0:X8}",          _qHdr.magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.cluster_size = {0}",        _qHdr.cluster_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.table_size = {0}",          _qHdr.table_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.header_size = {0}",         _qHdr.header_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.features = {0}",            _qHdr.features);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.compat_features = {0}",     _qHdr.compat_features);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.autoclear_features = {0}",  _qHdr.autoclear_features);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1_table_offset = {0}",     _qHdr.l1_table_offset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.image_size = {0}",          _qHdr.image_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.backing_file_offset = {0}", _qHdr.backing_file_offset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.backing_file_size = {0}",   _qHdr.backing_file_size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.magic = 0x{0:X8}",          _qHdr.magic);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.cluster_size = {0}",        _qHdr.cluster_size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.table_size = {0}",          _qHdr.table_size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.header_size = {0}",         _qHdr.header_size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.features = {0}",            _qHdr.features);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.compat_features = {0}",     _qHdr.compat_features);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.autoclear_features = {0}",  _qHdr.autoclear_features);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1_table_offset = {0}",     _qHdr.l1_table_offset);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.image_size = {0}",          _qHdr.image_size);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.backing_file_offset = {0}", _qHdr.backing_file_offset);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.backing_file_size = {0}",   _qHdr.backing_file_size);
 
         if(_qHdr.image_size <= 1)
         {
-            AaruConsole.ErrorWriteLine(Localization.Image_size_is_too_small);
+            AaruConsole.Error(Localization.Image_size_is_too_small);
 
             return ErrorNumber.InvalidArgument;
         }
 
         if(!IsPowerOfTwo(_qHdr.cluster_size))
         {
-            AaruConsole.ErrorWriteLine(Localization.Cluster_size_must_be_a_power_of_2);
+            AaruConsole.Error(Localization.Cluster_size_must_be_a_power_of_2);
 
             return ErrorNumber.InvalidArgument;
         }
 
         if(_qHdr.cluster_size is < 4096 or > 67108864)
         {
-            AaruConsole.ErrorWriteLine(Localization.Cluster_size_must_be_between_4_Kbytes_and_64_Mbytes);
+            AaruConsole.Error(Localization.Cluster_size_must_be_between_4_Kbytes_and_64_Mbytes);
 
             return ErrorNumber.InvalidArgument;
         }
 
         if(!IsPowerOfTwo(_qHdr.table_size))
         {
-            AaruConsole.ErrorWriteLine(Localization.Table_size_must_be_a_power_of_2);
+            AaruConsole.Error(Localization.Table_size_must_be_a_power_of_2);
 
             return ErrorNumber.InvalidArgument;
         }
 
         if(_qHdr.table_size is < 1 or > 16)
         {
-            AaruConsole.ErrorWriteLine(Localization.Table_size_must_be_between_1_and_16_clusters);
+            AaruConsole.Error(Localization.Table_size_must_be_between_1_and_16_clusters);
 
             return ErrorNumber.InvalidArgument;
         }
 
         if((_qHdr.features & QED_FEATURE_MASK) > 0)
         {
-            AaruConsole.ErrorWriteLine(string.Format(Localization.Image_uses_unknown_incompatible_features_0,
+            AaruConsole.Error(string.Format(Localization.Image_uses_unknown_incompatible_features_0,
                                                      _qHdr.features & QED_FEATURE_MASK));
 
             return ErrorNumber.InvalidArgument;
@@ -116,7 +116,7 @@ public sealed partial class Qed
 
         if((_qHdr.features & QED_FEATURE_BACKING_FILE) == QED_FEATURE_BACKING_FILE)
         {
-            AaruConsole.ErrorWriteLine(Localization.Differencing_images_not_yet_supported);
+            AaruConsole.Error(Localization.Differencing_images_not_yet_supported);
 
             return ErrorNumber.NotImplemented;
         }
@@ -124,13 +124,13 @@ public sealed partial class Qed
         _clusterSectors = _qHdr.cluster_size                    / 512;
         _tableSize      = _qHdr.cluster_size * _qHdr.table_size / 8;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.clusterSectors = {0}", _clusterSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.tableSize = {0}",      _tableSize);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.clusterSectors = {0}", _clusterSectors);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.tableSize = {0}",      _tableSize);
 
         byte[] l1TableB = new byte[_tableSize * 8];
         stream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
         stream.EnsureRead(l1TableB, 0, (int)_tableSize * 8);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_L1_table);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_L1_table);
         _l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
 
         _l1Mask = 0;
@@ -153,11 +153,11 @@ public sealed partial class Qed
 
         for(int i = 0; i < _clusterBits; i++) _sectorMask = (_sectorMask << 1) + 1;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.clusterBits = {0}",  _clusterBits);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1Mask = {0:X}",     _l1Mask);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l1Shift = {0}",      _l1Shift);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.l2Mask = {0:X}",     _l2Mask);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "qHdr.sectorMask = {0:X}", _sectorMask);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.clusterBits = {0}",  _clusterBits);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1Mask = {0:X}",     _l1Mask);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l1Shift = {0}",      _l1Shift);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.l2Mask = {0:X}",     _l2Mask);
+        AaruConsole.Debug(MODULE_NAME, "qHdr.sectorMask = {0:X}", _sectorMask);
 
         _maxL2TableCache = MAX_CACHE_SIZE / _tableSize;
         _maxClusterCache = MAX_CACHE_SIZE / _qHdr.cluster_size;
@@ -200,7 +200,7 @@ public sealed partial class Qed
 
         if((long)l1Off >= _l1Table.LongLength)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        string.Format(Localization.Trying_to_read_past_L1_table_position_0_of_a_max_1,
                                                      l1Off,
                                                      _l1Table.LongLength));
@@ -221,7 +221,7 @@ public sealed partial class Qed
             _imageStream.Seek((long)_l1Table[l1Off], SeekOrigin.Begin);
             byte[] l2TableB = new byte[_tableSize * 8];
             _imageStream.EnsureRead(l2TableB, 0, (int)_tableSize * 8);
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_L2_table_0, l1Off);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_L2_table_0, l1Off);
             l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
 
             if(_l2TableCache.Count >= _maxL2TableCache) _l2TableCache.Clear();
diff --git a/Aaru.Images/QED/Write.cs b/Aaru.Images/QED/Write.cs
index 5d0f0d0ad..0e9120e04 100644
--- a/Aaru.Images/QED/Write.cs
+++ b/Aaru.Images/QED/Write.cs
@@ -89,7 +89,7 @@ public sealed partial class Qed
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/RayDIM/Identify.cs b/Aaru.Images/RayDIM/Identify.cs
index 28497a2e2..2d89ddefc 100644
--- a/Aaru.Images/RayDIM/Identify.cs
+++ b/Aaru.Images/RayDIM/Identify.cs
@@ -57,18 +57,18 @@ public sealed partial class RayDim
 
         string signature = StringHandlers.CToString(header.signature);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.signature = {0}", signature);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.diskType = {0}",  header.diskType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.heads = {0}",     header.heads);
+        AaruConsole.Debug(MODULE_NAME, "header.signature = {0}", signature);
+        AaruConsole.Debug(MODULE_NAME, "header.diskType = {0}",  header.diskType);
+        AaruConsole.Debug(MODULE_NAME, "header.heads = {0}",     header.heads);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.cylinders = {0}", header.cylinders);
+        AaruConsole.Debug(MODULE_NAME, "header.cylinders = {0}", header.cylinders);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectorsPerTrack = {0}", header.sectorsPerTrack);
+        AaruConsole.Debug(MODULE_NAME, "header.sectorsPerTrack = {0}", header.sectorsPerTrack);
 
         var   sx = new Regex(REGEX_SIGNATURE);
         Match sm = sx.Match(signature);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.signature matches? = {0}", sm.Success);
+        AaruConsole.Debug(MODULE_NAME, "header.signature matches? = {0}", sm.Success);
 
         return sm.Success;
     }
diff --git a/Aaru.Images/RayDIM/Write.cs b/Aaru.Images/RayDIM/Write.cs
index 3dc11b3e2..3bf9b1cc9 100644
--- a/Aaru.Images/RayDIM/Write.cs
+++ b/Aaru.Images/RayDIM/Write.cs
@@ -93,7 +93,7 @@ public sealed partial class RayDim
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/RsIde/Write.cs b/Aaru.Images/RsIde/Write.cs
index 95550d618..30fd76de6 100644
--- a/Aaru.Images/RsIde/Write.cs
+++ b/Aaru.Images/RsIde/Write.cs
@@ -88,7 +88,7 @@ public sealed partial class RsIde
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/SaveDskF/Read.cs b/Aaru.Images/SaveDskF/Read.cs
index 074a50e02..6ce8ba897 100644
--- a/Aaru.Images/SaveDskF/Read.cs
+++ b/Aaru.Images/SaveDskF/Read.cs
@@ -56,25 +56,25 @@ public sealed partial class SaveDskF
         stream.EnsureRead(hdr, 0, 40);
         _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.magic = 0x{0:X4}",      _header.magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.mediaType = 0x{0:X2}",  _header.mediaType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectorSize = {0}",      _header.sectorSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.clusterMask = {0}",     _header.clusterMask);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.clusterShift = {0}",    _header.clusterShift);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.reservedSectors = {0}", _header.reservedSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.fatCopies = {0}",       _header.fatCopies);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.rootEntries = {0}",     _header.rootEntries);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.firstCluster = {0}",    _header.firstCluster);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.clustersCopied = {0}",  _header.clustersCopied);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectorsPerFat = {0}",   _header.sectorsPerFat);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.checksum = 0x{0:X8}",   _header.checksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.cylinders = {0}",       _header.cylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.heads = {0}",           _header.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectorsPerTrack = {0}", _header.sectorsPerTrack);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.padding = {0}",         _header.padding);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sectorsCopied = {0}",   _header.sectorsCopied);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.commentOffset = {0}",   _header.commentOffset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dataOffset = {0}",      _header.dataOffset);
+        AaruConsole.Debug(MODULE_NAME, "header.magic = 0x{0:X4}",      _header.magic);
+        AaruConsole.Debug(MODULE_NAME, "header.mediaType = 0x{0:X2}",  _header.mediaType);
+        AaruConsole.Debug(MODULE_NAME, "header.sectorSize = {0}",      _header.sectorSize);
+        AaruConsole.Debug(MODULE_NAME, "header.clusterMask = {0}",     _header.clusterMask);
+        AaruConsole.Debug(MODULE_NAME, "header.clusterShift = {0}",    _header.clusterShift);
+        AaruConsole.Debug(MODULE_NAME, "header.reservedSectors = {0}", _header.reservedSectors);
+        AaruConsole.Debug(MODULE_NAME, "header.fatCopies = {0}",       _header.fatCopies);
+        AaruConsole.Debug(MODULE_NAME, "header.rootEntries = {0}",     _header.rootEntries);
+        AaruConsole.Debug(MODULE_NAME, "header.firstCluster = {0}",    _header.firstCluster);
+        AaruConsole.Debug(MODULE_NAME, "header.clustersCopied = {0}",  _header.clustersCopied);
+        AaruConsole.Debug(MODULE_NAME, "header.sectorsPerFat = {0}",   _header.sectorsPerFat);
+        AaruConsole.Debug(MODULE_NAME, "header.checksum = 0x{0:X8}",   _header.checksum);
+        AaruConsole.Debug(MODULE_NAME, "header.cylinders = {0}",       _header.cylinders);
+        AaruConsole.Debug(MODULE_NAME, "header.heads = {0}",           _header.heads);
+        AaruConsole.Debug(MODULE_NAME, "header.sectorsPerTrack = {0}", _header.sectorsPerTrack);
+        AaruConsole.Debug(MODULE_NAME, "header.padding = {0}",         _header.padding);
+        AaruConsole.Debug(MODULE_NAME, "header.sectorsCopied = {0}",   _header.sectorsCopied);
+        AaruConsole.Debug(MODULE_NAME, "header.commentOffset = {0}",   _header.commentOffset);
+        AaruConsole.Debug(MODULE_NAME, "header.dataOffset = {0}",      _header.dataOffset);
 
         if(_header is { dataOffset: 0, magic: SDF_MAGIC_OLD }) _header.dataOffset = 512;
 
@@ -96,7 +96,7 @@ public sealed partial class SaveDskF
             if(b >= 0) _calculatedChk += (uint)b;
         } while(b >= 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Calculated_checksum_equals_0_X8_1,
                                    _calculatedChk,
                                    _calculatedChk == _header.checksum);
@@ -114,15 +114,15 @@ public sealed partial class SaveDskF
 
         _imageInfo.MetadataMediaType = MetadataMediaType.BlockMedia;
 
-        AaruConsole.VerboseWriteLine(Localization.SaveDskF_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.SaveDskF_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
 
         if(!string.IsNullOrEmpty(_imageInfo.Comments))
-            AaruConsole.VerboseWriteLine(Localization.SaveDskF_comments_0, _imageInfo.Comments);
+            AaruConsole.Verbose(Localization.SaveDskF_comments_0, _imageInfo.Comments);
 
         // TODO: Support compressed images
         if(_header.magic == SDF_MAGIC_COMPRESSED)
         {
-            AaruConsole.ErrorWriteLine(Localization.Compressed_SaveDskF_images_are_not_supported);
+            AaruConsole.Error(Localization.Compressed_SaveDskF_images_are_not_supported);
 
             return ErrorNumber.NotSupported;
         }
diff --git a/Aaru.Images/SaveDskF/Write.cs b/Aaru.Images/SaveDskF/Write.cs
index 57e3adec4..676e8db0a 100644
--- a/Aaru.Images/SaveDskF/Write.cs
+++ b/Aaru.Images/SaveDskF/Write.cs
@@ -244,7 +244,7 @@ public sealed partial class SaveDskF
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/SuperCardPro/Read.cs b/Aaru.Images/SuperCardPro/Read.cs
index 07d63db9d..5782fee6b 100644
--- a/Aaru.Images/SuperCardPro/Read.cs
+++ b/Aaru.Images/SuperCardPro/Read.cs
@@ -62,45 +62,45 @@ public sealed partial class SuperCardPro
 
         Header = Marshal.ByteArrayToStructureLittleEndian<ScpHeader>(hdr);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "header.signature = \"{0}\"",
                                    StringHandlers.CToString(Header.signature));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "header.version = {0}.{1}",
                                    (Header.version & 0xF0) >> 4,
                                    Header.version & 0xF);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.type = {0}",            Header.type);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.revolutions = {0}",     Header.revolutions);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.start = {0}",           Header.start);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.end = {0}",             Header.end);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.bitCellEncoding = {0}", Header.bitCellEncoding);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.heads = {0}",           Header.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.resolution = {0}",      Header.resolution);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.checksum = 0x{0:X8}",   Header.checksum);
+        AaruConsole.Debug(MODULE_NAME, "header.type = {0}",            Header.type);
+        AaruConsole.Debug(MODULE_NAME, "header.revolutions = {0}",     Header.revolutions);
+        AaruConsole.Debug(MODULE_NAME, "header.start = {0}",           Header.start);
+        AaruConsole.Debug(MODULE_NAME, "header.end = {0}",             Header.end);
+        AaruConsole.Debug(MODULE_NAME, "header.bitCellEncoding = {0}", Header.bitCellEncoding);
+        AaruConsole.Debug(MODULE_NAME, "header.heads = {0}",           Header.heads);
+        AaruConsole.Debug(MODULE_NAME, "header.resolution = {0}",      Header.resolution);
+        AaruConsole.Debug(MODULE_NAME, "header.checksum = 0x{0:X8}",   Header.checksum);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "header.flags.StartsAtIndex = {0}",
                                    Header.flags == ScpFlags.StartsAtIndex);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "header.flags.Tpi = {0}",
                                    Header.flags == ScpFlags.Tpi ? "96tpi" : "48tpi");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "header.flags.Rpm = {0}",
                                    Header.flags == ScpFlags.Rpm ? "360rpm" : "300rpm");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.flags.Normalized = {0}", Header.flags == ScpFlags.Normalized);
+        AaruConsole.Debug(MODULE_NAME, "header.flags.Normalized = {0}", Header.flags == ScpFlags.Normalized);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.flags.Writable = {0}", Header.flags == ScpFlags.Writable);
+        AaruConsole.Debug(MODULE_NAME, "header.flags.Writable = {0}", Header.flags == ScpFlags.Writable);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.flags.HasFooter = {0}", Header.flags == ScpFlags.HasFooter);
+        AaruConsole.Debug(MODULE_NAME, "header.flags.HasFooter = {0}", Header.flags == ScpFlags.HasFooter);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.flags.NotFloppy = {0}", Header.flags == ScpFlags.NotFloppy);
+        AaruConsole.Debug(MODULE_NAME, "header.flags.NotFloppy = {0}", Header.flags == ScpFlags.NotFloppy);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "header.flags.CreatedByOtherDevice = {0}",
                                    Header.flags == ScpFlags.CreatedByOtherDevice);
 
@@ -125,7 +125,7 @@ public sealed partial class SuperCardPro
 
             if(!trk.Signature.SequenceEqual(_trkSignature))
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Track_header_at_0_contains_incorrect_signature,
                                            Header.offsets[t]);
 
@@ -134,7 +134,7 @@ public sealed partial class SuperCardPro
 
             if(trk.TrackNumber != t)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Track_number_at_0_should_be_1_but_is_2,
                                            Header.offsets[t],
                                            t,
@@ -143,7 +143,7 @@ public sealed partial class SuperCardPro
                 continue;
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_track_0_at_1, t, Header.offsets[t]);
+            AaruConsole.Debug(MODULE_NAME, Localization.Found_track_0_at_1, t, Header.offsets[t]);
 
             for(byte r = 0; r < Header.revolutions; r++)
             {
@@ -336,54 +336,54 @@ public sealed partial class SuperCardPro
                 {
                     _scpStream.Seek(-Marshal.SizeOf<Footer>(), SeekOrigin.Current);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_footer_at_0, _scpStream.Position);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_footer_at_0, _scpStream.Position);
 
                     byte[] ftr = new byte[Marshal.SizeOf<Footer>()];
                     _scpStream.EnsureRead(ftr, 0, Marshal.SizeOf<Footer>());
 
                     Footer footer = Marshal.ByteArrayToStructureLittleEndian<Footer>(ftr);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "footer.manufacturerOffset = 0x{0:X8}",
                                                footer.manufacturerOffset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "footer.modelOffset = 0x{0:X8}", footer.modelOffset);
+                    AaruConsole.Debug(MODULE_NAME, "footer.modelOffset = 0x{0:X8}", footer.modelOffset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "footer.serialOffset = 0x{0:X8}", footer.serialOffset);
+                    AaruConsole.Debug(MODULE_NAME, "footer.serialOffset = 0x{0:X8}", footer.serialOffset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "footer.creatorOffset = 0x{0:X8}", footer.creatorOffset);
+                    AaruConsole.Debug(MODULE_NAME, "footer.creatorOffset = 0x{0:X8}", footer.creatorOffset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "footer.applicationOffset = 0x{0:X8}",
                                                footer.applicationOffset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "footer.commentsOffset = 0x{0:X8}", footer.commentsOffset);
+                    AaruConsole.Debug(MODULE_NAME, "footer.commentsOffset = 0x{0:X8}", footer.commentsOffset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "footer.creationTime = {0}", footer.creationTime);
+                    AaruConsole.Debug(MODULE_NAME, "footer.creationTime = {0}", footer.creationTime);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "footer.modificationTime = {0}", footer.modificationTime);
+                    AaruConsole.Debug(MODULE_NAME, "footer.modificationTime = {0}", footer.modificationTime);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "footer.applicationVersion = {0}.{1}",
                                                (footer.applicationVersion & 0xF0) >> 4,
                                                footer.applicationVersion & 0xF);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "footer.hardwareVersion = {0}.{1}",
                                                (footer.hardwareVersion & 0xF0) >> 4,
                                                footer.hardwareVersion & 0xF);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "footer.firmwareVersion = {0}.{1}",
                                                (footer.firmwareVersion & 0xF0) >> 4,
                                                footer.firmwareVersion & 0xF);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "footer.imageVersion = {0}.{1}",
                                                (footer.imageVersion & 0xF0) >> 4,
                                                footer.imageVersion & 0xF);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "footer.signature = \"{0}\"",
                                                StringHandlers.CToString(BitConverter.GetBytes(footer.signature)));
 
@@ -394,23 +394,23 @@ public sealed partial class SuperCardPro
                     _imageInfo.Application       = ReadPStringUtf8(_scpStream, footer.applicationOffset);
                     _imageInfo.Comments          = ReadPStringUtf8(_scpStream, footer.commentsOffset);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "ImageInfo.driveManufacturer = \"{0}\"",
                                                _imageInfo.DriveManufacturer);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ImageInfo.driveModel = \"{0}\"", _imageInfo.DriveModel);
+                    AaruConsole.Debug(MODULE_NAME, "ImageInfo.driveModel = \"{0}\"", _imageInfo.DriveModel);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "ImageInfo.driveSerialNumber = \"{0}\"",
                                                _imageInfo.DriveSerialNumber);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ImageInfo.imageCreator = \"{0}\"", _imageInfo.Creator);
+                    AaruConsole.Debug(MODULE_NAME, "ImageInfo.imageCreator = \"{0}\"", _imageInfo.Creator);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "ImageInfo.imageApplication = \"{0}\"",
                                                _imageInfo.Application);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ImageInfo.imageComments = \"{0}\"", _imageInfo.Comments);
+                    AaruConsole.Debug(MODULE_NAME, "ImageInfo.imageComments = \"{0}\"", _imageInfo.Comments);
 
                     _imageInfo.CreationTime = footer.creationTime != 0
                                                   ? DateHandlers.UnixToDateTime(footer.creationTime)
@@ -420,11 +420,11 @@ public sealed partial class SuperCardPro
                                                           ? DateHandlers.UnixToDateTime(footer.modificationTime)
                                                           : imageFilter.LastWriteTime;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "ImageInfo.imageCreationTime = {0}",
                                                _imageInfo.CreationTime);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "ImageInfo.imageLastModificationTime = {0}",
                                                _imageInfo.LastModificationTime);
 
diff --git a/Aaru.Images/SuperCardPro/Write.cs b/Aaru.Images/SuperCardPro/Write.cs
index 993576cee..55af5eb4d 100644
--- a/Aaru.Images/SuperCardPro/Write.cs
+++ b/Aaru.Images/SuperCardPro/Write.cs
@@ -134,7 +134,7 @@ public sealed partial class SuperCardPro
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/T98/Identify.cs b/Aaru.Images/T98/Identify.cs
index 59238c5b0..a43a8d869 100644
--- a/Aaru.Images/T98/Identify.cs
+++ b/Aaru.Images/T98/Identify.cs
@@ -62,7 +62,7 @@ public sealed partial class T98
 
         int cylinders = BitConverter.ToInt32(hdrB, 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.cylinders_equal_0, cylinders);
+        AaruConsole.Debug(MODULE_NAME, Localization.cylinders_equal_0, cylinders);
 
         // This format is expanding, so length can be smaller
         // Just grow it, I won't risk false positives...
diff --git a/Aaru.Images/T98/Write.cs b/Aaru.Images/T98/Write.cs
index 2605cca9e..f199ad3f1 100644
--- a/Aaru.Images/T98/Write.cs
+++ b/Aaru.Images/T98/Write.cs
@@ -80,7 +80,7 @@ public sealed partial class T98
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/TeleDisk/Helpers.cs b/Aaru.Images/TeleDisk/Helpers.cs
index 1b74231be..8d8f3f84f 100644
--- a/Aaru.Images/TeleDisk/Helpers.cs
+++ b/Aaru.Images/TeleDisk/Helpers.cs
@@ -107,7 +107,7 @@ public sealed partial class TeleDisk
 
                 break;
             default:
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Sector_size_0_is_incorrect, sectorSize));
+                AaruConsole.Error(string.Format(Localization.Sector_size_0_is_incorrect, sectorSize));
 
                 return ErrorNumber.InvalidArgument;
         }
@@ -136,19 +136,19 @@ public sealed partial class TeleDisk
                     outs += decodedPiece.Length;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Block_pattern_decoder_Input_data_size_0_bytes,
                                            encodedData.Length);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Block_pattern_decoder_Processed_input_0_bytes,
                                            ins);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Block_pattern_decoder_Output_data_size_0_bytes,
                                            decodedData.Length);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Block_pattern_decoder_Processed_Output_0_bytes,
                                            outs);
 
@@ -186,22 +186,22 @@ public sealed partial class TeleDisk
                     }
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.RLE_decoder_Input_data_size_0_bytes,
                                            encodedData.Length);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.RLE_decoder_Processed_input_0_bytes, ins);
+                AaruConsole.Debug(MODULE_NAME, Localization.RLE_decoder_Processed_input_0_bytes, ins);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.RLE_decoder_Output_data_size_0_bytes,
                                            decodedData.Length);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.RLE_decoder_Processed_Output_0_bytes, outs);
+                AaruConsole.Debug(MODULE_NAME, Localization.RLE_decoder_Processed_Output_0_bytes, outs);
 
                 break;
             }
             default:
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Data_encoding_0_is_incorrect, encodingType));
+                AaruConsole.Error(string.Format(Localization.Data_encoding_0_is_incorrect, encodingType));
 
                 return ErrorNumber.InvalidArgument;
         }
@@ -280,7 +280,7 @@ public sealed partial class TeleDisk
                         return MediaType.ECMA_78_2;
                     default:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "Unknown 5,25\" disk with {0} bytes", _totalDiskSize);
+                        AaruConsole.Debug(MODULE_NAME, "Unknown 5,25\" disk with {0} bytes", _totalDiskSize);
 
                         return MediaType.Unknown;
                     }
@@ -327,7 +327,7 @@ public sealed partial class TeleDisk
                         return MediaType.SHARP_35;
                     default:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "Unknown 3,5\" disk with {0} bytes", _totalDiskSize);
+                        AaruConsole.Debug(MODULE_NAME, "Unknown 3,5\" disk with {0} bytes", _totalDiskSize);
 
                         return MediaType.Unknown;
                     }
@@ -375,7 +375,7 @@ public sealed partial class TeleDisk
                         return MediaType.ECMA_69_26;
                     default:
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, "Unknown 8\" disk with {0} bytes", _totalDiskSize);
+                        AaruConsole.Debug(MODULE_NAME, "Unknown 8\" disk with {0} bytes", _totalDiskSize);
 
                         return MediaType.Unknown;
                     }
@@ -383,7 +383,7 @@ public sealed partial class TeleDisk
             }
             default:
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "Unknown drive type {1} with {0} bytes",
                                            _totalDiskSize,
                                            _header.DriveType);
diff --git a/Aaru.Images/TeleDisk/Identify.cs b/Aaru.Images/TeleDisk/Identify.cs
index 7eeddc808..c54ece258 100644
--- a/Aaru.Images/TeleDisk/Identify.cs
+++ b/Aaru.Images/TeleDisk/Identify.cs
@@ -70,18 +70,18 @@ public sealed partial class TeleDisk
         Array.Copy(headerBytes, headerBytesForCrc, 10);
         ushort calculatedHeaderCrc = TeleDiskCrc(0x0000, headerBytesForCrc);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.signature = 0x{0:X4}",     _header.Signature);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sequence = 0x{0:X2}",      _header.Sequence);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.diskSet = 0x{0:X2}",       _header.DiskSet);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.version = 0x{0:X2}",       _header.Version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dataRate = 0x{0:X2}",      _header.DataRate);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.driveType = 0x{0:X2}",     _header.DriveType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.stepping = 0x{0:X2}",      _header.Stepping);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dosAllocation = 0x{0:X2}", _header.DosAllocation);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sides = 0x{0:X2}",         _header.Sides);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.crc = 0x{0:X4}",           _header.Crc);
+        AaruConsole.Debug(MODULE_NAME, "header.signature = 0x{0:X4}",     _header.Signature);
+        AaruConsole.Debug(MODULE_NAME, "header.sequence = 0x{0:X2}",      _header.Sequence);
+        AaruConsole.Debug(MODULE_NAME, "header.diskSet = 0x{0:X2}",       _header.DiskSet);
+        AaruConsole.Debug(MODULE_NAME, "header.version = 0x{0:X2}",       _header.Version);
+        AaruConsole.Debug(MODULE_NAME, "header.dataRate = 0x{0:X2}",      _header.DataRate);
+        AaruConsole.Debug(MODULE_NAME, "header.driveType = 0x{0:X2}",     _header.DriveType);
+        AaruConsole.Debug(MODULE_NAME, "header.stepping = 0x{0:X2}",      _header.Stepping);
+        AaruConsole.Debug(MODULE_NAME, "header.dosAllocation = 0x{0:X2}", _header.DosAllocation);
+        AaruConsole.Debug(MODULE_NAME, "header.sides = 0x{0:X2}",         _header.Sides);
+        AaruConsole.Debug(MODULE_NAME, "header.crc = 0x{0:X4}",           _header.Crc);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.calculated_header_crc_equals_0_X4, calculatedHeaderCrc);
+        AaruConsole.Debug(MODULE_NAME, Localization.calculated_header_crc_equals_0_X4, calculatedHeaderCrc);
 
         // We need more checks as the magic is too simply.
         // This may deny legal images
diff --git a/Aaru.Images/TeleDisk/Read.cs b/Aaru.Images/TeleDisk/Read.cs
index bd409c669..30ba1eed6 100644
--- a/Aaru.Images/TeleDisk/Read.cs
+++ b/Aaru.Images/TeleDisk/Read.cs
@@ -79,18 +79,18 @@ public sealed partial class TeleDisk
         Array.Copy(headerBytes, headerBytesForCrc, 10);
         ushort calculatedHeaderCrc = TeleDiskCrc(0x0000, headerBytesForCrc);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.signature = 0x{0:X4}",     _header.Signature);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sequence = 0x{0:X2}",      _header.Sequence);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.diskSet = 0x{0:X2}",       _header.DiskSet);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.version = 0x{0:X2}",       _header.Version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dataRate = 0x{0:X2}",      _header.DataRate);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.driveType = 0x{0:X2}",     _header.DriveType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.stepping = 0x{0:X2}",      _header.Stepping);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.dosAllocation = 0x{0:X2}", _header.DosAllocation);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.sides = 0x{0:X2}",         _header.Sides);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "header.crc = 0x{0:X4}",           _header.Crc);
+        AaruConsole.Debug(MODULE_NAME, "header.signature = 0x{0:X4}",     _header.Signature);
+        AaruConsole.Debug(MODULE_NAME, "header.sequence = 0x{0:X2}",      _header.Sequence);
+        AaruConsole.Debug(MODULE_NAME, "header.diskSet = 0x{0:X2}",       _header.DiskSet);
+        AaruConsole.Debug(MODULE_NAME, "header.version = 0x{0:X2}",       _header.Version);
+        AaruConsole.Debug(MODULE_NAME, "header.dataRate = 0x{0:X2}",      _header.DataRate);
+        AaruConsole.Debug(MODULE_NAME, "header.driveType = 0x{0:X2}",     _header.DriveType);
+        AaruConsole.Debug(MODULE_NAME, "header.stepping = 0x{0:X2}",      _header.Stepping);
+        AaruConsole.Debug(MODULE_NAME, "header.dosAllocation = 0x{0:X2}", _header.DosAllocation);
+        AaruConsole.Debug(MODULE_NAME, "header.sides = 0x{0:X2}",         _header.Sides);
+        AaruConsole.Debug(MODULE_NAME, "header.crc = 0x{0:X4}",           _header.Crc);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.calculated_header_crc_equals_0_X4, calculatedHeaderCrc);
+        AaruConsole.Debug(MODULE_NAME, Localization.calculated_header_crc_equals_0_X4, calculatedHeaderCrc);
 
         // We need more checks as the magic is too simply.
         // This may deny legal images
@@ -100,7 +100,7 @@ public sealed partial class TeleDisk
         {
             _aDiskCrcHasFailed = true;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Calculated_CRC_does_not_coincide_with_stored_one);
+            AaruConsole.Debug(MODULE_NAME, Localization.Calculated_CRC_does_not_coincide_with_stored_one);
         }
 
         if(_header.Sequence != 0x00) return ErrorNumber.InvalidArgument;
@@ -170,18 +170,18 @@ public sealed partial class TeleDisk
 
             ushort cmtcrc = TeleDiskCrc(0, commentBlockForCrc);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Comment_header);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\tcommentheader.crc = 0x{0:X4}",               _commentHeader.Crc);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Calculated_CRC_equals_0_X4, cmtcrc);
+            AaruConsole.Debug(MODULE_NAME, Localization.Comment_header);
+            AaruConsole.Debug(MODULE_NAME, "\tcommentheader.crc = 0x{0:X4}",               _commentHeader.Crc);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Calculated_CRC_equals_0_X4, cmtcrc);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\tcommentheader.length = {0} bytes", _commentHeader.Length);
+            AaruConsole.Debug(MODULE_NAME, "\tcommentheader.length = {0} bytes", _commentHeader.Length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\tcommentheader.year = {0}",   _commentHeader.Year);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\tcommentheader.month = {0}",  _commentHeader.Month);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\tcommentheader.day = {0}",    _commentHeader.Day);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\tcommentheader.hour = {0}",   _commentHeader.Hour);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\tcommentheader.minute = {0}", _commentHeader.Minute);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\tcommentheader.second = {0}", _commentHeader.Second);
+            AaruConsole.Debug(MODULE_NAME, "\tcommentheader.year = {0}",   _commentHeader.Year);
+            AaruConsole.Debug(MODULE_NAME, "\tcommentheader.month = {0}",  _commentHeader.Month);
+            AaruConsole.Debug(MODULE_NAME, "\tcommentheader.day = {0}",    _commentHeader.Day);
+            AaruConsole.Debug(MODULE_NAME, "\tcommentheader.hour = {0}",   _commentHeader.Hour);
+            AaruConsole.Debug(MODULE_NAME, "\tcommentheader.minute = {0}", _commentHeader.Minute);
+            AaruConsole.Debug(MODULE_NAME, "\tcommentheader.second = {0}", _commentHeader.Second);
 
             _aDiskCrcHasFailed |= cmtcrc != _commentHeader.Crc;
 
@@ -194,8 +194,8 @@ public sealed partial class TeleDisk
 
             _imageInfo.Comments = Encoding.ASCII.GetString(_commentBlock);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Comment);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "{0}", _imageInfo.Comments);
+            AaruConsole.Debug(MODULE_NAME, Localization.Comment);
+            AaruConsole.Debug(MODULE_NAME, "{0}", _imageInfo.Comments);
 
             _imageInfo.CreationTime = new DateTime(_commentHeader.Year  + 1900,
                                                    _commentHeader.Month + 1,
@@ -210,11 +210,11 @@ public sealed partial class TeleDisk
 
         _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Image_created_on_0, _imageInfo.CreationTime);
+        AaruConsole.Debug(MODULE_NAME, Localization.Image_created_on_0, _imageInfo.CreationTime);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Image_modified_on_0, _imageInfo.LastModificationTime);
+        AaruConsole.Debug(MODULE_NAME, Localization.Image_modified_on_0, _imageInfo.LastModificationTime);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Parsing_image);
+        AaruConsole.Debug(MODULE_NAME, Localization.Parsing_image);
 
         _totalDiskSize       = 0;
         _imageInfo.ImageSize = 0;
@@ -283,7 +283,7 @@ public sealed partial class TeleDisk
 
         if(totalCylinders <= 0 || totalHeads <= 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.No_cylinders_or_heads_found);
+            AaruConsole.Error(Localization.No_cylinders_or_heads_found);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -353,7 +353,7 @@ public sealed partial class TeleDisk
         // Total sectors per track
         uint[][] spts = new uint[totalCylinders][];
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Found_0_cylinders_and_1_heads_with_a_maximum_sector_number_of_2,
                                    totalCylinders,
                                    totalHeads,
@@ -387,13 +387,13 @@ public sealed partial class TeleDisk
 
             byte tdTrackCalculatedCrc = (byte)(TeleDiskCrc(0, tdTrackForCrc) & 0xFF);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Track_follows);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Track_cylinder_0, teleDiskTrack.Cylinder);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Track_head_0,     teleDiskTrack.Head);
+            AaruConsole.Debug(MODULE_NAME, Localization.Track_follows);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Track_cylinder_0, teleDiskTrack.Cylinder);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Track_head_0,     teleDiskTrack.Head);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Sectors_in_track_0, teleDiskTrack.Sectors);
+            AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Sectors_in_track_0, teleDiskTrack.Sectors);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "\t" + Localization.Track_header_CRC_0_X2_calculated_1_X2,
                                        teleDiskTrack.Crc,
                                        tdTrackCalculatedCrc);
@@ -402,9 +402,9 @@ public sealed partial class TeleDisk
 
             if(teleDiskTrack.Sectors == 0xFF) // End of disk image
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.End_of_disk_image_arrived);
+                AaruConsole.Debug(MODULE_NAME, Localization.End_of_disk_image_arrived);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Total_of_0_data_sectors_for_1_bytes,
                                            totalSectors,
                                            _totalDiskSize);
@@ -426,23 +426,23 @@ public sealed partial class TeleDisk
                 teleDiskSector.Flags        = (byte)stream.ReadByte();
                 teleDiskSector.Crc          = (byte)stream.ReadByte();
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t" + Localization.Sector_follows);
+                AaruConsole.Debug(MODULE_NAME, "\t" + Localization.Sector_follows);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.AddressMark_cylinder_0,
                                            teleDiskSector.Cylinder);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.AddressMark_head_0, teleDiskSector.Head);
+                AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.AddressMark_head_0, teleDiskSector.Head);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.AddressMark_sector_number_0,
                                            teleDiskSector.SectorNumber);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Sector_size_0, teleDiskSector.SectorSize);
+                AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Sector_size_0, teleDiskSector.SectorSize);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.Sector_flags_0_X2, teleDiskSector.Flags);
+                AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.Sector_flags_0_X2, teleDiskSector.Flags);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "\t\t" + Localization.Sector_CRC_plus_headers_0_X2,
                                            teleDiskSector.Crc);
 
@@ -461,11 +461,11 @@ public sealed partial class TeleDisk
                     byte[] data = new byte[teleDiskData.DataSize];
                     stream.EnsureRead(data, 0, teleDiskData.DataSize);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "\t\t" + Localization.Data_size_in_image_0,
                                                teleDiskData.DataSize);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "\t\t" + Localization.Data_encoding_0_X2,
                                                teleDiskData.DataEncoding);
 
@@ -480,7 +480,7 @@ public sealed partial class TeleDisk
 
                     if(tdSectorCalculatedCrc != teleDiskSector.Crc)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .Sector_0_3_4_calculated_CRC_1_X2_differs_from_stored_CRC_2_X2,
                                                    teleDiskTrack.Cylinder,
@@ -496,13 +496,13 @@ public sealed partial class TeleDisk
                 else
                     decodedData = new byte[128 << teleDiskSector.SectorSize];
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "\t\t" + Localization.LBA_0, lba);
+                AaruConsole.Debug(MODULE_NAME, "\t\t" + Localization.LBA_0, lba);
 
                 if((teleDiskSector.Flags & FLAGS_SECTOR_NO_ID) == FLAGS_SECTOR_NO_ID) continue;
 
                 if(_sectorsData[teleDiskTrack.Cylinder][teleDiskTrack.Head][teleDiskSector.SectorNumber] != null)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                (teleDiskSector.Flags & FLAGS_SECTOR_DUPLICATE) == FLAGS_SECTOR_DUPLICATE
                                                    ? "\t\t" +
                                                      Localization
@@ -562,10 +562,10 @@ public sealed partial class TeleDisk
 
         _imageInfo.MetadataMediaType = MetadataMediaType.BlockMedia;
 
-        AaruConsole.VerboseWriteLine(Localization.TeleDisk_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.TeleDisk_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
 
         if(!string.IsNullOrEmpty(_imageInfo.Comments))
-            AaruConsole.VerboseWriteLine(Localization.TeleDisk_comments_0, _imageInfo.Comments);
+            AaruConsole.Verbose(Localization.TeleDisk_comments_0, _imageInfo.Comments);
 
         _inStream.Dispose();
         stream.Dispose();
diff --git a/Aaru.Images/UDIF/Read.cs b/Aaru.Images/UDIF/Read.cs
index 9bf7cf363..79459af4e 100644
--- a/Aaru.Images/UDIF/Read.cs
+++ b/Aaru.Images/UDIF/Read.cs
@@ -77,50 +77,50 @@ public sealed partial class Udif
 
             if(_footer.signature != UDIF_SIGNATURE)
             {
-                AaruConsole.ErrorWriteLine(Localization.Unable_to_find_UDIF_signature);
+                AaruConsole.Error(Localization.Unable_to_find_UDIF_signature);
 
                 return ErrorNumber.InvalidArgument;
             }
 
-            AaruConsole.VerboseWriteLine(Localization.Found_obsolete_UDIF_format);
+            AaruConsole.Verbose(Localization.Found_obsolete_UDIF_format);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.signature = 0x{0:X8}",     _footer.signature);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.version = {0}",            _footer.version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.headerSize = {0}",         _footer.headerSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.flags = {0}",              _footer.flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.runningDataForkOff = {0}", _footer.runningDataForkOff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.dataForkOff = {0}",        _footer.dataForkOff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.dataForkLen = {0}",        _footer.dataForkLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.rsrcForkOff = {0}",        _footer.rsrcForkOff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.rsrcForkLen = {0}",        _footer.rsrcForkLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.segmentNumber = {0}",      _footer.segmentNumber);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.segmentCount = {0}",       _footer.segmentCount);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.segmentId = {0}",          _footer.segmentId);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.dataForkChkType = {0}",    _footer.dataForkChkType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.dataForkLen = {0}",        _footer.dataForkLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.dataForkChk = 0x{0:X8}",   _footer.dataForkChk);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.plistOff = {0}",           _footer.plistOff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.plistLen = {0}",           _footer.plistLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.masterChkType = {0}",      _footer.masterChkType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.masterChkLen = {0}",       _footer.masterChkLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.masterChk = 0x{0:X8}",     _footer.masterChk);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.imageVariant = {0}",       _footer.imageVariant);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.sectorCount = {0}",        _footer.sectorCount);
+        AaruConsole.Debug(MODULE_NAME, "footer.signature = 0x{0:X8}",     _footer.signature);
+        AaruConsole.Debug(MODULE_NAME, "footer.version = {0}",            _footer.version);
+        AaruConsole.Debug(MODULE_NAME, "footer.headerSize = {0}",         _footer.headerSize);
+        AaruConsole.Debug(MODULE_NAME, "footer.flags = {0}",              _footer.flags);
+        AaruConsole.Debug(MODULE_NAME, "footer.runningDataForkOff = {0}", _footer.runningDataForkOff);
+        AaruConsole.Debug(MODULE_NAME, "footer.dataForkOff = {0}",        _footer.dataForkOff);
+        AaruConsole.Debug(MODULE_NAME, "footer.dataForkLen = {0}",        _footer.dataForkLen);
+        AaruConsole.Debug(MODULE_NAME, "footer.rsrcForkOff = {0}",        _footer.rsrcForkOff);
+        AaruConsole.Debug(MODULE_NAME, "footer.rsrcForkLen = {0}",        _footer.rsrcForkLen);
+        AaruConsole.Debug(MODULE_NAME, "footer.segmentNumber = {0}",      _footer.segmentNumber);
+        AaruConsole.Debug(MODULE_NAME, "footer.segmentCount = {0}",       _footer.segmentCount);
+        AaruConsole.Debug(MODULE_NAME, "footer.segmentId = {0}",          _footer.segmentId);
+        AaruConsole.Debug(MODULE_NAME, "footer.dataForkChkType = {0}",    _footer.dataForkChkType);
+        AaruConsole.Debug(MODULE_NAME, "footer.dataForkLen = {0}",        _footer.dataForkLen);
+        AaruConsole.Debug(MODULE_NAME, "footer.dataForkChk = 0x{0:X8}",   _footer.dataForkChk);
+        AaruConsole.Debug(MODULE_NAME, "footer.plistOff = {0}",           _footer.plistOff);
+        AaruConsole.Debug(MODULE_NAME, "footer.plistLen = {0}",           _footer.plistLen);
+        AaruConsole.Debug(MODULE_NAME, "footer.masterChkType = {0}",      _footer.masterChkType);
+        AaruConsole.Debug(MODULE_NAME, "footer.masterChkLen = {0}",       _footer.masterChkLen);
+        AaruConsole.Debug(MODULE_NAME, "footer.masterChk = 0x{0:X8}",     _footer.masterChk);
+        AaruConsole.Debug(MODULE_NAME, "footer.imageVariant = {0}",       _footer.imageVariant);
+        AaruConsole.Debug(MODULE_NAME, "footer.sectorCount = {0}",        _footer.sectorCount);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "footer.reserved1 is empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(_footer.reserved1));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "footer.reserved2 is empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(_footer.reserved2));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "footer.reserved3 is empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(_footer.reserved3));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "footer.reserved4 is empty? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(_footer.reserved4));
 
@@ -132,7 +132,7 @@ public sealed partial class Udif
 
         if(_footer.plistLen == 0 && _footer.rsrcForkLen != 0)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_resource_fork);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_resource_fork);
             byte[] rsrcB = new byte[_footer.rsrcForkLen];
             stream.Seek((long)_footer.rsrcForkOff, SeekOrigin.Begin);
             stream.EnsureRead(rsrcB, 0, rsrcB.Length);
@@ -141,7 +141,7 @@ public sealed partial class Udif
 
             if(!rsrc.ContainsKey(BLOCK_OS_TYPE))
             {
-                AaruConsole.ErrorWriteLine(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
+                AaruConsole.Error(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -150,14 +150,14 @@ public sealed partial class Udif
 
             if(blkxRez == null)
             {
-                AaruConsole.ErrorWriteLine(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
+                AaruConsole.Error(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
 
                 return ErrorNumber.InvalidArgument;
             }
 
             if(blkxRez.GetIds().Length == 0)
             {
-                AaruConsole.ErrorWriteLine(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
+                AaruConsole.Error(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -170,24 +170,24 @@ public sealed partial class Udif
         }
         else if(_footer.plistLen != 0)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_property_list);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_property_list);
             byte[] plistB = new byte[_footer.plistLen];
             stream.Seek((long)_footer.plistOff, SeekOrigin.Begin);
             stream.EnsureRead(plistB, 0, plistB.Length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Parsing_property_list);
+            AaruConsole.Debug(MODULE_NAME, Localization.Parsing_property_list);
             var plist = (NSDictionary)XmlPropertyListParser.Parse(plistB);
 
             if(plist == null)
             {
-                AaruConsole.ErrorWriteLine(Localization.Could_not_parse_property_list);
+                AaruConsole.Error(Localization.Could_not_parse_property_list);
 
                 return ErrorNumber.InOutError;
             }
 
             if(!plist.TryGetValue(RESOURCE_FORK_KEY, out NSObject rsrcObj))
             {
-                AaruConsole.ErrorWriteLine(Localization.Could_not_retrieve_resource_fork);
+                AaruConsole.Error(Localization.Could_not_retrieve_resource_fork);
 
                 return ErrorNumber.InOutError;
             }
@@ -196,7 +196,7 @@ public sealed partial class Udif
 
             if(!rsrc.TryGetValue(BLOCK_KEY, out NSObject blkxObj))
             {
-                AaruConsole.ErrorWriteLine(Localization.Could_not_retrieve_block_chunks_array);
+                AaruConsole.Error(Localization.Could_not_retrieve_block_chunks_array);
 
                 return ErrorNumber.InOutError;
             }
@@ -207,14 +207,14 @@ public sealed partial class Udif
             {
                 if(!part.TryGetValue("Name", out _))
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Could_not_retrieve_Name);
+                    AaruConsole.Error(Localization.Could_not_retrieve_Name);
 
                     return ErrorNumber.InOutError;
                 }
 
                 if(!part.TryGetValue("Data", out NSObject dataObj))
                 {
-                    AaruConsole.ErrorWriteLine(Localization.Could_not_retrieve_Data);
+                    AaruConsole.Error(Localization.Could_not_retrieve_Data);
 
                     return ErrorNumber.InOutError;
                 }
@@ -233,12 +233,12 @@ public sealed partial class Udif
         {
             if(imageFilter.ResourceForkLength == 0)
             {
-                AaruConsole.ErrorWriteLine(Localization.This_image_needs_the_resource_fork_to_work);
+                AaruConsole.Error(Localization.This_image_needs_the_resource_fork_to_work);
 
                 return ErrorNumber.InvalidArgument;
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_resource_fork);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_resource_fork);
             Stream rsrcStream = imageFilter.GetResourceForkStream();
 
             byte[] rsrcB = new byte[rsrcStream.Length];
@@ -249,7 +249,7 @@ public sealed partial class Udif
 
             if(!rsrc.ContainsKey(BLOCK_OS_TYPE))
             {
-                AaruConsole.ErrorWriteLine(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
+                AaruConsole.Error(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -258,14 +258,14 @@ public sealed partial class Udif
 
             if(blkxRez == null)
             {
-                AaruConsole.ErrorWriteLine(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
+                AaruConsole.Error(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
 
                 return ErrorNumber.InvalidArgument;
             }
 
             if(blkxRez.GetIds().Length == 0)
             {
-                AaruConsole.ErrorWriteLine(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
+                AaruConsole.Error(Localization.Image_resource_fork_doesnt_contain_UDIF_block_chunks);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -315,7 +315,7 @@ public sealed partial class Udif
         else
             _imageInfo.Application = "DiskCopy";
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Image_application_0_version_1,
                                    _imageInfo.Application,
                                    _imageInfo.ApplicationVersion);
@@ -324,7 +324,7 @@ public sealed partial class Udif
 
         if(blkxList.Count == 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.Could_not_retrieve_block_chunks);
+            AaruConsole.Error(Localization.Could_not_retrieve_block_chunks);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -337,25 +337,25 @@ public sealed partial class Udif
             Array.Copy(blkxBytes, 0, bHdrB, 0, Marshal.SizeOf<BlockHeader>());
             BlockHeader bHdr = Marshal.ByteArrayToStructureBigEndian<BlockHeader>(bHdrB);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.signature = 0x{0:X8}",  bHdr.signature);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.version = {0}",         bHdr.version);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.sectorStart = {0}",     bHdr.sectorStart);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.sectorCount = {0}",     bHdr.sectorCount);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.dataOffset = {0}",      bHdr.dataOffset);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.buffers = {0}",         bHdr.buffers);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.descriptor = 0x{0:X8}", bHdr.descriptor);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.reserved1 = {0}",       bHdr.reserved1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.reserved2 = {0}",       bHdr.reserved2);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.reserved3 = {0}",       bHdr.reserved3);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.reserved4 = {0}",       bHdr.reserved4);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.reserved5 = {0}",       bHdr.reserved5);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.reserved6 = {0}",       bHdr.reserved6);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.checksumType = {0}",    bHdr.checksumType);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.checksumLen = {0}",     bHdr.checksumLen);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.checksum = 0x{0:X8}",   bHdr.checksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunks = {0}",          bHdr.chunks);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.signature = 0x{0:X8}",  bHdr.signature);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.version = {0}",         bHdr.version);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.sectorStart = {0}",     bHdr.sectorStart);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.sectorCount = {0}",     bHdr.sectorCount);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.dataOffset = {0}",      bHdr.dataOffset);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.buffers = {0}",         bHdr.buffers);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.descriptor = 0x{0:X8}", bHdr.descriptor);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.reserved1 = {0}",       bHdr.reserved1);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.reserved2 = {0}",       bHdr.reserved2);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.reserved3 = {0}",       bHdr.reserved3);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.reserved4 = {0}",       bHdr.reserved4);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.reserved5 = {0}",       bHdr.reserved5);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.reserved6 = {0}",       bHdr.reserved6);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.checksumType = {0}",    bHdr.checksumType);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.checksumLen = {0}",     bHdr.checksumLen);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.checksum = 0x{0:X8}",   bHdr.checksum);
+            AaruConsole.Debug(MODULE_NAME, "bHdr.chunks = {0}",          bHdr.chunks);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "bHdr.reservedChk is empty? = {0}",
                                        ArrayHelpers.ArrayIsNullOrEmpty(bHdr.reservedChk));
 
@@ -373,12 +373,12 @@ public sealed partial class Udif
 
                 BlockChunk bChnk = Marshal.ByteArrayToStructureBigEndian<BlockChunk>(bChnkB);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunk[{0}].type = 0x{1:X8}", i, bChnk.type);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunk[{0}].comment = {1}",   i, bChnk.comment);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunk[{0}].sector = {1}",    i, bChnk.sector);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunk[{0}].sectors = {1}",   i, bChnk.sectors);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunk[{0}].offset = {1}",    i, bChnk.offset);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "bHdr.chunk[{0}].length = {1}",    i, bChnk.length);
+                AaruConsole.Debug(MODULE_NAME, "bHdr.chunk[{0}].type = 0x{1:X8}", i, bChnk.type);
+                AaruConsole.Debug(MODULE_NAME, "bHdr.chunk[{0}].comment = {1}",   i, bChnk.comment);
+                AaruConsole.Debug(MODULE_NAME, "bHdr.chunk[{0}].sector = {1}",    i, bChnk.sector);
+                AaruConsole.Debug(MODULE_NAME, "bHdr.chunk[{0}].sectors = {1}",   i, bChnk.sectors);
+                AaruConsole.Debug(MODULE_NAME, "bHdr.chunk[{0}].offset = {1}",    i, bChnk.offset);
+                AaruConsole.Debug(MODULE_NAME, "bHdr.chunk[{0}].length = {1}",    i, bChnk.length);
 
                 if(bChnk.type == CHUNK_TYPE_END) break;
 
@@ -396,22 +396,22 @@ public sealed partial class Udif
 
                     // TODO: Handle compressed chunks
                     case CHUNK_TYPE_KENCODE:
-                        AaruConsole.ErrorWriteLine(Localization.Chunks_compressed_with_KenCode_are_not_yet_supported);
+                        AaruConsole.Error(Localization.Chunks_compressed_with_KenCode_are_not_yet_supported);
 
                         return ErrorNumber.NotImplemented;
                     case CHUNK_TYPE_LZH:
-                        AaruConsole.ErrorWriteLine(Localization.Chunks_compressed_with_LZH_are_not_yet_supported);
+                        AaruConsole.Error(Localization.Chunks_compressed_with_LZH_are_not_yet_supported);
 
                         return ErrorNumber.NotImplemented;
                     case CHUNK_TYPE_LZFSE when !LZFSE.IsSupported:
-                        AaruConsole.ErrorWriteLine(Localization.Chunks_compressed_with_lzfse_are_not_yet_supported);
+                        AaruConsole.Error(Localization.Chunks_compressed_with_lzfse_are_not_yet_supported);
 
                         return ErrorNumber.NotImplemented;
                 }
 
                 if(bChnk.type is > CHUNK_TYPE_NOCOPY and < CHUNK_TYPE_COMMNT or > CHUNK_TYPE_LZMA and < CHUNK_TYPE_END)
                 {
-                    AaruConsole.ErrorWriteLine(string.Format(Localization.Unsupported_chunk_type_0_found, bChnk.type));
+                    AaruConsole.Error(string.Format(Localization.Unsupported_chunk_type_0_found, bChnk.type));
 
                     return ErrorNumber.InvalidArgument;
                 }
diff --git a/Aaru.Images/UDIF/Write.cs b/Aaru.Images/UDIF/Write.cs
index 2bd098748..715f6f885 100644
--- a/Aaru.Images/UDIF/Write.cs
+++ b/Aaru.Images/UDIF/Write.cs
@@ -82,7 +82,7 @@ public sealed partial class Udif
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/UkvFdi/Read.cs b/Aaru.Images/UkvFdi/Read.cs
index 48708b126..96a53e023 100644
--- a/Aaru.Images/UkvFdi/Read.cs
+++ b/Aaru.Images/UkvFdi/Read.cs
@@ -59,19 +59,19 @@ public sealed partial class UkvFdi
 
         Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.addInfoLen = {0}", hdr.addInfoLen);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.cylinders = {0}",  hdr.cylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.dataOff = {0}",    hdr.dataOff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.descOff = {0}",    hdr.descOff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.flags = {0}",      hdr.flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.heads = {0}",      hdr.heads);
+        AaruConsole.Debug(MODULE_NAME, "hdr.addInfoLen = {0}", hdr.addInfoLen);
+        AaruConsole.Debug(MODULE_NAME, "hdr.cylinders = {0}",  hdr.cylinders);
+        AaruConsole.Debug(MODULE_NAME, "hdr.dataOff = {0}",    hdr.dataOff);
+        AaruConsole.Debug(MODULE_NAME, "hdr.descOff = {0}",    hdr.descOff);
+        AaruConsole.Debug(MODULE_NAME, "hdr.flags = {0}",      hdr.flags);
+        AaruConsole.Debug(MODULE_NAME, "hdr.heads = {0}",      hdr.heads);
 
         stream.Seek(hdr.descOff, SeekOrigin.Begin);
         byte[] description = new byte[hdr.dataOff - hdr.descOff];
         stream.EnsureRead(description, 0, description.Length);
         _imageInfo.Comments = StringHandlers.CToString(description);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.description = \"{0}\"", _imageInfo.Comments);
+        AaruConsole.Debug(MODULE_NAME, "hdr.description = \"{0}\"", _imageInfo.Comments);
 
         stream.Seek(0xE + hdr.addInfoLen, SeekOrigin.Begin);
 
@@ -96,10 +96,10 @@ public sealed partial class UkvFdi
                 byte sectors = (byte)stream.ReadByte();
                 uint trkOff  = BitConverter.ToUInt32(sctB, 0);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trkhdr.c = {0}",       cyl);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trkhdr.h = {0}",       head);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trkhdr.sectors = {0}", sectors);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "trkhdr.off = {0}",     trkOff);
+                AaruConsole.Debug(MODULE_NAME, "trkhdr.c = {0}",       cyl);
+                AaruConsole.Debug(MODULE_NAME, "trkhdr.h = {0}",       head);
+                AaruConsole.Debug(MODULE_NAME, "trkhdr.sectors = {0}", sectors);
+                AaruConsole.Debug(MODULE_NAME, "trkhdr.off = {0}",     trkOff);
 
                 sectorsOff[cyl][head]   = new uint[sectors];
                 _sectorsData[cyl][head] = new byte[sectors][];
@@ -117,13 +117,13 @@ public sealed partial class UkvFdi
                     stream.EnsureRead(offB, 0, 2);
                     ushort secOff = BitConverter.ToUInt16(offB, 0);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.c = {0}",       c);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.h = {0}",       h);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.r = {0}",       r);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.n = {0} ({1})", n, 128 << n);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "sechdr.f = {0}",       f);
+                    AaruConsole.Debug(MODULE_NAME, "sechdr.c = {0}",       c);
+                    AaruConsole.Debug(MODULE_NAME, "sechdr.h = {0}",       h);
+                    AaruConsole.Debug(MODULE_NAME, "sechdr.r = {0}",       r);
+                    AaruConsole.Debug(MODULE_NAME, "sechdr.n = {0} ({1})", n, 128 << n);
+                    AaruConsole.Debug(MODULE_NAME, "sechdr.f = {0}",       f);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "sechdr.off = {0} ({1})",
                                                secOff,
                                                secOff + trkOff + hdr.dataOff);
diff --git a/Aaru.Images/VDI/Read.cs b/Aaru.Images/VDI/Read.cs
index d71dade75..750f40bf4 100644
--- a/Aaru.Images/VDI/Read.cs
+++ b/Aaru.Images/VDI/Read.cs
@@ -60,38 +60,38 @@ public sealed partial class Vdi
         stream.EnsureRead(vHdrB, 0, Marshal.SizeOf<Header>());
         _vHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(vHdrB);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.creator = {0}", _vHdr.creator);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.magic = {0}",   _vHdr.magic);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.creator = {0}", _vHdr.creator);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.magic = {0}",   _vHdr.magic);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.version = {0}.{1}", _vHdr.majorVersion, _vHdr.minorVersion);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.version = {0}.{1}", _vHdr.majorVersion, _vHdr.minorVersion);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.headerSize = {0}",        _vHdr.headerSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.imageType = {0}",         _vHdr.imageType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.imageFlags = {0}",        _vHdr.imageFlags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.description = {0}",       _vHdr.comments);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.offsetBlocks = {0}",      _vHdr.offsetBlocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.offsetData = {0}",        _vHdr.offsetData);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.cylinders = {0}",         _vHdr.cylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.heads = {0}",             _vHdr.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.spt = {0}",               _vHdr.spt);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.sectorSize = {0}",        _vHdr.sectorSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.size = {0}",              _vHdr.size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.blockSize = {0}",         _vHdr.blockSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.blockExtraData = {0}",    _vHdr.blockExtraData);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.blocks = {0}",            _vHdr.blocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.allocatedBlocks = {0}",   _vHdr.allocatedBlocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.uuid = {0}",              _vHdr.uuid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.snapshotUuid = {0}",      _vHdr.snapshotUuid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.linkUuid = {0}",          _vHdr.linkUuid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.parentUuid = {0}",        _vHdr.parentUuid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.logicalCylinders = {0}",  _vHdr.logicalCylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.logicalHeads = {0}",      _vHdr.logicalHeads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.logicalSpt = {0}",        _vHdr.logicalSpt);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "vHdr.logicalSectorSize = {0}", _vHdr.logicalSectorSize);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.headerSize = {0}",        _vHdr.headerSize);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.imageType = {0}",         _vHdr.imageType);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.imageFlags = {0}",        _vHdr.imageFlags);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.description = {0}",       _vHdr.comments);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.offsetBlocks = {0}",      _vHdr.offsetBlocks);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.offsetData = {0}",        _vHdr.offsetData);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.cylinders = {0}",         _vHdr.cylinders);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.heads = {0}",             _vHdr.heads);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.spt = {0}",               _vHdr.spt);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.sectorSize = {0}",        _vHdr.sectorSize);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.size = {0}",              _vHdr.size);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.blockSize = {0}",         _vHdr.blockSize);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.blockExtraData = {0}",    _vHdr.blockExtraData);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.blocks = {0}",            _vHdr.blocks);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.allocatedBlocks = {0}",   _vHdr.allocatedBlocks);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.uuid = {0}",              _vHdr.uuid);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.snapshotUuid = {0}",      _vHdr.snapshotUuid);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.linkUuid = {0}",          _vHdr.linkUuid);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.parentUuid = {0}",        _vHdr.parentUuid);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.logicalCylinders = {0}",  _vHdr.logicalCylinders);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.logicalHeads = {0}",      _vHdr.logicalHeads);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.logicalSpt = {0}",        _vHdr.logicalSpt);
+        AaruConsole.Debug(MODULE_NAME, "vHdr.logicalSectorSize = {0}", _vHdr.logicalSectorSize);
 
         if(_vHdr.imageType != VdiImageType.Normal)
         {
-            AaruConsole.ErrorWriteLine(string.Format(Localization.Support_for_image_type_0_not_yet_implemented,
+            AaruConsole.Error(string.Format(Localization.Support_for_image_type_0_not_yet_implemented,
                                                      _vHdr.imageType));
 
             return ErrorNumber.InvalidArgument;
@@ -99,14 +99,14 @@ public sealed partial class Vdi
 
         var blockMapStopwatch = new Stopwatch();
         blockMapStopwatch.Start();
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_Image_Block_Map);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_Image_Block_Map);
         stream.Seek(_vHdr.offsetBlocks, SeekOrigin.Begin);
         byte[] ibmB = new byte[_vHdr.blocks * 4];
         stream.EnsureRead(ibmB, 0, ibmB.Length);
         _ibm = MemoryMarshal.Cast<byte, uint>(ibmB).ToArray();
         blockMapStopwatch.Stop();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Reading_Image_Block_Map_took_0_ms,
                                    blockMapStopwatch.Elapsed.TotalMilliseconds);
 
diff --git a/Aaru.Images/VDI/Write.cs b/Aaru.Images/VDI/Write.cs
index 255df451c..6214889e0 100644
--- a/Aaru.Images/VDI/Write.cs
+++ b/Aaru.Images/VDI/Write.cs
@@ -88,7 +88,7 @@ public sealed partial class Vdi
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/VHD/Read.cs b/Aaru.Images/VHD/Read.cs
index 438e86b14..cc046580f 100644
--- a/Aaru.Images/VHD/Read.cs
+++ b/Aaru.Images/VHD/Read.cs
@@ -88,12 +88,12 @@ public sealed partial class Vhd
         uint headerCalculatedChecksum = VhdChecksum(header);
         uint footerCalculatedChecksum = VhdChecksum(footer);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Header_checksum_equals_0_X8_calculated_equals_1_X8,
                                    headerChecksum,
                                    headerCalculatedChecksum);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Header_checksum_equals_0_X8_calculated_equals_1_X8,
                                    footerChecksum,
                                    footerCalculatedChecksum);
@@ -113,7 +113,7 @@ public sealed partial class Vhd
         }
         else
         {
-            AaruConsole.ErrorWriteLine(Localization
+            AaruConsole.Error(Localization
                                           .VirtualPC_plugin_Both_header_and_footer_are_corrupt_image_cannot_be_opened);
 
             return ErrorNumber.InvalidArgument;
@@ -147,50 +147,50 @@ public sealed partial class Vhd
         var sha1Ctx = new Sha1Context();
         sha1Ctx.Update(_thisFooter.Reserved);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.cookie = 0x{0:X8}",   _thisFooter.Cookie);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.features = 0x{0:X8}", _thisFooter.Features);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.version = 0x{0:X8}",  _thisFooter.Version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.offset = {0}",        _thisFooter.Offset);
+        AaruConsole.Debug(MODULE_NAME, "footer.cookie = 0x{0:X8}",   _thisFooter.Cookie);
+        AaruConsole.Debug(MODULE_NAME, "footer.features = 0x{0:X8}", _thisFooter.Features);
+        AaruConsole.Debug(MODULE_NAME, "footer.version = 0x{0:X8}",  _thisFooter.Version);
+        AaruConsole.Debug(MODULE_NAME, "footer.offset = {0}",        _thisFooter.Offset);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "footer.timestamp = 0x{0:X8} ({1})",
                                    _thisFooter.Timestamp,
                                    _thisDateTime);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "footer.creatorApplication = 0x{0:X8} (\"{1}\")",
                                    _thisFooter.CreatorApplication,
                                    Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisFooter
                                                                .CreatorApplication)));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.creatorVersion = 0x{0:X8}", _thisFooter.CreatorVersion);
+        AaruConsole.Debug(MODULE_NAME, "footer.creatorVersion = 0x{0:X8}", _thisFooter.CreatorVersion);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "footer.creatorHostOS = 0x{0:X8} (\"{1}\")",
                                    _thisFooter.CreatorHostOs,
                                    Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisFooter.CreatorHostOs)));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.originalSize = {0}", _thisFooter.OriginalSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.currentSize = {0}",  _thisFooter.CurrentSize);
+        AaruConsole.Debug(MODULE_NAME, "footer.originalSize = {0}", _thisFooter.OriginalSize);
+        AaruConsole.Debug(MODULE_NAME, "footer.currentSize = {0}",  _thisFooter.CurrentSize);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "footer.diskGeometry = 0x{0:X8} (C/H/S: {1}/{2}/{3})",
                                    _thisFooter.DiskGeometry,
                                    (_thisFooter.DiskGeometry & 0xFFFF0000) >> 16,
                                    (_thisFooter.DiskGeometry & 0xFF00)     >> 8,
                                    _thisFooter.DiskGeometry & 0xFF);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.diskType = 0x{0:X8}",     _thisFooter.DiskType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.checksum = 0x{0:X8}",     _thisFooter.Checksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.uniqueId = {0}",          _thisFooter.UniqueId);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.savedState = 0x{0:X2}",   _thisFooter.SavedState);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "footer.reserved's SHA1 = 0x{0}", sha1Ctx.End());
+        AaruConsole.Debug(MODULE_NAME, "footer.diskType = 0x{0:X8}",     _thisFooter.DiskType);
+        AaruConsole.Debug(MODULE_NAME, "footer.checksum = 0x{0:X8}",     _thisFooter.Checksum);
+        AaruConsole.Debug(MODULE_NAME, "footer.uniqueId = {0}",          _thisFooter.UniqueId);
+        AaruConsole.Debug(MODULE_NAME, "footer.savedState = 0x{0:X2}",   _thisFooter.SavedState);
+        AaruConsole.Debug(MODULE_NAME, "footer.reserved's SHA1 = 0x{0}", sha1Ctx.End());
 
         if(_thisFooter.Version == VERSION1)
             _imageInfo.Version = "1.0";
         else
         {
-            AaruConsole.ErrorWriteLine(string.Format(Localization.VirtualPC_plugin_Unknown_image_type_0_found,
+            AaruConsole.Error(string.Format(Localization.VirtualPC_plugin_Unknown_image_type_0_found,
                                                      _thisFooter.DiskType));
 
             return ErrorNumber.InvalidArgument;
@@ -370,14 +370,14 @@ public sealed partial class Vhd
 
             uint dynamicChecksumCalculated = VhdChecksum(dynamicBytes);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Dynamic_header_checksum_equals_0_X8_calculated_1_X8,
                                        dynamicChecksum,
                                        dynamicChecksumCalculated);
 
             if(dynamicChecksum != dynamicChecksumCalculated)
             {
-                AaruConsole.ErrorWriteLine(Localization
+                AaruConsole.Error(Localization
                                               .VirtualPC_plugin_Both_header_and_footer_are_corrupt_image_cannot_be_opened);
 
                 return ErrorNumber.InvalidArgument;
@@ -429,61 +429,61 @@ public sealed partial class Vhd
             sha1Ctx = new Sha1Context();
             sha1Ctx.Update(_thisDynamic.Reserved2);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.cookie = 0x{0:X8}", _thisDynamic.Cookie);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.dataOffset = {0}",  _thisDynamic.DataOffset);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.tableOffset = {0}", _thisDynamic.TableOffset);
+            AaruConsole.Debug(MODULE_NAME, "dynamic.cookie = 0x{0:X8}", _thisDynamic.Cookie);
+            AaruConsole.Debug(MODULE_NAME, "dynamic.dataOffset = {0}",  _thisDynamic.DataOffset);
+            AaruConsole.Debug(MODULE_NAME, "dynamic.tableOffset = {0}", _thisDynamic.TableOffset);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.headerVersion = 0x{0:X8}", _thisDynamic.HeaderVersion);
+            AaruConsole.Debug(MODULE_NAME, "dynamic.headerVersion = 0x{0:X8}", _thisDynamic.HeaderVersion);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.maxTableEntries = {0}", _thisDynamic.MaxTableEntries);
+            AaruConsole.Debug(MODULE_NAME, "dynamic.maxTableEntries = {0}", _thisDynamic.MaxTableEntries);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.blockSize = {0}",     _thisDynamic.BlockSize);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.checksum = 0x{0:X8}", _thisDynamic.Checksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.parentID = {0}",      _thisDynamic.ParentId);
+            AaruConsole.Debug(MODULE_NAME, "dynamic.blockSize = {0}",     _thisDynamic.BlockSize);
+            AaruConsole.Debug(MODULE_NAME, "dynamic.checksum = 0x{0:X8}", _thisDynamic.Checksum);
+            AaruConsole.Debug(MODULE_NAME, "dynamic.parentID = {0}",      _thisDynamic.ParentId);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dynamic.parentTimestamp = 0x{0:X8} ({1})",
                                        _thisDynamic.ParentTimestamp,
                                        _parentDateTime);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.reserved = 0x{0:X8}", _thisDynamic.Reserved);
+            AaruConsole.Debug(MODULE_NAME, "dynamic.reserved = 0x{0:X8}", _thisDynamic.Reserved);
 
             for(int i = 0; i < 8; i++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dynamic.locatorEntries[{0}].platformCode = 0x{1:X8} (\"{2}\")",
                                            i,
                                            _thisDynamic.LocatorEntries[i].PlatformCode,
                                            Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisDynamic
                                                                        .LocatorEntries[i].PlatformCode)));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dynamic.locatorEntries[{0}].platformDataSpace = {1}",
                                            i,
                                            _thisDynamic.LocatorEntries[i].PlatformDataSpace);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dynamic.locatorEntries[{0}].platformDataLength = {1}",
                                            i,
                                            _thisDynamic.LocatorEntries[i].PlatformDataLength);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dynamic.locatorEntries[{0}].reserved = 0x{1:X8}",
                                            i,
                                            _thisDynamic.LocatorEntries[i].Reserved);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dynamic.locatorEntries[{0}].platformDataOffset = {1}",
                                            i,
                                            _thisDynamic.LocatorEntries[i].PlatformDataOffset);
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.parentName = \"{0}\"",     _thisDynamic.ParentName);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.reserved2's SHA1 = 0x{0}", sha1Ctx.End());
+            AaruConsole.Debug(MODULE_NAME, "dynamic.parentName = \"{0}\"",     _thisDynamic.ParentName);
+            AaruConsole.Debug(MODULE_NAME, "dynamic.reserved2's SHA1 = 0x{0}", sha1Ctx.End());
 
             if(_thisDynamic.HeaderVersion != VERSION1)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization.VirtualPC_plugin_Unknown_image_type_0_found,
+                AaruConsole.Error(string.Format(Localization.VirtualPC_plugin_Unknown_image_type_0_found,
                                                          _thisFooter.DiskType));
 
                 return ErrorNumber.InvalidArgument;
@@ -502,7 +502,7 @@ public sealed partial class Vhd
 
             batStopwatch.Stop();
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Filling_the_BAT_took_0_seconds,
                                        batStopwatch.Elapsed.TotalSeconds);
 
@@ -517,7 +517,7 @@ public sealed partial class Vhd
                                             /
                                              512);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Bitmap_is_0_sectors, _bitmapSize);
+            AaruConsole.Debug(MODULE_NAME, Localization.Bitmap_is_0_sectors, _bitmapSize);
         }
 
         _imageInfo.MetadataMediaType = MetadataMediaType.BlockMedia;
@@ -550,7 +550,7 @@ public sealed partial class Vhd
                         {
                             case PLATFORM_CODE_WINDOWS_ABSOLUTE:
                             case PLATFORM_CODE_WINDOWS_RELATIVE:
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            "dynamic.locatorEntries[{0}] = \"{1}\"",
                                                            i,
                                                            Encoding.ASCII.GetString(_locatorEntriesData[i]));
@@ -558,21 +558,21 @@ public sealed partial class Vhd
                                 break;
                             case PLATFORM_CODE_WINDOWS_ABSOLUTE_U:
                             case PLATFORM_CODE_WINDOWS_RELATIVE_U:
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            "dynamic.locatorEntries[{0}] = \"{1}\"",
                                                            i,
                                                            Encoding.BigEndianUnicode.GetString(_locatorEntriesData[i]));
 
                                 break;
                             case PLATFORM_CODE_MACINTOSH_URI:
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            "dynamic.locatorEntries[{0}] = \"{1}\"",
                                                            i,
                                                            Encoding.UTF8.GetString(_locatorEntriesData[i]));
 
                                 break;
                             default:
-                                AaruConsole.DebugWriteLine(MODULE_NAME, "dynamic.locatorEntries[{0}] =", i);
+                                AaruConsole.Debug(MODULE_NAME, "dynamic.locatorEntries[{0}] =", i);
                                 PrintHex.PrintHexArray(_locatorEntriesData[i], 64);
 
                                 break;
@@ -606,7 +606,7 @@ public sealed partial class Vhd
                                 parentPath = parentPath.Remove(0, 16);
                             else
                             {
-                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                AaruConsole.Debug(MODULE_NAME,
                                                            Localization
                                                               .Unsupported_protocol_classified_found_in_URI_parent_path_0,
                                                            parentPath);
@@ -619,7 +619,7 @@ public sealed partial class Vhd
 
                     if(parentPath != null)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Possible_parent_path_0, parentPath);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Possible_parent_path_0, parentPath);
 
                         IFilter parentFilter =
                             PluginRegister.Singleton.GetFilter(Path.Combine(imageFilter.ParentFolder, parentPath));
@@ -634,7 +634,7 @@ public sealed partial class Vhd
 
                 if(!locatorFound)
                 {
-                    AaruConsole.ErrorWriteLine(Localization
+                    AaruConsole.Error(Localization
                                                   .VirtualPC_plugin_Cannot_find_parent_file_for_differencing_disk_image);
 
                     return ErrorNumber.NoSuchFile;
@@ -648,7 +648,7 @@ public sealed partial class Vhd
 
                     if(parentFilter == null)
                     {
-                        AaruConsole.ErrorWriteLine(Localization.VirtualPC_plugin_Cannot_find_parent_image_filter);
+                        AaruConsole.Error(Localization.VirtualPC_plugin_Cannot_find_parent_image_filter);
 
                         return ErrorNumber.NoSuchFile;
                     }
@@ -662,7 +662,7 @@ public sealed partial class Vhd
 
                     if(!_parentImage.Identify(parentFilter))
                     {
-                        AaruConsole.ErrorWriteLine(Localization
+                        AaruConsole.Error(Localization
                                                       .VirtualPC_plugin_Parent_image_is_not_a_Virtual_PC_disk_image);
 
                         return ErrorNumber.InvalidArgument;
@@ -672,7 +672,7 @@ public sealed partial class Vhd
 
                     if(parentError != ErrorNumber.NoError)
                     {
-                        AaruConsole.ErrorWriteLine(string.Format(Localization
+                        AaruConsole.Error(string.Format(Localization
                                                                     .VirtualPC_plugin_Error_0_opening_parent_disk_image,
                                                                  parentError));
 
@@ -686,7 +686,7 @@ public sealed partial class Vhd
                     // More funny even, tested parent images show an empty host OS, and child images a correct one.
                     if(_parentImage.Info.Sectors == _imageInfo.Sectors) return ErrorNumber.NoError;
 
-                    AaruConsole.ErrorWriteLine(Localization.VirtualPC_plugin_Parent_image_is_of_different_size);
+                    AaruConsole.Error(Localization.VirtualPC_plugin_Parent_image_is_of_different_size);
 
                     return ErrorNumber.InvalidArgument;
                 }
@@ -695,12 +695,12 @@ public sealed partial class Vhd
             case TYPE_DEPRECATED1:
             case TYPE_DEPRECATED2:
             case TYPE_DEPRECATED3:
-                AaruConsole.ErrorWriteLine(Localization.VirtualPC_plugin_Deprecated_image_type_found);
+                AaruConsole.Error(Localization.VirtualPC_plugin_Deprecated_image_type_found);
 
                 return ErrorNumber.NotImplemented;
 
             default:
-                AaruConsole.ErrorWriteLine(string.Format(Localization.VirtualPC_plugin_Unknown_image_type_0_found,
+                AaruConsole.Error(string.Format(Localization.VirtualPC_plugin_Unknown_image_type_0_found,
                                                          _thisFooter.DiskType));
 
                 return ErrorNumber.InvalidArgument;
@@ -894,12 +894,12 @@ public sealed partial class Vhd
             case TYPE_DEPRECATED1:
             case TYPE_DEPRECATED2:
             case TYPE_DEPRECATED3:
-                AaruConsole.ErrorWriteLine(Localization.VirtualPC_plugin_Deprecated_image_type_found);
+                AaruConsole.Error(Localization.VirtualPC_plugin_Deprecated_image_type_found);
 
                 return ErrorNumber.NotImplemented;
 
             default:
-                AaruConsole.ErrorWriteLine(string.Format(Localization.VirtualPC_plugin_Unknown_image_type_0_found,
+                AaruConsole.Error(string.Format(Localization.VirtualPC_plugin_Unknown_image_type_0_found,
                                                          _thisFooter.DiskType));
 
                 return ErrorNumber.InvalidArgument;
diff --git a/Aaru.Images/VHD/Write.cs b/Aaru.Images/VHD/Write.cs
index a52cba66b..ddb8353df 100644
--- a/Aaru.Images/VHD/Write.cs
+++ b/Aaru.Images/VHD/Write.cs
@@ -116,7 +116,7 @@ public sealed partial class Vhd
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/VHDX/Read.cs b/Aaru.Images/VHDX/Read.cs
index a9b69d7d2..4605a8af2 100644
--- a/Aaru.Images/VHDX/Read.cs
+++ b/Aaru.Images/VHDX/Read.cs
@@ -76,7 +76,7 @@ public sealed partial class Vhdx
 
             if(_vHdr.Signature != VHDX_HEADER_SIG)
             {
-                AaruConsole.ErrorWriteLine(Localization.VHDX_header_not_found);
+                AaruConsole.Error(Localization.VHDX_header_not_found);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -96,7 +96,7 @@ public sealed partial class Vhdx
 
             if(_vRegHdr.signature != VHDX_REGION_SIG)
             {
-                AaruConsole.ErrorWriteLine(Localization.VHDX_region_table_not_found);
+                AaruConsole.Error(Localization.VHDX_region_table_not_found);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -116,7 +116,7 @@ public sealed partial class Vhdx
                 _metadataOffset = (long)_vRegs[i].offset;
             else if((_vRegs[i].flags & REGION_FLAGS_REQUIRED) == REGION_FLAGS_REQUIRED)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization
+                AaruConsole.Error(string.Format(Localization
                                                             .Found_unsupported_and_required_region_Guid_0_not_proceeding_with_image,
                                                          _vRegs[i].guid));
 
@@ -126,14 +126,14 @@ public sealed partial class Vhdx
 
         if(_batOffset == 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.BAT_not_found_cannot_continue);
+            AaruConsole.Error(Localization.BAT_not_found_cannot_continue);
 
             return ErrorNumber.InvalidArgument;
         }
 
         if(_metadataOffset == 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.Metadata_not_found_cannot_continue);
+            AaruConsole.Error(Localization.Metadata_not_found_cannot_continue);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -167,7 +167,7 @@ public sealed partial class Vhdx
                 parentOff = _vMets[i].offset;
             else if((_vMets[i].flags & METADATA_FLAGS_REQUIRED) == METADATA_FLAGS_REQUIRED)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization
+                AaruConsole.Error(string.Format(Localization
                                                             .Found_unsupported_and_required_metadata_Guid_0_not_proceeding_with_image,
                                                          _vMets[i].itemId));
 
@@ -191,7 +191,7 @@ public sealed partial class Vhdx
         }
         else
         {
-            AaruConsole.ErrorWriteLine(Localization.File_parameters_not_found);
+            AaruConsole.Error(Localization.File_parameters_not_found);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -205,7 +205,7 @@ public sealed partial class Vhdx
         }
         else
         {
-            AaruConsole.ErrorWriteLine(Localization.Virtual_disk_size_not_found);
+            AaruConsole.Error(Localization.Virtual_disk_size_not_found);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -227,7 +227,7 @@ public sealed partial class Vhdx
         }
         else
         {
-            AaruConsole.ErrorWriteLine(Localization.Logical_sector_size_not_found);
+            AaruConsole.Error(Localization.Logical_sector_size_not_found);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -241,7 +241,7 @@ public sealed partial class Vhdx
         }
         else
         {
-            AaruConsole.ErrorWriteLine(Localization.Physical_sector_size_not_found);
+            AaruConsole.Error(Localization.Physical_sector_size_not_found);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -255,7 +255,7 @@ public sealed partial class Vhdx
 
             if(_vParHdr.locatorType != _parentTypeVhdxGuid)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization
+                AaruConsole.Error(string.Format(Localization
                                                             .Found_unsupported_and_required_parent_locator_type_0_not_proceeding_with_image,
                                                          _vParHdr.locatorType));
 
@@ -273,7 +273,7 @@ public sealed partial class Vhdx
         }
         else if((_vFileParms.flags & FILE_FLAGS_HAS_PARENT) == FILE_FLAGS_HAS_PARENT)
         {
-            AaruConsole.ErrorWriteLine(Localization.Parent_locator_not_found);
+            AaruConsole.Error(Localization.Parent_locator_not_found);
 
             return ErrorNumber.NoSuchFile;
         }
@@ -363,7 +363,7 @@ public sealed partial class Vhdx
 
             if(!parentWorks)
             {
-                AaruConsole.ErrorWriteLine(Localization.Image_is_differential_but_parent_cannot_be_opened);
+                AaruConsole.Error(Localization.Image_is_differential_but_parent_cannot_be_opened);
 
                 return ErrorNumber.InOutError;
             }
@@ -391,7 +391,7 @@ public sealed partial class Vhdx
         else
             batEntries = (long)(_dataBlocks + (_dataBlocks - 1) / (ulong)_chunkRatio);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_BAT);
+        AaruConsole.Debug(MODULE_NAME, Localization.Reading_BAT);
 
         long readChunks = 0;
         _blockAllocationTable = new ulong[_dataBlocks];
@@ -420,7 +420,7 @@ public sealed partial class Vhdx
 
         if(_hasParent)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_Sector_Bitmap);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_Sector_Bitmap);
 
             var sectorBmpMs = new MemoryStream();
 
@@ -442,7 +442,7 @@ public sealed partial class Vhdx
                     default:
                         if((pt & BAT_FLAGS_MASK) != 0)
                         {
-                            AaruConsole.ErrorWriteLine(string.Format(Localization
+                            AaruConsole.Error(string.Format(Localization
                                                                         .Unsupported_sector_bitmap_block_flags_0_found_not_proceeding,
                                                                      pt & BAT_FLAGS_MASK));
 
@@ -501,7 +501,7 @@ public sealed partial class Vhdx
 
         if((blkPtr & BAT_RESERVED_MASK) != 0)
         {
-            AaruConsole.ErrorWriteLine($"Unknown flags (0x{blkPtr & BAT_RESERVED_MASK:X16}) set in block pointer");
+            AaruConsole.Error($"Unknown flags (0x{blkPtr & BAT_RESERVED_MASK:X16}) set in block pointer");
 
             return ErrorNumber.InvalidArgument;
         }
diff --git a/Aaru.Images/VMware/Read.cs b/Aaru.Images/VMware/Read.cs
index 8a1fc0475..9b90ed776 100644
--- a/Aaru.Images/VMware/Read.cs
+++ b/Aaru.Images/VMware/Read.cs
@@ -85,7 +85,7 @@ public sealed partial class VMware
 
             if(_vmEHdr.descriptorOffset == 0 || _vmEHdr.descriptorSize == 0)
             {
-                AaruConsole.ErrorWriteLine(Localization.Please_open_VMDK_descriptor);
+                AaruConsole.Error(Localization.Please_open_VMDK_descriptor);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -111,7 +111,7 @@ public sealed partial class VMware
 
             if(!_ddfMagicBytes.SequenceEqual(ddfMagic))
             {
-                AaruConsole.ErrorWriteLine(Localization.Not_a_descriptor);
+                AaruConsole.Error(Localization.Not_a_descriptor);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -165,7 +165,7 @@ public sealed partial class VMware
                         Type     = "SPARSE"
                     };
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "{0} {1} {2} \"{3}\" {4}",
                                                newExtent.Access,
                                                newExtent.Sectors,
@@ -217,22 +217,22 @@ public sealed partial class VMware
                 if(matchVersion.Success)
                 {
                     uint.TryParse(matchVersion.Groups["version"].Value, out _version);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "version = {0}", _version);
+                    AaruConsole.Debug(MODULE_NAME, "version = {0}", _version);
                 }
                 else if(matchCid.Success)
                 {
                     _cid = Convert.ToUInt32(matchCid.Groups["cid"].Value, 16);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "cid = {0:x8}", _cid);
+                    AaruConsole.Debug(MODULE_NAME, "cid = {0:x8}", _cid);
                 }
                 else if(matchParentCid.Success)
                 {
                     _parentCid = Convert.ToUInt32(matchParentCid.Groups["cid"].Value, 16);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "parentCID = {0:x8}", _parentCid);
+                    AaruConsole.Debug(MODULE_NAME, "parentCID = {0:x8}", _parentCid);
                 }
                 else if(matchType.Success)
                 {
                     _imageType = matchType.Groups["type"].Value;
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "createType = \"{0}\"", _imageType);
+                    AaruConsole.Debug(MODULE_NAME, "createType = \"{0}\"", _imageType);
                 }
                 else if(matchExtent.Success)
                 {
@@ -254,7 +254,7 @@ public sealed partial class VMware
                     uint.TryParse(matchExtent.Groups["sectors"].Value, out newExtent.Sectors);
                     newExtent.Type = matchExtent.Groups["type"].Value;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                "{0} {1} {2} \"{3}\" {4}",
                                                newExtent.Access,
                                                newExtent.Sectors,
@@ -268,7 +268,7 @@ public sealed partial class VMware
                 else if(matchParent.Success)
                 {
                     _parentName = matchParent.Groups["filename"].Value;
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "parentFileNameHint = \"{0}\"", _parentName);
+                    AaruConsole.Debug(MODULE_NAME, "parentFileNameHint = \"{0}\"", _parentName);
                     _hasParent = true;
                 }
                 else if(matchCylinders.Success)
@@ -291,7 +291,7 @@ public sealed partial class VMware
 
         if(_extents.Count == 0)
         {
-            AaruConsole.ErrorWriteLine(Localization.Did_not_find_any_extent);
+            AaruConsole.Error(Localization.Did_not_find_any_extent);
 
             return ErrorNumber.InvalidArgument;
         }
@@ -316,11 +316,11 @@ public sealed partial class VMware
             case VMFS_TYPE_RDMP:      //"vmfsRDMP";
             case VMFS_TYPE_RDMP_OLD:  //"vmfsPassthroughRawDeviceMap";
             case VMFS_TYPE_RAW:       //"vmfsRaw";
-                AaruConsole.ErrorWriteLine(Localization.Raw_device_image_files_are_not_supported);
+                AaruConsole.Error(Localization.Raw_device_image_files_are_not_supported);
 
                 return ErrorNumber.NotSupported;
             default:
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Dunno_how_to_handle_0_extents, _imageType));
+                AaruConsole.Error(string.Format(Localization.Dunno_how_to_handle_0_extents, _imageType));
 
                 return ErrorNumber.InvalidArgument;
         }
@@ -331,14 +331,14 @@ public sealed partial class VMware
         {
             if(extent.Filter == null)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Extent_file_0_not_found, extent.Filename));
+                AaruConsole.Error(string.Format(Localization.Extent_file_0_not_found, extent.Filename));
 
                 return ErrorNumber.NoSuchFile;
             }
 
             if(extent.Access == "NOACCESS")
             {
-                AaruConsole.ErrorWriteLine(Localization.Cannot_access_NOACCESS_extents);
+                AaruConsole.Error(Localization.Cannot_access_NOACCESS_extents);
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -350,7 +350,7 @@ public sealed partial class VMware
 
             if(extentStream.Length < SECTOR_SIZE)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Extent_0_is_too_small, extent.Filename));
+                AaruConsole.Error(string.Format(Localization.Extent_0_is_too_small, extent.Filename));
 
                 return ErrorNumber.InvalidArgument;
             }
@@ -361,14 +361,14 @@ public sealed partial class VMware
 
             if(extentHdr.magic != VMWARE_EXTENT_MAGIC)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization._0_is_not_an_VMware_extent, extent.Filter));
+                AaruConsole.Error(string.Format(Localization._0_is_not_an_VMware_extent, extent.Filter));
 
                 return ErrorNumber.InvalidArgument;
             }
 
             if(extentHdr.capacity < extent.Sectors)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization
+                AaruConsole.Error(string.Format(Localization
                                                             .Extent_contains_incorrect_number_of_sectors_0_1_were_expected,
                                                          extentHdr.capacity,
                                                          extent.Sectors));
@@ -379,7 +379,7 @@ public sealed partial class VMware
             // TODO: Support compressed extents
             if(extentHdr.compression != COMPRESSION_NONE)
             {
-                AaruConsole.ErrorWriteLine(Localization.Compressed_extents_are_not_yet_supported);
+                AaruConsole.Error(Localization.Compressed_extents_are_not_yet_supported);
 
                 return ErrorNumber.NotImplemented;
             }
@@ -396,7 +396,7 @@ public sealed partial class VMware
 
         if(oneNoFlat && !vmEHdrSet && !cowD)
         {
-            AaruConsole.ErrorWriteLine(Localization
+            AaruConsole.Error(Localization
                                           .There_are_sparse_extents_but_there_is_no_header_to_find_the_grain_tables_cannot_proceed);
 
             return ErrorNumber.InvalidArgument;
@@ -413,34 +413,34 @@ public sealed partial class VMware
         {
             case true when !cowD:
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.magic = 0x{0:X8}",       _vmEHdr.magic);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.version = {0}",          _vmEHdr.version);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.flags = 0x{0:X8}",       _vmEHdr.flags);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.capacity = {0}",         _vmEHdr.capacity);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.grainSize = {0}",        _vmEHdr.grainSize);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.descriptorOffset = {0}", _vmEHdr.descriptorOffset);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.descriptorSize = {0}",   _vmEHdr.descriptorSize);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.GTEsPerGT = {0}",        _vmEHdr.GTEsPerGT);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.rgdOffset = {0}",        _vmEHdr.rgdOffset);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.gdOffset = {0}",         _vmEHdr.gdOffset);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.overhead = {0}",         _vmEHdr.overhead);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.uncleanShutdown = {0}",  _vmEHdr.uncleanShutdown);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.magic = 0x{0:X8}",       _vmEHdr.magic);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.version = {0}",          _vmEHdr.version);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.flags = 0x{0:X8}",       _vmEHdr.flags);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.capacity = {0}",         _vmEHdr.capacity);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.grainSize = {0}",        _vmEHdr.grainSize);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.descriptorOffset = {0}", _vmEHdr.descriptorOffset);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.descriptorSize = {0}",   _vmEHdr.descriptorSize);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.GTEsPerGT = {0}",        _vmEHdr.GTEsPerGT);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.rgdOffset = {0}",        _vmEHdr.rgdOffset);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.gdOffset = {0}",         _vmEHdr.gdOffset);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.overhead = {0}",         _vmEHdr.overhead);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.uncleanShutdown = {0}",  _vmEHdr.uncleanShutdown);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vmEHdr.singleEndLineChar = 0x{0:X2}",
                                            _vmEHdr.singleEndLineChar);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.nonEndLineChar = 0x{0:X2}", _vmEHdr.nonEndLineChar);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.nonEndLineChar = 0x{0:X2}", _vmEHdr.nonEndLineChar);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vmEHdr.doubleEndLineChar1 = 0x{0:X2}",
                                            _vmEHdr.doubleEndLineChar1);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vmEHdr.doubleEndLineChar2 = 0x{0:X2}",
                                            _vmEHdr.doubleEndLineChar2);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmEHdr.compression = 0x{0:X4}", _vmEHdr.compression);
+                AaruConsole.Debug(MODULE_NAME, "vmEHdr.compression = 0x{0:X4}", _vmEHdr.compression);
 
                 _grainSize = _vmEHdr.grainSize;
                 grains     = (uint)(_imageInfo.Sectors / _vmEHdr.grainSize) + 1;
@@ -455,27 +455,27 @@ public sealed partial class VMware
                 break;
             }
             case true when cowD:
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.magic = 0x{0:X8}",   _vmCHdr.magic);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.version = {0}",      _vmCHdr.version);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.flags = 0x{0:X8}",   _vmCHdr.flags);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.sectors = {0}",      _vmCHdr.sectors);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.grainSize = {0}",    _vmCHdr.grainSize);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.gdOffset = {0}",     _vmCHdr.gdOffset);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.numGDEntries = {0}", _vmCHdr.numGDEntries);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.freeSector = {0}",   _vmCHdr.freeSector);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.cylinders = {0}",    _vmCHdr.cylinders);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.heads = {0}",        _vmCHdr.heads);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.spt = {0}",          _vmCHdr.spt);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.generation = {0}",   _vmCHdr.generation);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.magic = 0x{0:X8}",   _vmCHdr.magic);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.version = {0}",      _vmCHdr.version);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.flags = 0x{0:X8}",   _vmCHdr.flags);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.sectors = {0}",      _vmCHdr.sectors);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.grainSize = {0}",    _vmCHdr.grainSize);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.gdOffset = {0}",     _vmCHdr.gdOffset);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.numGDEntries = {0}", _vmCHdr.numGDEntries);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.freeSector = {0}",   _vmCHdr.freeSector);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.cylinders = {0}",    _vmCHdr.cylinders);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.heads = {0}",        _vmCHdr.heads);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.spt = {0}",          _vmCHdr.spt);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.generation = {0}",   _vmCHdr.generation);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.name = {0}", StringHandlers.CToString(_vmCHdr.name));
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.name = {0}", StringHandlers.CToString(_vmCHdr.name));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vmCHdr.description = {0}",
                                            StringHandlers.CToString(_vmCHdr.description));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.savedGeneration = {0}", _vmCHdr.savedGeneration);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vmCHdr.uncleanShutdown = {0}", _vmCHdr.uncleanShutdown);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.savedGeneration = {0}", _vmCHdr.savedGeneration);
+                AaruConsole.Debug(MODULE_NAME, "vmCHdr.uncleanShutdown = {0}", _vmCHdr.uncleanShutdown);
 
                 _grainSize            = _vmCHdr.grainSize;
                 grains                = (uint)(_imageInfo.Sectors / _vmCHdr.grainSize) + 1;
@@ -493,12 +493,12 @@ public sealed partial class VMware
         {
             if(grains == 0 || gdEntries == 0)
             {
-                AaruConsole.ErrorWriteLine(Localization.Some_error_occurred_setting_GD_sizes);
+                AaruConsole.Error(Localization.Some_error_occurred_setting_GD_sizes);
 
                 return ErrorNumber.InOutError;
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization._0_sectors_in_1_grains_in_2_tables,
                                        _imageInfo.Sectors,
                                        grains,
@@ -508,12 +508,12 @@ public sealed partial class VMware
 
             gdStream.Seek(gdOffset * SECTOR_SIZE, SeekOrigin.Begin);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_grain_directory);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_grain_directory);
             byte[] gdBytes = new byte[gdEntries * 4];
             gdStream.EnsureRead(gdBytes, 0, gdBytes.Length);
             Span<uint> gd = MemoryMarshal.Cast<byte, uint>(gdBytes);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Reading_grain_tables);
+            AaruConsole.Debug(MODULE_NAME, Localization.Reading_grain_tables);
             uint currentGrain = 0;
             _gTable = new uint[grains];
 
@@ -549,7 +549,7 @@ public sealed partial class VMware
 
             if(parentFilter == null)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Cannot_find_parent_0, _parentName));
+                AaruConsole.Error(string.Format(Localization.Cannot_find_parent_0, _parentName));
 
                 return ErrorNumber.NoSuchFile;
             }
@@ -559,7 +559,7 @@ public sealed partial class VMware
 
             if(parentError != ErrorNumber.NoError)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Error_0_opening_parent_1,
+                AaruConsole.Error(string.Format(Localization.Error_0_opening_parent_1,
                                                          parentError,
                                                          _parentName));
 
diff --git a/Aaru.Images/VMware/Write.cs b/Aaru.Images/VMware/Write.cs
index 01d29b79e..92f843e20 100644
--- a/Aaru.Images/VMware/Write.cs
+++ b/Aaru.Images/VMware/Write.cs
@@ -164,7 +164,7 @@ public sealed partial class VMware
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/Virtual98/Identify.cs b/Aaru.Images/Virtual98/Identify.cs
index 6636c5791..a19097713 100644
--- a/Aaru.Images/Virtual98/Identify.cs
+++ b/Aaru.Images/Virtual98/Identify.cs
@@ -61,21 +61,21 @@ public sealed partial class Virtual98
 
         if(!_v98Hdr.signature.SequenceEqual(_signature)) return false;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "v98hdr.signature = \"{0}\"",
                                    StringHandlers.CToString(_v98Hdr.signature, shiftjis));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "v98hdr.comment = \"{0}\"",
                                    StringHandlers.CToString(_v98Hdr.comment, shiftjis));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "v98hdr.padding = {0}",    _v98Hdr.padding);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "v98hdr.mbsize = {0}",     _v98Hdr.mbsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "v98hdr.sectorsize = {0}", _v98Hdr.sectorsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "v98hdr.sectors = {0}",    _v98Hdr.sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "v98hdr.surfaces = {0}",   _v98Hdr.surfaces);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "v98hdr.cylinders = {0}",  _v98Hdr.cylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "v98hdr.totals = {0}",     _v98Hdr.totals);
+        AaruConsole.Debug(MODULE_NAME, "v98hdr.padding = {0}",    _v98Hdr.padding);
+        AaruConsole.Debug(MODULE_NAME, "v98hdr.mbsize = {0}",     _v98Hdr.mbsize);
+        AaruConsole.Debug(MODULE_NAME, "v98hdr.sectorsize = {0}", _v98Hdr.sectorsize);
+        AaruConsole.Debug(MODULE_NAME, "v98hdr.sectors = {0}",    _v98Hdr.sectors);
+        AaruConsole.Debug(MODULE_NAME, "v98hdr.surfaces = {0}",   _v98Hdr.surfaces);
+        AaruConsole.Debug(MODULE_NAME, "v98hdr.cylinders = {0}",  _v98Hdr.cylinders);
+        AaruConsole.Debug(MODULE_NAME, "v98hdr.totals = {0}",     _v98Hdr.totals);
 
         return true;
     }
diff --git a/Aaru.Images/Virtual98/Write.cs b/Aaru.Images/Virtual98/Write.cs
index 753879087..37ee59e88 100644
--- a/Aaru.Images/Virtual98/Write.cs
+++ b/Aaru.Images/Virtual98/Write.cs
@@ -87,7 +87,7 @@ public sealed partial class Virtual98
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Images/WCDiskImage/Read.cs b/Aaru.Images/WCDiskImage/Read.cs
index 302bd14a5..757b43aa8 100644
--- a/Aaru.Images/WCDiskImage/Read.cs
+++ b/Aaru.Images/WCDiskImage/Read.cs
@@ -61,7 +61,7 @@ public sealed partial class WCDiskImage
 
         FileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<FileHeader>(header);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.Detected_WC_DISK_IMAGE_with_0_heads_1_tracks_and_2_sectors_per_track,
                                    fheader.heads,
                                    fheader.cylinders,
@@ -98,25 +98,25 @@ public sealed partial class WCDiskImage
         /* if there are extra tracks, read them as well */
         if(fheader.extraTracks[0] == 1)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Extra_track_1_head_0_present_reading);
+            AaruConsole.Debug(MODULE_NAME, Localization.Extra_track_1_head_0_present_reading);
             ReadTrack(stream, (int)_imageInfo.Cylinders, 0);
         }
 
         if(fheader.extraTracks[1] == 1)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Extra_track_1_head_1_present_reading);
+            AaruConsole.Debug(MODULE_NAME, Localization.Extra_track_1_head_1_present_reading);
             ReadTrack(stream, (int)_imageInfo.Cylinders, 1);
         }
 
         if(fheader.extraTracks[2] == 1)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Extra_track_2_head_0_present_reading);
+            AaruConsole.Debug(MODULE_NAME, Localization.Extra_track_2_head_0_present_reading);
             ReadTrack(stream, (int)_imageInfo.Cylinders + 1, 0);
         }
 
         if(fheader.extraTracks[3] == 1)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Extra_track_2_head_1_present_reading);
+            AaruConsole.Debug(MODULE_NAME, Localization.Extra_track_2_head_1_present_reading);
             ReadTrack(stream, (int)_imageInfo.Cylinders + 1, 1);
         }
 
@@ -128,7 +128,7 @@ public sealed partial class WCDiskImage
         /* read the comment and directory data if present */
         if(fheader.extraFlags.HasFlag(ExtraFlag.Comment))
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Comment_present_reading);
+            AaruConsole.Debug(MODULE_NAME, Localization.Comment_present_reading);
             byte[] sheaderBuffer = new byte[6];
             stream.EnsureRead(sheaderBuffer, 0, 6);
 
@@ -136,7 +136,7 @@ public sealed partial class WCDiskImage
 
             if(sheader.flag != SectorFlag.Comment)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Invalid_sector_type_0_encountered,
+                AaruConsole.Error(string.Format(Localization.Invalid_sector_type_0_encountered,
                                                          sheader.flag.ToString()));
 
                 return ErrorNumber.InvalidArgument;
@@ -149,7 +149,7 @@ public sealed partial class WCDiskImage
 
         if(fheader.extraFlags.HasFlag(ExtraFlag.Directory))
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Directory_listing_present_reading);
+            AaruConsole.Debug(MODULE_NAME, Localization.Directory_listing_present_reading);
             byte[] sheaderBuffer = new byte[6];
             stream.EnsureRead(sheaderBuffer, 0, 6);
 
@@ -157,7 +157,7 @@ public sealed partial class WCDiskImage
 
             if(sheader.flag != SectorFlag.Directory)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization.Invalid_sector_type_0_encountered,
+                AaruConsole.Error(string.Format(Localization.Invalid_sector_type_0_encountered,
                                                          sheader.flag.ToString()));
 
                 return ErrorNumber.InvalidArgument;
@@ -187,7 +187,7 @@ public sealed partial class WCDiskImage
 
         if(_badSectors[(cylinderNumber, headNumber, sectorNumber)])
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.reading_bad_sector_0_1_2_3,
                                        sectorAddress,
                                        cylinderNumber,
@@ -257,7 +257,7 @@ public sealed partial class WCDiskImage
             /* validate the sector header */
             if(sheader.cylinder != cyl || sheader.head != head || sheader.sector != sect)
             {
-                AaruConsole.ErrorWriteLine(string.Format(Localization
+                AaruConsole.Error(string.Format(Localization
                                                             .Unexpected_sector_encountered_Found_CHS_0_1_2_but_expected_3_4_5,
                                                          sheader.cylinder,
                                                          sheader.head,
@@ -287,7 +287,7 @@ public sealed partial class WCDiskImage
 
                     if(calculatedCRC != sheader.crc)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    Localization
                                                       .CHS_0_1_2_CRC_mismatch_stored_CRC_3_X4_calculated_CRC_4_X4,
                                                    cyl,
@@ -318,7 +318,7 @@ public sealed partial class WCDiskImage
 
                     break;
                 default:
-                    AaruConsole.ErrorWriteLine(string.Format(Localization.Invalid_sector_type_0_encountered,
+                    AaruConsole.Error(string.Format(Localization.Invalid_sector_type_0_encountered,
                                                              sheader.flag.ToString()));
 
                     return ErrorNumber.InvalidArgument;
diff --git a/Aaru.Images/ZZZRawImage/Read.cs b/Aaru.Images/ZZZRawImage/Read.cs
index a17809f85..812bda094 100644
--- a/Aaru.Images/ZZZRawImage/Read.cs
+++ b/Aaru.Images/ZZZRawImage/Read.cs
@@ -417,7 +417,7 @@ public sealed partial class ZZZRawImage
 
                 if(filter is null) continue;
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_media_tag_0, sidecar.tag);
+                AaruConsole.Debug(MODULE_NAME, Localization.Found_media_tag_0, sidecar.tag);
                 byte[] data = new byte[filter.DataForkLength];
                 filter.GetDataForkStream().EnsureRead(data, 0, data.Length);
                 _mediaTags.Add(sidecar.tag, data);
@@ -1171,7 +1171,7 @@ public sealed partial class ZZZRawImage
             _imageInfo.HasPartitions = true;
         }
 
-        AaruConsole.VerboseWriteLine(Localization.Raw_disk_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
+        AaruConsole.Verbose(Localization.Raw_disk_image_contains_a_disk_of_type_0, _imageInfo.MediaType);
 
         try
         {
diff --git a/Aaru.Images/ZZZRawImage/Write.cs b/Aaru.Images/ZZZRawImage/Write.cs
index 5adf23bea..9684581c8 100644
--- a/Aaru.Images/ZZZRawImage/Write.cs
+++ b/Aaru.Images/ZZZRawImage/Write.cs
@@ -100,7 +100,7 @@ public sealed partial class ZZZRawImage
         catch(IOException ex)
         {
             ErrorMessage = string.Format(Localization.Could_not_create_new_image_file_exception_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Exception(ex);
 
             return false;
         }
diff --git a/Aaru.Logging/AaruConsole.cs b/Aaru.Logging/AaruConsole.cs
index 3259788f0..0e3112740 100644
--- a/Aaru.Logging/AaruConsole.cs
+++ b/Aaru.Logging/AaruConsole.cs
@@ -35,85 +35,6 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace Aaru.Logging;
 
-/// <summary>
-///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
-///     the standard output console using the specified format information.
-/// </summary>
-/// <param name="format">A composite format string.</param>
-/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-public delegate void WriteLineHandler(string format, params object[] arg);
-
-/// <summary>
-///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
-///     the error output console using the specified format information.
-/// </summary>
-/// <param name="format">A composite format string.</param>
-/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-public delegate void ErrorWriteLineHandler(string format, params object[] arg);
-
-/// <summary>
-///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
-///     the verbose output console using the specified format information.
-/// </summary>
-/// <param name="format">A composite format string.</param>
-/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-public delegate void VerboseWriteLineHandler(string format, params object[] arg);
-
-/// <summary>
-///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
-///     the debug output console using the specified format information.
-/// </summary>
-/// <param name="format">A composite format string.</param>
-/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-public delegate void DebugWriteLineHandler(string format, params object[] arg);
-
-/// <summary>
-///     Writes the text representation of the specified array of objects, to the standard output console using the
-///     specified format information.
-/// </summary>
-/// <param name="format">A composite format string.</param>
-/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-public delegate void WriteHandler(string format, params object[] arg);
-
-/// <summary>
-///     Writes the text representation of the specified array of objects, to the error output console using the
-///     specified format information.
-/// </summary>
-/// <param name="format">A composite format string.</param>
-/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-public delegate void ErrorWriteHandler(string format, params object[] arg);
-
-/// <summary>
-///     Writes the text representation of the specified array of objects, to the verbose output console using the
-///     specified format information.
-/// </summary>
-/// <param name="format">A composite format string.</param>
-/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-public delegate void VerboseWriteHandler(string format, params object[] arg);
-
-/// <summary>
-///     Writes the text representation of the specified array of objects, to the debug output console using the
-///     specified format information.
-/// </summary>
-/// <param name="format">A composite format string.</param>
-/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-public delegate void DebugWriteHandler(string format, params object[] arg);
-
-/// <summary>
-///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
-///     the debug output console using the specified format information.
-/// </summary>
-/// <param name="module">Description of the module writing to the debug console</param>
-/// <param name="format">A composite format string.</param>
-/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-public delegate void DebugWithModuleWriteLineHandler(string module, string format, params object[] arg);
-
-/// <summary>
-///     Writes the exception to the debug output console.
-/// </summary>
-/// <param name="ex">Exception.</param>
-public delegate void WriteExceptionHandler(Exception ex);
-
 /// <summary>
 ///     Implements a console abstraction that defines four level of messages that can be routed to different consoles:
 ///     standard, error, verbose and debug.
@@ -122,25 +43,25 @@ public delegate void WriteExceptionHandler(Exception ex);
 public static class AaruConsole
 {
     /// <summary>Event to receive writings to the standard output console that should be followed by a line termination.</summary>
-    public static event WriteLineHandler WriteLineEvent;
+    public static event WriteLineDelegate WriteLineEvent;
 
     /// <summary>Event to receive writings to the error output console that should be followed by a line termination.</summary>
-    public static event ErrorWriteLineHandler ErrorWriteLineEvent;
+    public static event ErrorDelegate ErrorEvent;
 
     /// <summary>Event to receive writings to the verbose output console that should be followed by a line termination.</summary>
-    public static event VerboseWriteLineHandler VerboseWriteLineEvent;
+    public static event VerboseDelegate VerboseEvent;
 
     /// <summary>Event to receive line terminations to the debug output console.</summary>
-    public static event DebugWriteLineHandler DebugWriteLineEvent;
+    public static event DebugDelegate DebugEvent;
 
     /// <summary>Event to receive writings to the debug output console that should be followed by a line termination.</summary>
-    public static event DebugWithModuleWriteLineHandler DebugWithModuleWriteLineEvent;
+    public static event DebugWithModuleDelegate DebugWithModuleEvent;
 
     /// <summary>Event to receive writings to the standard output console.</summary>
-    public static event WriteHandler WriteEvent;
+    public static event WriteDelegate WriteEvent;
 
     /// <summary>Event to receive exceptions to write to the debug output console.</summary>
-    public static event WriteExceptionHandler WriteExceptionEvent;
+    public static event ExceptionDelegate WriteExceptionEvent;
 
     /// <summary>
     ///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
@@ -156,7 +77,7 @@ public static class AaruConsole
     /// </summary>
     /// <param name="format">A composite format string.</param>
     /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-    public static void ErrorWriteLine(string format, params object[] arg) => ErrorWriteLineEvent?.Invoke(format, arg);
+    public static void Error(string format, params object[] arg) => ErrorEvent?.Invoke(format, arg);
 
     /// <summary>
     ///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
@@ -164,8 +85,7 @@ public static class AaruConsole
     /// </summary>
     /// <param name="format">A composite format string.</param>
     /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-    public static void VerboseWriteLine(string format, params object[] arg) =>
-        VerboseWriteLineEvent?.Invoke(format, arg);
+    public static void Verbose(string format, params object[] arg) => VerboseEvent?.Invoke(format, arg);
 
     /// <summary>
     ///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
@@ -174,24 +94,15 @@ public static class AaruConsole
     /// <param name="module">Description of the module writing to the debug console</param>
     /// <param name="format">A composite format string.</param>
     /// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
-    public static void DebugWriteLine(string module, string format, params object[] arg)
+    public static void Debug(string module, string format, params object[] arg)
     {
-        DebugWriteLineEvent?.Invoke($"[blue]({module}):[/] {format}", arg);
-        DebugWithModuleWriteLineEvent?.Invoke(module, format, arg);
+        DebugEvent?.Invoke($"[blue]({module}):[/] {format}", arg);
+        DebugWithModuleEvent?.Invoke(module, format, arg);
     }
 
     /// <summary>Writes the current line terminator to the standard output console.</summary>
     public static void WriteLine() => WriteLineEvent?.Invoke("", null);
 
-    /// <summary>Writes the current line terminator to the error output console.</summary>
-    public static void ErrorWriteLine() => ErrorWriteLineEvent?.Invoke("", null);
-
-    /// <summary>Writes the current line terminator to the verbose output console.</summary>
-    public static void VerboseWriteLine() => VerboseWriteLineEvent?.Invoke("", null);
-
-    /// <summary>Writes the current line terminator to the debug output console.</summary>
-    public static void DebugWriteLine() => DebugWriteLineEvent?.Invoke("", null);
-
     /// <summary>
     ///     Writes the text representation of the specified array of objects to the standard output console using the
     ///     specified format information.
@@ -206,21 +117,20 @@ public static class AaruConsole
 
     /// <summary>Writes the specified string value, followed by the current line terminator, to the error output console.</summary>
     /// <param name="value">The value to write.</param>
-    public static void ErrorWriteLine(string value) => ErrorWriteLineEvent?.Invoke("{0}", value);
+    public static void Error(string value) => ErrorEvent?.Invoke("{0}", value);
 
     /// <summary>Writes the specified string value, followed by the current line terminator, to the verbose output console.</summary>
     /// <param name="value">The value to write.</param>
-    public static void VerboseWriteLine(string value) => VerboseWriteLineEvent?.Invoke("{0}", value);
+    public static void Verbose(string value) => VerboseEvent?.Invoke("{0}", value);
 
     /// <summary>Writes the specified string value, followed by the current line terminator, to the debug output console.</summary>
     /// <param name="module">Description of the module writing to the debug console</param>
     /// <param name="value">The value to write.</param>
-    public static void DebugWriteLine(string module, string value) =>
-        DebugWriteLineEvent?.Invoke("[blue]({0}):[/] {1}", module, value);
+    public static void Debug(string module, string value) => DebugEvent?.Invoke("[blue]({0}):[/] {1}", module, value);
 
     /// <summary>
     ///     Writes the exception to the debug output console.
     /// </summary>
     /// <param name="ex">Exception.</param>
-    public static void WriteException(Exception ex) => WriteExceptionEvent?.Invoke(ex);
+    public static void Exception(Exception ex) => WriteExceptionEvent?.Invoke(ex);
 }
\ No newline at end of file
diff --git a/Aaru.Logging/Delegates.cs b/Aaru.Logging/Delegates.cs
new file mode 100644
index 000000000..5ea274c1c
--- /dev/null
+++ b/Aaru.Logging/Delegates.cs
@@ -0,0 +1,66 @@
+using System;
+
+namespace Aaru.Logging;
+
+/// <summary>
+///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
+///     the standard output console using the specified format information.
+/// </summary>
+/// <param name="format">A composite format string.</param>
+/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
+public delegate void WriteLineDelegate(string format, params object[] arg);
+
+/// <summary>
+///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
+///     the error output console using the specified format information.
+/// </summary>
+/// <param name="format">A composite format string.</param>
+/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
+public delegate void ErrorDelegate(string format, params object[] arg);
+
+/// <summary>
+///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
+///     the verbose output console using the specified format information.
+/// </summary>
+/// <param name="format">A composite format string.</param>
+/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
+public delegate void VerboseDelegate(string format, params object[] arg);
+
+/// <summary>
+///     Writes the text representation of the specified array of objects, to the standard output console using the
+///     specified format information.
+/// </summary>
+/// <param name="format">A composite format string.</param>
+/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
+public delegate void WriteDelegate(string format, params object[] arg);
+
+/// <summary>
+///     Writes the text representation of the specified array of objects, to the verbose output console using the
+///     specified format information.
+/// </summary>
+/// <param name="format">A composite format string.</param>
+/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
+public delegate void VerboseWriteHandler(string format, params object[] arg);
+
+/// <summary>
+///     Writes the text representation of the specified array of objects, to the debug output console using the
+///     specified format information.
+/// </summary>
+/// <param name="format">A composite format string.</param>
+/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
+public delegate void DebugDelegate(string format, params object[] arg);
+
+/// <summary>
+///     Writes the text representation of the specified array of objects, followed by the current line terminator, to
+///     the debug output console using the specified format information.
+/// </summary>
+/// <param name="module">Description of the module writing to the debug console</param>
+/// <param name="format">A composite format string.</param>
+/// <param name="arg">An array of objects to write using <paramref name="format" />.</param>
+public delegate void DebugWithModuleDelegate(string module, string format, params object[] arg);
+
+/// <summary>
+///     Writes the exception to the debug output console.
+/// </summary>
+/// <param name="ex">Exception.</param>
+public delegate void ExceptionDelegate(Exception ex);
\ No newline at end of file
diff --git a/Aaru.Partitions/AppleMap.cs b/Aaru.Partitions/AppleMap.cs
index dfe4b26c6..b01fff9c5 100644
--- a/Aaru.Partitions/AppleMap.cs
+++ b/Aaru.Partitions/AppleMap.cs
@@ -104,13 +104,13 @@ public sealed class AppleMap : IPartition
 
         AppleDriverDescriptorMap ddm = Marshal.ByteArrayToStructureBigEndian<AppleDriverDescriptorMap>(ddmSector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ddm.sbSig = 0x{0:X4}",  ddm.sbSig);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ddm.sbBlockSize = {0}", ddm.sbBlockSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ddm.sbBlocks = {0}",    ddm.sbBlocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ddm.sbDevType = {0}",   ddm.sbDevType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ddm.sbDevId = {0}",     ddm.sbDevId);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ddm.sbData = 0x{0:X8}", ddm.sbData);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "ddm.sbDrvrCount = {0}", ddm.sbDrvrCount);
+        AaruConsole.Debug(MODULE_NAME, "ddm.sbSig = 0x{0:X4}",  ddm.sbSig);
+        AaruConsole.Debug(MODULE_NAME, "ddm.sbBlockSize = {0}", ddm.sbBlockSize);
+        AaruConsole.Debug(MODULE_NAME, "ddm.sbBlocks = {0}",    ddm.sbBlocks);
+        AaruConsole.Debug(MODULE_NAME, "ddm.sbDevType = {0}",   ddm.sbDevType);
+        AaruConsole.Debug(MODULE_NAME, "ddm.sbDevId = {0}",     ddm.sbDevId);
+        AaruConsole.Debug(MODULE_NAME, "ddm.sbData = 0x{0:X8}", ddm.sbData);
+        AaruConsole.Debug(MODULE_NAME, "ddm.sbDrvrCount = {0}", ddm.sbDrvrCount);
 
         uint sequence = 0;
 
@@ -126,11 +126,11 @@ public sealed class AppleMap : IPartition
                     Array.Copy(ddmSector, 18 + i * 8, tmp, 0, 8);
                     ddm.sbMap[i] = Marshal.ByteArrayToStructureBigEndian<AppleDriverEntry>(tmp);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ddm.sbMap[{1}].ddBlock = {0}", ddm.sbMap[i].ddBlock, i);
+                    AaruConsole.Debug(MODULE_NAME, "ddm.sbMap[{1}].ddBlock = {0}", ddm.sbMap[i].ddBlock, i);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ddm.sbMap[{1}].ddSize = {0}", ddm.sbMap[i].ddSize, i);
+                    AaruConsole.Debug(MODULE_NAME, "ddm.sbMap[{1}].ddSize = {0}", ddm.sbMap[i].ddSize, i);
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ddm.sbMap[{1}].ddType = {0}", ddm.sbMap[i].ddType, i);
+                    AaruConsole.Debug(MODULE_NAME, "ddm.sbMap[{1}].ddType = {0}", ddm.sbMap[i].ddType, i);
 
                     if(ddm.sbMap[i].ddSize == 0) continue;
 
@@ -171,17 +171,17 @@ public sealed class AppleMap : IPartition
                 AppleMapOldPartitionEntry oldEntry =
                     Marshal.ByteArrayToStructureBigEndian<AppleMapOldPartitionEntry>(tmp);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "old_map.sbMap[{1}].pdStart = {0}",
                                            oldEntry.pdStart,
                                            (i - 2) / 12);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "old_map.sbMap[{1}].pdSize = {0}",
                                            oldEntry.pdSize,
                                            (i - 2) / 12);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "old_map.sbMap[{1}].pdFSID = 0x{0:X8}",
                                            oldEntry.pdFSID,
                                            (i - 2) / 12);
@@ -228,7 +228,7 @@ public sealed class AppleMap : IPartition
             // Check for a partition entry that's 512-byte aligned
             if(entry.signature == APM_MAGIC)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_misaligned_entry);
+                AaruConsole.Debug(MODULE_NAME, Localization.Found_misaligned_entry);
                 entrySize     = 512;
                 entryCount    = entry.entries;
                 skipDdm       = 512;
@@ -240,7 +240,7 @@ public sealed class AppleMap : IPartition
 
                 if(entry.signature == APM_MAGIC)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_aligned_entry);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_aligned_entry);
                     entrySize     = sectorSize;
                     entryCount    = entry.entries;
                     skipDdm       = sectorSize;
@@ -256,7 +256,7 @@ public sealed class AppleMap : IPartition
 
             if(entry.signature == APM_MAGIC)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_aligned_entry);
+                AaruConsole.Debug(MODULE_NAME, Localization.Found_aligned_entry);
                 entrySize     = sectorSize;
                 entryCount    = entry.entries;
                 skipDdm       = sectorSize;
@@ -270,10 +270,10 @@ public sealed class AppleMap : IPartition
 
         if(errno != ErrorNumber.NoError) return false;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "entry_size = {0}",      entrySize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "entry_count = {0}",     entryCount);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "skip_ddm = {0}",        skipDdm);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sectors_to_read = {0}", sectorsToRead);
+        AaruConsole.Debug(MODULE_NAME, "entry_size = {0}",      entrySize);
+        AaruConsole.Debug(MODULE_NAME, "entry_count = {0}",     entryCount);
+        AaruConsole.Debug(MODULE_NAME, "skip_ddm = {0}",        skipDdm);
+        AaruConsole.Debug(MODULE_NAME, "sectors_to_read = {0}", sectorsToRead);
 
         byte[] copy = new byte[entries.Length - skipDdm];
         Array.Copy(entries, skipDdm, copy, 0, copy.Length);
@@ -287,42 +287,42 @@ public sealed class AppleMap : IPartition
 
             if(entry.signature != APM_MAGIC) continue;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].signature = 0x{1:X4}", i, entry.signature);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].reserved1 = 0x{1:X4}", i, entry.reserved1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].entries = {1}",        i, entry.entries);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].start = {1}",          i, entry.start);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].sectors = {1}",        i, entry.sectors);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].signature = 0x{1:X4}", i, entry.signature);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].reserved1 = 0x{1:X4}", i, entry.reserved1);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].entries = {1}",        i, entry.entries);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].start = {1}",          i, entry.start);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].sectors = {1}",        i, entry.sectors);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dpme[{0}].name = \"{1}\"",
                                        i,
                                        StringHandlers.CToString(entry.name));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dpme[{0}].type = \"{1}\"",
                                        i,
                                        StringHandlers.CToString(entry.type));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].first_data_block = {1}", i, entry.first_data_block);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].first_data_block = {1}", i, entry.first_data_block);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].data_sectors = {1}", i, entry.data_sectors);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].flags = {1}",        i, (AppleMapFlags)entry.flags);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].data_sectors = {1}", i, entry.data_sectors);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].flags = {1}",        i, (AppleMapFlags)entry.flags);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].first_boot_block = {1}", i, entry.first_boot_block);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].first_boot_block = {1}", i, entry.first_boot_block);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].boot_size = {1}", i, entry.boot_size);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].boot_size = {1}", i, entry.boot_size);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].load_address = 0x{1:X8}", i, entry.load_address);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].load_address = 0x{1:X8}", i, entry.load_address);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].load_address2 = 0x{1:X8}", i, entry.load_address2);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].load_address2 = 0x{1:X8}", i, entry.load_address2);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].entry_point = 0x{1:X8}", i, entry.entry_point);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].entry_point = 0x{1:X8}", i, entry.entry_point);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].entry_point2 = 0x{1:X8}", i, entry.entry_point2);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].entry_point2 = 0x{1:X8}", i, entry.entry_point2);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dpme[{0}].checksum = 0x{1:X8}", i, entry.checksum);
+            AaruConsole.Debug(MODULE_NAME, "dpme[{0}].checksum = 0x{1:X8}", i, entry.checksum);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dpme[{0}].processor = \"{1}\"",
                                        i,
                                        StringHandlers.CToString(entry.processor));
@@ -387,7 +387,7 @@ public sealed class AppleMap : IPartition
             // Some CD and DVDs end with an Apple_Free that expands beyond the disc size...
             else if(partition.Start < imagePlugin.Info.Sectors)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Cutting_last_partition_end_0_to_media_size_1,
                                            partition.End,
                                            imagePlugin.Info.Sectors - 1);
@@ -398,7 +398,7 @@ public sealed class AppleMap : IPartition
             }
             else
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Not_adding_partition_because_start_0_is_outside_media_size_1,
                                            partition.Start,
                                            imagePlugin.Info.Sectors - 1);
diff --git a/Aaru.Partitions/Apricot.cs b/Aaru.Partitions/Apricot.cs
index 6c49037b8..db5292235 100644
--- a/Aaru.Partitions/Apricot.cs
+++ b/Aaru.Partitions/Apricot.cs
@@ -107,229 +107,229 @@ public sealed class Apricot : IPartition
            label.firstDataBlock       > deviceSectors)
             return false;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.version = \"{0}\"", StringHandlers.CToString(label.version));
+        AaruConsole.Debug(MODULE_NAME, "label.version = \"{0}\"", StringHandlers.CToString(label.version));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.operatingSystem = {0} ({1})",
                                    label.operatingSystem,
                                    label.operatingSystem < _operatingSystemCodes.Length
                                        ? _operatingSystemCodes[label.operatingSystem]
                                        : Localization.Unknown_operating_system);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.writeProtected = {0}", label.writeProtected);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.copyProtected = {0}",  label.copyProtected);
+        AaruConsole.Debug(MODULE_NAME, "label.writeProtected = {0}", label.writeProtected);
+        AaruConsole.Debug(MODULE_NAME, "label.copyProtected = {0}",  label.copyProtected);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.bootType = {0} ({1})",
                                    label.bootType,
                                    label.bootType < _bootTypeCodes.Length
                                        ? _bootTypeCodes[label.bootType]
                                        : Localization.Unknown_boot_type);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.partitionCount = {0}",   label.partitionCount);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.winchester = {0}",       label.winchester);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.sectorSize = {0}",       label.sectorSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.spt = {0}",              label.spt);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.cylinders = {0}",        label.cylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.heads = {0}",            label.heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.interleave = {0}",       label.interleave);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.skew = {0}",             label.skew);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.bootLocation = {0}",     label.bootLocation);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.bootSize = {0}",         label.bootSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.bootAddress = 0x{0:X8}", label.bootAddress);
+        AaruConsole.Debug(MODULE_NAME, "label.partitionCount = {0}",   label.partitionCount);
+        AaruConsole.Debug(MODULE_NAME, "label.winchester = {0}",       label.winchester);
+        AaruConsole.Debug(MODULE_NAME, "label.sectorSize = {0}",       label.sectorSize);
+        AaruConsole.Debug(MODULE_NAME, "label.spt = {0}",              label.spt);
+        AaruConsole.Debug(MODULE_NAME, "label.cylinders = {0}",        label.cylinders);
+        AaruConsole.Debug(MODULE_NAME, "label.heads = {0}",            label.heads);
+        AaruConsole.Debug(MODULE_NAME, "label.interleave = {0}",       label.interleave);
+        AaruConsole.Debug(MODULE_NAME, "label.skew = {0}",             label.skew);
+        AaruConsole.Debug(MODULE_NAME, "label.bootLocation = {0}",     label.bootLocation);
+        AaruConsole.Debug(MODULE_NAME, "label.bootSize = {0}",         label.bootSize);
+        AaruConsole.Debug(MODULE_NAME, "label.bootAddress = 0x{0:X8}", label.bootAddress);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.bootOffset:label.bootSegment = {0:X4}:{1:X4}",
                                    label.bootOffset,
                                    label.bootSegment);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.firstDataBlock = {0}", label.firstDataBlock);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.generation = {0}",     label.generation);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.copyCount = {0}",      label.copyCount);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.maxCopies = {0}",      label.maxCopies);
+        AaruConsole.Debug(MODULE_NAME, "label.firstDataBlock = {0}", label.firstDataBlock);
+        AaruConsole.Debug(MODULE_NAME, "label.generation = {0}",     label.generation);
+        AaruConsole.Debug(MODULE_NAME, "label.copyCount = {0}",      label.copyCount);
+        AaruConsole.Debug(MODULE_NAME, "label.maxCopies = {0}",      label.maxCopies);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.serialNumber = \"{0}\"",
                                    StringHandlers.CToString(label.serialNumber));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.partNumber = \"{0}\"",
                                    StringHandlers.CToString(label.partNumber));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.copyright = \"{0}\"", StringHandlers.CToString(label.copyright));
+        AaruConsole.Debug(MODULE_NAME, "label.copyright = \"{0}\"", StringHandlers.CToString(label.copyright));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.mainBPB.bps = {0}",      label.mainBPB.bps);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.mainBPB.spc = {0}",      label.mainBPB.spc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.mainBPB.rsectors = {0}", label.mainBPB.rsectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.mainBPB.fats_no = {0}",  label.mainBPB.fats_no);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.mainBPB.root_ent = {0}", label.mainBPB.root_ent);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.mainBPB.sectors = {0}",  label.mainBPB.sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.mainBPB.media = {0}",    label.mainBPB.media);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.mainBPB.spfat = {0}",    label.mainBPB.spfat);
+        AaruConsole.Debug(MODULE_NAME, "label.mainBPB.bps = {0}",      label.mainBPB.bps);
+        AaruConsole.Debug(MODULE_NAME, "label.mainBPB.spc = {0}",      label.mainBPB.spc);
+        AaruConsole.Debug(MODULE_NAME, "label.mainBPB.rsectors = {0}", label.mainBPB.rsectors);
+        AaruConsole.Debug(MODULE_NAME, "label.mainBPB.fats_no = {0}",  label.mainBPB.fats_no);
+        AaruConsole.Debug(MODULE_NAME, "label.mainBPB.root_ent = {0}", label.mainBPB.root_ent);
+        AaruConsole.Debug(MODULE_NAME, "label.mainBPB.sectors = {0}",  label.mainBPB.sectors);
+        AaruConsole.Debug(MODULE_NAME, "label.mainBPB.media = {0}",    label.mainBPB.media);
+        AaruConsole.Debug(MODULE_NAME, "label.mainBPB.spfat = {0}",    label.mainBPB.spfat);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.mainBPB.diskType = {0} ({1})",
                                    label.mainBPB.diskType,
                                    label.mainBPB.diskType < _diskTypeCodes.Length
                                        ? _diskTypeCodes[label.mainBPB.diskType]
                                        : Localization.Unknown_disk_type);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.mainBPB.startSector = {0}", label.mainBPB.startSector);
+        AaruConsole.Debug(MODULE_NAME, "label.mainBPB.startSector = {0}", label.mainBPB.startSector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.fontName = \"{0}\"", StringHandlers.CToString(label.fontName));
+        AaruConsole.Debug(MODULE_NAME, "label.fontName = \"{0}\"", StringHandlers.CToString(label.fontName));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.keyboardName = \"{0}\"",
                                    StringHandlers.CToString(label.keyboardName));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.biosMajorVersion = {0}", label.biosMajorVersion);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.biosMinorVersion = {0}", label.biosMinorVersion);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.diagnosticsFlag = {0}",  label.diagnosticsFlag);
+        AaruConsole.Debug(MODULE_NAME, "label.biosMajorVersion = {0}", label.biosMajorVersion);
+        AaruConsole.Debug(MODULE_NAME, "label.biosMinorVersion = {0}", label.biosMinorVersion);
+        AaruConsole.Debug(MODULE_NAME, "label.diagnosticsFlag = {0}",  label.diagnosticsFlag);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.prnDevice = {0} ({1})",
                                    label.prnDevice,
                                    label.prnDevice < _printDevices.Length
                                        ? _printDevices[label.prnDevice]
                                        : Localization.Unknown_print_device);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.bellVolume = {0}",       label.bellVolume);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.enableCache = {0}",      label.enableCache);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.enableGraphics = {0}",   label.enableGraphics);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dosLength = {0}",        label.dosLength);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.fontLength = {0}",       label.fontLength);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.keyboardLength = {0}",   label.keyboardLength);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dosStart = {0}",         label.dosStart);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.fontStart = {0}",        label.fontStart);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.keyboardStart = {0}",    label.keyboardStart);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.keyboardVolume = {0}",   label.keyboardVolume);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.autorepeat = {0}",       label.autorepeat);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.autorepeatLeadIn = {0}", label.autorepeatLeadIn);
+        AaruConsole.Debug(MODULE_NAME, "label.bellVolume = {0}",       label.bellVolume);
+        AaruConsole.Debug(MODULE_NAME, "label.enableCache = {0}",      label.enableCache);
+        AaruConsole.Debug(MODULE_NAME, "label.enableGraphics = {0}",   label.enableGraphics);
+        AaruConsole.Debug(MODULE_NAME, "label.dosLength = {0}",        label.dosLength);
+        AaruConsole.Debug(MODULE_NAME, "label.fontLength = {0}",       label.fontLength);
+        AaruConsole.Debug(MODULE_NAME, "label.keyboardLength = {0}",   label.keyboardLength);
+        AaruConsole.Debug(MODULE_NAME, "label.dosStart = {0}",         label.dosStart);
+        AaruConsole.Debug(MODULE_NAME, "label.fontStart = {0}",        label.fontStart);
+        AaruConsole.Debug(MODULE_NAME, "label.keyboardStart = {0}",    label.keyboardStart);
+        AaruConsole.Debug(MODULE_NAME, "label.keyboardVolume = {0}",   label.keyboardVolume);
+        AaruConsole.Debug(MODULE_NAME, "label.autorepeat = {0}",       label.autorepeat);
+        AaruConsole.Debug(MODULE_NAME, "label.autorepeatLeadIn = {0}", label.autorepeatLeadIn);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.autorepeatInterval = {0}", label.autorepeatInterval);
+        AaruConsole.Debug(MODULE_NAME, "label.autorepeatInterval = {0}", label.autorepeatInterval);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.microscreenMode = {0}", label.microscreenMode);
+        AaruConsole.Debug(MODULE_NAME, "label.microscreenMode = {0}", label.microscreenMode);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.spareKeyboard is null? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(label.spareKeyboard));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.lineMode = {0} ({1} lines)",
                                    label.lineMode,
                                    label.lineMode < _lineModes.Length ? _lineModes[label.lineMode] : 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.lineWidth = {0} ({1} columns)",
                                    label.lineWidth,
                                    label.lineWidth < _lineWidths.Length ? _lineWidths[label.lineWidth] : 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.imageOff = {0}", label.imageOff);
+        AaruConsole.Debug(MODULE_NAME, "label.imageOff = {0}", label.imageOff);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.spareScreen is null? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(label.spareScreen));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.txBaudRate = {0} ({1} bps)",
                                    label.txBaudRate,
                                    label.txBaudRate < _baudRates.Length ? _baudRates[label.txBaudRate] : 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.rxBaudRate = {0} ({1} bps)",
                                    label.rxBaudRate,
                                    label.rxBaudRate < _baudRates.Length ? _baudRates[label.rxBaudRate] : 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.txBits = {0}", label.txBits);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.rxBits = {0}", label.rxBits);
+        AaruConsole.Debug(MODULE_NAME, "label.txBits = {0}", label.txBits);
+        AaruConsole.Debug(MODULE_NAME, "label.rxBits = {0}", label.rxBits);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.stopBits = {0} ({1} bits)",
                                    label.stopBits,
                                    label.stopBits < _stopBits.Length ? _stopBits[label.stopBits] : 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.parityCheck = {0}", label.parityCheck);
+        AaruConsole.Debug(MODULE_NAME, "label.parityCheck = {0}", label.parityCheck);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.parityType = {0} ({1})",
                                    label.parityType,
                                    label.parityType < _parityTypes.Length
                                        ? _parityTypes[label.parityType]
                                        : Localization.Unknown_parity_type);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.txXonXoff = {0}",       label.txXonXoff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.rxXonXoff = {0}",       label.rxXonXoff);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.xonCharacter = {0}",    label.xonCharacter);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.xoffCharacter = {0}",   label.xoffCharacter);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.rxXonXoffBuffer = {0}", label.rxXonXoffBuffer);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dtrDsr = {0}",          label.dtrDsr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.ctsRts = {0}",          label.ctsRts);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.nullsAfterCr = {0}",    label.nullsAfterCr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.nullsAfterFF = {0}",    label.nullsAfterFF);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.lfAfterCRSerial = {0}", label.lfAfterCRSerial);
+        AaruConsole.Debug(MODULE_NAME, "label.txXonXoff = {0}",       label.txXonXoff);
+        AaruConsole.Debug(MODULE_NAME, "label.rxXonXoff = {0}",       label.rxXonXoff);
+        AaruConsole.Debug(MODULE_NAME, "label.xonCharacter = {0}",    label.xonCharacter);
+        AaruConsole.Debug(MODULE_NAME, "label.xoffCharacter = {0}",   label.xoffCharacter);
+        AaruConsole.Debug(MODULE_NAME, "label.rxXonXoffBuffer = {0}", label.rxXonXoffBuffer);
+        AaruConsole.Debug(MODULE_NAME, "label.dtrDsr = {0}",          label.dtrDsr);
+        AaruConsole.Debug(MODULE_NAME, "label.ctsRts = {0}",          label.ctsRts);
+        AaruConsole.Debug(MODULE_NAME, "label.nullsAfterCr = {0}",    label.nullsAfterCr);
+        AaruConsole.Debug(MODULE_NAME, "label.nullsAfterFF = {0}",    label.nullsAfterFF);
+        AaruConsole.Debug(MODULE_NAME, "label.lfAfterCRSerial = {0}", label.lfAfterCRSerial);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.biosErrorReportSerial = {0}", label.biosErrorReportSerial);
+        AaruConsole.Debug(MODULE_NAME, "label.biosErrorReportSerial = {0}", label.biosErrorReportSerial);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.spareSerial is null? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(label.spareSerial));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.lfAfterCrParallel = {0}", label.lfAfterCrParallel);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.selectLine = {0}",        label.selectLine);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.paperEmpty = {0}",        label.paperEmpty);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.faultLine = {0}",         label.faultLine);
+        AaruConsole.Debug(MODULE_NAME, "label.lfAfterCrParallel = {0}", label.lfAfterCrParallel);
+        AaruConsole.Debug(MODULE_NAME, "label.selectLine = {0}",        label.selectLine);
+        AaruConsole.Debug(MODULE_NAME, "label.paperEmpty = {0}",        label.paperEmpty);
+        AaruConsole.Debug(MODULE_NAME, "label.faultLine = {0}",         label.faultLine);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.biosErrorReportParallel = {0}", label.biosErrorReportParallel);
+        AaruConsole.Debug(MODULE_NAME, "label.biosErrorReportParallel = {0}", label.biosErrorReportParallel);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.spareParallel is null? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(label.spareParallel));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.spareWinchester is null? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(label.spareWinchester));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.parkingEnabled = {0}",   label.parkingEnabled);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.formatProtection = {0}", label.formatProtection);
+        AaruConsole.Debug(MODULE_NAME, "label.parkingEnabled = {0}",   label.parkingEnabled);
+        AaruConsole.Debug(MODULE_NAME, "label.formatProtection = {0}", label.formatProtection);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.spareRamDisk is null? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(label.spareRamDisk));
 
         for(int i = 0; i < 32; i++)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "label.badBlocks[{1}] = {0}", label.badBlocks[i], i);
+            AaruConsole.Debug(MODULE_NAME, "label.badBlocks[{1}] = {0}", label.badBlocks[i], i);
 
         for(int i = 0; i < 8; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, "label.partitions[{1}].bps = {0}", label.partitions[i].bps, i);
+            AaruConsole.Debug(MODULE_NAME, "label.partitions[{1}].bps = {0}", label.partitions[i].bps, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "label.partitions[{1}].spc = {0}", label.partitions[i].spc, i);
+            AaruConsole.Debug(MODULE_NAME, "label.partitions[{1}].spc = {0}", label.partitions[i].spc, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.partitions[{1}].rsectors = {0}",
                                        label.partitions[i].rsectors,
                                        i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.partitions[{1}].fats_no = {0}",
                                        label.partitions[i].fats_no,
                                        i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.partitions[{1}].root_ent = {0}",
                                        label.partitions[i].root_ent,
                                        i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.partitions[{1}].sectors = {0}",
                                        label.partitions[i].sectors,
                                        i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "label.partitions[{1}].media = {0}", label.partitions[i].media, i);
+            AaruConsole.Debug(MODULE_NAME, "label.partitions[{1}].media = {0}", label.partitions[i].media, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "label.partitions[{1}].spfat = {0}", label.partitions[i].spfat, i);
+            AaruConsole.Debug(MODULE_NAME, "label.partitions[{1}].spfat = {0}", label.partitions[i].spfat, i);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.partitions[{1}].diskType = {0} ({2})",
                                        label.partitions[i].diskType,
                                        i,
@@ -337,17 +337,17 @@ public sealed class Apricot : IPartition
                                            ? _diskTypeCodes[label.partitions[i].diskType]
                                            : Localization.Unknown_disk_type);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.partitions[{1}].startSector = {0}",
                                        label.partitions[i].startSector,
                                        i);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.spare is null? = {0}",
                                    ArrayHelpers.ArrayIsNullOrEmpty(label.spare));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.cpmDoubleSided = {0}", label.cpmDoubleSided);
+        AaruConsole.Debug(MODULE_NAME, "label.cpmDoubleSided = {0}", label.cpmDoubleSided);
 
         // Only hard disks can contain partitions
         if(!label.winchester) return false;
diff --git a/Aaru.Partitions/Atari.cs b/Aaru.Partitions/Atari.cs
index c3bbe3799..ee6e798f2 100644
--- a/Aaru.Partitions/Atari.cs
+++ b/Aaru.Partitions/Atari.cs
@@ -115,59 +115,59 @@ public sealed class AtariPartitions : IPartition
 
         var sha1Ctx = new Sha1Context();
         sha1Ctx.Update(table.Boot);
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Boot_code_SHA1_0, sha1Ctx.End());
+        AaruConsole.Debug(MODULE_NAME, Localization.Boot_code_SHA1_0, sha1Ctx.End());
 
         for(int i = 0; i < 8; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Markup.Escape("table.icdEntries[{0}].flag = 0x{1:X2}"),
                                        i,
                                        (table.IcdEntries[i].Type & 0xFF000000) >> 24);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Markup.Escape("table.icdEntries[{0}].type = 0x{1:X6}"),
                                        i,
                                        table.IcdEntries[i].Type & 0x00FFFFFF);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Markup.Escape("table.icdEntries[{0}].start = {1}"),
                                        i,
                                        table.IcdEntries[i].Start);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Markup.Escape("table.icdEntries[{0}].length = {1}"),
                                        i,
                                        table.IcdEntries[i].Length);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "table.size = {0}", table.Size);
+        AaruConsole.Debug(MODULE_NAME, "table.size = {0}", table.Size);
 
         for(int i = 0; i < 4; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Markup.Escape("table.entries[{0}].flag = 0x{1:X2}"),
                                        i,
                                        (table.Entries[i].Type & 0xFF000000) >> 24);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Markup.Escape("table.entries[{0}].type = 0x{1:X6}"),
                                        i,
                                        table.Entries[i].Type & 0x00FFFFFF);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Markup.Escape("table.entries[{0}].start = {1}"),
                                        i,
                                        table.Entries[i].Start);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Markup.Escape("table.entries[{0}].length = {1}"),
                                        i,
                                        table.Entries[i].Length);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "table.badStart = {0}",      table.BadStart);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "table.badLength = {0}",     table.BadLength);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "table.checksum = 0x{0:X4}", table.Checksum);
+        AaruConsole.Debug(MODULE_NAME, "table.badStart = {0}",      table.BadStart);
+        AaruConsole.Debug(MODULE_NAME, "table.badLength = {0}",     table.BadLength);
+        AaruConsole.Debug(MODULE_NAME, "table.checksum = 0x{0:X4}", table.Checksum);
 
         bool  validTable        = false;
         ulong partitionSequence = 0;
@@ -195,7 +195,7 @@ public sealed class AtariPartitions : IPartition
                     {
                         if(table.Entries[i].Start + table.Entries[i].Length > imagePlugin.Info.Sectors)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.WARNING_End_of_partition_goes_beyond_device_size);
                         }
 
@@ -284,7 +284,7 @@ public sealed class AtariPartitions : IPartition
 
                         if(extendedTable.Entries[j].Start + extendedTable.Entries[j].Length > imagePlugin.Info.Sectors)
                         {
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.WARNING_End_of_partition_goes_beyond_device_size);
                         }
 
@@ -353,7 +353,7 @@ public sealed class AtariPartitions : IPartition
             if(table.IcdEntries[i].Start > imagePlugin.Info.Sectors) continue;
 
             if(table.IcdEntries[i].Start + table.IcdEntries[i].Length > imagePlugin.Info.Sectors)
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.WARNING_End_of_partition_goes_beyond_device_size);
+                AaruConsole.Debug(MODULE_NAME, Localization.WARNING_End_of_partition_goes_beyond_device_size);
 
             ulong sectorSize = imagePlugin.Info.SectorSize;
 
diff --git a/Aaru.Partitions/BSD.cs b/Aaru.Partitions/BSD.cs
index 77794644e..0ac0920f4 100644
--- a/Aaru.Partitions/BSD.cs
+++ b/Aaru.Partitions/BSD.cs
@@ -98,7 +98,7 @@ public sealed class BSD : IPartition
                 Array.Copy(tmp, offset, sector, 0, MAX_LABEL_SIZE);
                 dl = Marshal.ByteArrayToStructureLittleEndian<DiskLabel>(sector);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization
                                               .BSD_GetInformation_dl_magic_on_sector_0_at_offset_1_equals_2_X8_expected_3_X8,
                                            location + sectorOffset,
@@ -122,52 +122,52 @@ public sealed class BSD : IPartition
 
         if(dl is { d_magic: DISK_CIGAM, d_magic2: DISK_CIGAM }) dl = SwapDiskLabel(dl);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_type = {0}",           dl.d_type);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_subtype = {0}",        dl.d_subtype);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_typename = {0}",       StringHandlers.CToString(dl.d_typename));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_packname = {0}",       StringHandlers.CToString(dl.d_packname));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_secsize = {0}",        dl.d_secsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_nsectors = {0}",       dl.d_nsectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_ntracks = {0}",        dl.d_ntracks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_ncylinders = {0}",     dl.d_ncylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_secpercyl = {0}",      dl.d_secpercyl);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_secperunit = {0}",     dl.d_secperunit);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_sparespertrack = {0}", dl.d_sparespertrack);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_sparespercyl = {0}",   dl.d_sparespercyl);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_acylinders = {0}",     dl.d_acylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_rpm = {0}",            dl.d_rpm);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_interleave = {0}",     dl.d_interleave);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_trackskew = {0}",      dl.d_trackskew);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_cylskeew = {0}",       dl.d_cylskeew);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_headswitch = {0}",     dl.d_headswitch);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_trkseek = {0}",        dl.d_trkseek);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_flags = {0}",          dl.d_flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_drivedata[0] = {0}",   dl.d_drivedata[0]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_drivedata[1] = {0}",   dl.d_drivedata[1]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_drivedata[2] = {0}",   dl.d_drivedata[2]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_drivedata[3] = {0}",   dl.d_drivedata[3]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_drivedata[4] = {0}",   dl.d_drivedata[4]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_spare[0] = {0}",       dl.d_spare[0]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_spare[1] = {0}",       dl.d_spare[1]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_spare[2] = {0}",       dl.d_spare[2]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_spare[3] = {0}",       dl.d_spare[3]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_spare[4] = {0}",       dl.d_spare[4]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_magic2 = 0x{0:X8}",    dl.d_magic2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_checksum = 0x{0:X8}",  dl.d_checksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_npartitions = {0}",    dl.d_npartitions);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_bbsize = {0}",         dl.d_bbsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_sbsize = {0}",         dl.d_sbsize);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_type = {0}",           dl.d_type);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_subtype = {0}",        dl.d_subtype);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_typename = {0}",       StringHandlers.CToString(dl.d_typename));
+        AaruConsole.Debug(MODULE_NAME, "dl.d_packname = {0}",       StringHandlers.CToString(dl.d_packname));
+        AaruConsole.Debug(MODULE_NAME, "dl.d_secsize = {0}",        dl.d_secsize);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_nsectors = {0}",       dl.d_nsectors);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_ntracks = {0}",        dl.d_ntracks);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_ncylinders = {0}",     dl.d_ncylinders);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_secpercyl = {0}",      dl.d_secpercyl);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_secperunit = {0}",     dl.d_secperunit);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_sparespertrack = {0}", dl.d_sparespertrack);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_sparespercyl = {0}",   dl.d_sparespercyl);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_acylinders = {0}",     dl.d_acylinders);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_rpm = {0}",            dl.d_rpm);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_interleave = {0}",     dl.d_interleave);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_trackskew = {0}",      dl.d_trackskew);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_cylskeew = {0}",       dl.d_cylskeew);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_headswitch = {0}",     dl.d_headswitch);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_trkseek = {0}",        dl.d_trkseek);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_flags = {0}",          dl.d_flags);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_drivedata[0] = {0}",   dl.d_drivedata[0]);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_drivedata[1] = {0}",   dl.d_drivedata[1]);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_drivedata[2] = {0}",   dl.d_drivedata[2]);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_drivedata[3] = {0}",   dl.d_drivedata[3]);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_drivedata[4] = {0}",   dl.d_drivedata[4]);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_spare[0] = {0}",       dl.d_spare[0]);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_spare[1] = {0}",       dl.d_spare[1]);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_spare[2] = {0}",       dl.d_spare[2]);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_spare[3] = {0}",       dl.d_spare[3]);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_spare[4] = {0}",       dl.d_spare[4]);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_magic2 = 0x{0:X8}",    dl.d_magic2);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_checksum = 0x{0:X8}",  dl.d_checksum);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_npartitions = {0}",    dl.d_npartitions);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_bbsize = {0}",         dl.d_bbsize);
+        AaruConsole.Debug(MODULE_NAME, "dl.d_sbsize = {0}",         dl.d_sbsize);
 
         ulong counter         = 0;
         bool  addSectorOffset = false;
 
         for(int i = 0; i < dl.d_npartitions && i < 22; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_partitions[i].p_offset = {0}", dl.d_partitions[i].p_offset);
+            AaruConsole.Debug(MODULE_NAME, "dl.d_partitions[i].p_offset = {0}", dl.d_partitions[i].p_offset);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dl.d_partitions[i].p_size = {0}", dl.d_partitions[i].p_size);
+            AaruConsole.Debug(MODULE_NAME, "dl.d_partitions[i].p_size = {0}", dl.d_partitions[i].p_size);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dl.d_partitions[i].p_fstype = {0} ({1})",
                                        dl.d_partitions[i].p_fstype,
                                        FSTypeToString(dl.d_partitions[i].p_fstype));
@@ -194,8 +194,8 @@ public sealed class BSD : IPartition
                 part.Offset += sectorOffset * imagePlugin.Info.SectorSize;
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "part.start = {0}", part.Start);
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.BSD_GetInformation_Adding_it);
+            AaruConsole.Debug(MODULE_NAME, "part.start = {0}", part.Start);
+            AaruConsole.Debug(MODULE_NAME, Localization.BSD_GetInformation_Adding_it);
             partitions.Add(part);
             counter++;
         }
diff --git a/Aaru.Partitions/GPT.cs b/Aaru.Partitions/GPT.cs
index 90a6df482..7864dff45 100644
--- a/Aaru.Partitions/GPT.cs
+++ b/Aaru.Partitions/GPT.cs
@@ -79,7 +79,7 @@ public sealed class GuidPartitionTable : IPartition
         ulong signature  = BitConverter.ToUInt64(hdrBytes, 0);
         bool  misaligned = false;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.signature = 0x{0:X16}", signature);
+        AaruConsole.Debug(MODULE_NAME, "hdr.signature = 0x{0:X16}", signature);
 
         if(signature != GPT_MAGIC)
         {
@@ -90,11 +90,11 @@ public sealed class GuidPartitionTable : IPartition
                 if(errno != ErrorNumber.NoError) return false;
 
                 signature = BitConverter.ToUInt64(hdrBytes, 512);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.signature @ 0x200 = 0x{0:X16}", signature);
+                AaruConsole.Debug(MODULE_NAME, "hdr.signature @ 0x200 = 0x{0:X16}", signature);
 
                 if(signature == GPT_MAGIC)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_unaligned_signature, signature);
+                    AaruConsole.Debug(MODULE_NAME, Localization.Found_unaligned_signature, signature);
                     byte[] real = new byte[512];
                     Array.Copy(hdrBytes, 512, real, 0, 512);
                     hdrBytes   = real;
@@ -116,19 +116,19 @@ public sealed class GuidPartitionTable : IPartition
             return false;
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.revision = 0x{0:X8}",   hdr.revision);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.headerSize = {0}",      hdr.headerSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.headerCrc = 0x{0:X8}",  hdr.headerCrc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.reserved = 0x{0:X8}",   hdr.reserved);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.myLBA = {0}",           hdr.myLBA);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.alternateLBA = {0}",    hdr.alternateLBA);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.firstUsableLBA = {0}",  hdr.firstUsableLBA);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.lastUsableLBA = {0}",   hdr.lastUsableLBA);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.diskGuid = {0}",        hdr.diskGuid);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.entryLBA = {0}",        hdr.entryLBA);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.entries = {0}",         hdr.entries);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.entriesSize = {0}",     hdr.entriesSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "hdr.entriesCrc = 0x{0:X8}", hdr.entriesCrc);
+        AaruConsole.Debug(MODULE_NAME, "hdr.revision = 0x{0:X8}",   hdr.revision);
+        AaruConsole.Debug(MODULE_NAME, "hdr.headerSize = {0}",      hdr.headerSize);
+        AaruConsole.Debug(MODULE_NAME, "hdr.headerCrc = 0x{0:X8}",  hdr.headerCrc);
+        AaruConsole.Debug(MODULE_NAME, "hdr.reserved = 0x{0:X8}",   hdr.reserved);
+        AaruConsole.Debug(MODULE_NAME, "hdr.myLBA = {0}",           hdr.myLBA);
+        AaruConsole.Debug(MODULE_NAME, "hdr.alternateLBA = {0}",    hdr.alternateLBA);
+        AaruConsole.Debug(MODULE_NAME, "hdr.firstUsableLBA = {0}",  hdr.firstUsableLBA);
+        AaruConsole.Debug(MODULE_NAME, "hdr.lastUsableLBA = {0}",   hdr.lastUsableLBA);
+        AaruConsole.Debug(MODULE_NAME, "hdr.diskGuid = {0}",        hdr.diskGuid);
+        AaruConsole.Debug(MODULE_NAME, "hdr.entryLBA = {0}",        hdr.entryLBA);
+        AaruConsole.Debug(MODULE_NAME, "hdr.entries = {0}",         hdr.entries);
+        AaruConsole.Debug(MODULE_NAME, "hdr.entriesSize = {0}",     hdr.entriesSize);
+        AaruConsole.Debug(MODULE_NAME, "hdr.entriesCrc = 0x{0:X8}", hdr.entriesCrc);
 
         if(hdr.signature != GPT_MAGIC) return false;
 
@@ -184,12 +184,12 @@ public sealed class GuidPartitionTable : IPartition
         foreach(Entry entry in entries.Where(entry => entry.partitionType != Guid.Empty &&
                                                       entry.partitionId   != Guid.Empty))
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.partitionType = {0}",    entry.partitionType);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.partitionId = {0}",      entry.partitionId);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.startLBA = {0}",         entry.startLBA);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.endLBA = {0}",           entry.endLBA);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.attributes = 0x{0:X16}", entry.attributes);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.name = {0}",             entry.name);
+            AaruConsole.Debug(MODULE_NAME, "entry.partitionType = {0}",    entry.partitionType);
+            AaruConsole.Debug(MODULE_NAME, "entry.partitionId = {0}",      entry.partitionId);
+            AaruConsole.Debug(MODULE_NAME, "entry.startLBA = {0}",         entry.startLBA);
+            AaruConsole.Debug(MODULE_NAME, "entry.endLBA = {0}",           entry.endLBA);
+            AaruConsole.Debug(MODULE_NAME, "entry.attributes = 0x{0:X16}", entry.attributes);
+            AaruConsole.Debug(MODULE_NAME, "entry.name = {0}",             entry.name);
 
             if(entry.startLBA / divisor > imagePlugin.Info.Sectors || entry.endLBA / divisor > imagePlugin.Info.Sectors)
                 return false;
@@ -207,7 +207,7 @@ public sealed class GuidPartitionTable : IPartition
                 Scheme      = Name
             };
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "part.PartitionType = {0}", part.Type);
+            AaruConsole.Debug(MODULE_NAME, "part.PartitionType = {0}", part.Type);
             partitions.Add(part);
         }
 
diff --git a/Aaru.Partitions/Human68k.cs b/Aaru.Partitions/Human68k.cs
index 5c00e7f82..440921741 100644
--- a/Aaru.Partitions/Human68k.cs
+++ b/Aaru.Partitions/Human68k.cs
@@ -71,7 +71,7 @@ public sealed class Human68K : IPartition
         ulong       sectsPerUnit;
         ErrorNumber errno;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "sectorSize = {0}", imagePlugin.Info.SectorSize);
+        AaruConsole.Debug(MODULE_NAME, "sectorSize = {0}", imagePlugin.Info.SectorSize);
 
         if(sectorOffset + 4 >= imagePlugin.Info.Sectors) return false;
 
@@ -100,29 +100,29 @@ public sealed class Human68K : IPartition
 
         Table table = Marshal.ByteArrayToStructureBigEndian<Table>(sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "table.magic = {0:X4}", table.magic);
+        AaruConsole.Debug(MODULE_NAME, "table.magic = {0:X4}", table.magic);
 
         if(table.magic != X68K_MAGIC) return false;
 
         for(int i = 0; i < table.entries.Length; i++)
             table.entries[i] = (Entry)Marshal.SwapStructureMembersEndian(table.entries[i]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "table.size = {0:X4}",    table.size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "table.size2 = {0:X4}",   table.size2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "table.unknown = {0:X4}", table.unknown);
+        AaruConsole.Debug(MODULE_NAME, "table.size = {0:X4}",    table.size);
+        AaruConsole.Debug(MODULE_NAME, "table.size2 = {0:X4}",   table.size2);
+        AaruConsole.Debug(MODULE_NAME, "table.unknown = {0:X4}", table.unknown);
 
         ulong counter = 0;
 
         foreach(Entry entry in table.entries)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "entry.name = {0}",
                                        StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.stateStart = {0}", entry.stateStart);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.length = {0}",     entry.length);
+            AaruConsole.Debug(MODULE_NAME, "entry.stateStart = {0}", entry.stateStart);
+            AaruConsole.Debug(MODULE_NAME, "entry.length = {0}",     entry.length);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "sectsPerUnit = {0} {1}",
                                        sectsPerUnit,
                                        imagePlugin.Info.SectorSize);
diff --git a/Aaru.Partitions/MBR.cs b/Aaru.Partitions/MBR.cs
index 392ce4f89..ba398bddb 100644
--- a/Aaru.Partitions/MBR.cs
+++ b/Aaru.Partitions/MBR.cs
@@ -351,8 +351,8 @@ public sealed class MBR : IPartition
         DiskManagerMasterBootRecord mbrOntrack =
             Marshal.ByteArrayToStructureLittleEndian<DiskManagerMasterBootRecord>(sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "xmlmedia = {0}",     imagePlugin.Info.MetadataMediaType);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mbr.magic = {0:X4}", mbr.magic);
+        AaruConsole.Debug(MODULE_NAME, "xmlmedia = {0}",     imagePlugin.Info.MetadataMediaType);
+        AaruConsole.Debug(MODULE_NAME, "mbr.magic = {0:X4}", mbr.magic);
 
         if(mbr.magic != MBR_MAGIC) return false; // Not MBR
 
@@ -362,7 +362,7 @@ public sealed class MBR : IPartition
 
         ulong signature = BitConverter.ToUInt64(hdrBytes, 0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "gpt.signature = 0x{0:X16}", signature);
+        AaruConsole.Debug(MODULE_NAME, "gpt.signature = 0x{0:X16}", signature);
 
         if(signature == GPT_MAGIC) return false;
 
@@ -373,7 +373,7 @@ public sealed class MBR : IPartition
             if(errno != ErrorNumber.NoError) return false;
 
             signature = BitConverter.ToUInt64(hdrBytes, 512);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "gpt.signature @ 0x200 = 0x{0:X16}", signature);
+            AaruConsole.Debug(MODULE_NAME, "gpt.signature @ 0x200 = 0x{0:X16}", signature);
 
             if(signature == GPT_MAGIC) return false;
         }
@@ -454,21 +454,21 @@ public sealed class MBR : IPartition
             // Some buggy implementations do some rounding errors getting a few sectors beyond device size
             if(lbaStart + lbaSectors > imagePlugin.Info.Sectors) lbaSectors = imagePlugin.Info.Sectors - lbaStart;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.status {0}",         entry.status);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.type {0}",           entry.type);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.lba_start {0}",      entry.lba_start);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.lba_sectors {0}",    entry.lba_sectors);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.start_cylinder {0}", startCylinder);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.start_head {0}",     entry.start_head);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.start_sector {0}",   startSector);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.end_cylinder {0}",   endCylinder);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.end_head {0}",       entry.end_head);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.end_sector {0}",     endSector);
+            AaruConsole.Debug(MODULE_NAME, "entry.status {0}",         entry.status);
+            AaruConsole.Debug(MODULE_NAME, "entry.type {0}",           entry.type);
+            AaruConsole.Debug(MODULE_NAME, "entry.lba_start {0}",      entry.lba_start);
+            AaruConsole.Debug(MODULE_NAME, "entry.lba_sectors {0}",    entry.lba_sectors);
+            AaruConsole.Debug(MODULE_NAME, "entry.start_cylinder {0}", startCylinder);
+            AaruConsole.Debug(MODULE_NAME, "entry.start_head {0}",     entry.start_head);
+            AaruConsole.Debug(MODULE_NAME, "entry.start_sector {0}",   startSector);
+            AaruConsole.Debug(MODULE_NAME, "entry.end_cylinder {0}",   endCylinder);
+            AaruConsole.Debug(MODULE_NAME, "entry.end_head {0}",       entry.end_head);
+            AaruConsole.Debug(MODULE_NAME, "entry.end_sector {0}",     endSector);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.minix = {0}", minix);
+            AaruConsole.Debug(MODULE_NAME, "entry.minix = {0}", minix);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "lba_start {0}",   lbaStart);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "lba_sectors {0}", lbaSectors);
+            AaruConsole.Debug(MODULE_NAME, "lba_start {0}",   lbaStart);
+            AaruConsole.Debug(MODULE_NAME, "lba_sectors {0}", lbaSectors);
 
             if(valid && minix) // Let's mix the fun
             {
@@ -507,7 +507,7 @@ public sealed class MBR : IPartition
                 }
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.extended = {0}", extended);
+            AaruConsole.Debug(MODULE_NAME, "entry.extended = {0}", extended);
 
             if(!extended) continue;
 
@@ -522,7 +522,7 @@ public sealed class MBR : IPartition
 
                 ExtendedBootRecord ebr = Marshal.ByteArrayToStructureLittleEndian<ExtendedBootRecord>(sector);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "ebr.magic == MBR_Magic = {0}", ebr.magic == MBR_MAGIC);
+                AaruConsole.Debug(MODULE_NAME, "ebr.magic == MBR_Magic = {0}", ebr.magic == MBR_MAGIC);
 
                 if(ebr.magic != MBR_MAGIC) break;
 
@@ -539,16 +539,16 @@ public sealed class MBR : IPartition
                     ulong extSectors = ebrEntry.lba_sectors;
                     bool  extMinix   = false;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ebr_entry.status {0}",         ebrEntry.status);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ebr_entry.type {0}",           ebrEntry.type);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ebr_entry.lba_start {0}",      ebrEntry.lba_start);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ebr_entry.lba_sectors {0}",    ebrEntry.lba_sectors);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ebr_entry.start_cylinder {0}", startCylinder);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ebr_entry.start_head {0}",     ebrEntry.start_head);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ebr_entry.start_sector {0}",   startSector);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ebr_entry.end_cylinder {0}",   endCylinder);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ebr_entry.end_head {0}",       ebrEntry.end_head);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ebr_entry.end_sector {0}",     endSector);
+                    AaruConsole.Debug(MODULE_NAME, "ebr_entry.status {0}",         ebrEntry.status);
+                    AaruConsole.Debug(MODULE_NAME, "ebr_entry.type {0}",           ebrEntry.type);
+                    AaruConsole.Debug(MODULE_NAME, "ebr_entry.lba_start {0}",      ebrEntry.lba_start);
+                    AaruConsole.Debug(MODULE_NAME, "ebr_entry.lba_sectors {0}",    ebrEntry.lba_sectors);
+                    AaruConsole.Debug(MODULE_NAME, "ebr_entry.start_cylinder {0}", startCylinder);
+                    AaruConsole.Debug(MODULE_NAME, "ebr_entry.start_head {0}",     ebrEntry.start_head);
+                    AaruConsole.Debug(MODULE_NAME, "ebr_entry.start_sector {0}",   startSector);
+                    AaruConsole.Debug(MODULE_NAME, "ebr_entry.end_cylinder {0}",   endCylinder);
+                    AaruConsole.Debug(MODULE_NAME, "ebr_entry.end_head {0}",       ebrEntry.end_head);
+                    AaruConsole.Debug(MODULE_NAME, "ebr_entry.end_sector {0}",     endSector);
 
                     // Let's start the fun...
                     extValid &= ebrEntry.status is 0x00 or 0x80;
@@ -585,8 +585,8 @@ public sealed class MBR : IPartition
                     extStart   /= divider;
                     extSectors /= divider;
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ext_start {0}",   extStart);
-                    AaruConsole.DebugWriteLine(MODULE_NAME, "ext_sectors {0}", extSectors);
+                    AaruConsole.Debug(MODULE_NAME, "ext_start {0}",   extStart);
+                    AaruConsole.Debug(MODULE_NAME, "ext_sectors {0}", extSectors);
 
                     if(ebrEntry.type is 0x05 or 0x0F or 0x15 or 0x1F or 0x85 or 0x91 or 0x9B or 0xC5 or 0xCF or 0xD5)
                     {
@@ -640,7 +640,7 @@ public sealed class MBR : IPartition
                     partitions.Add(part);
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "next_start {0}", nextStart);
+                AaruConsole.Debug(MODULE_NAME, "next_start {0}", nextStart);
                 processingExtended &= nextStart != 0;
                 processingExtended &= nextStart <= imagePlugin.Info.Sectors;
                 lbaStart           =  nextStart;
@@ -664,7 +664,7 @@ public sealed class MBR : IPartition
 
         ExtendedBootRecord mnx = Marshal.ByteArrayToStructureLittleEndian<ExtendedBootRecord>(sector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "mnx.magic == MBR_Magic = {0}", mnx.magic == MBR_MAGIC);
+        AaruConsole.Debug(MODULE_NAME, "mnx.magic == MBR_Magic = {0}", mnx.magic == MBR_MAGIC);
 
         if(mnx.magic != MBR_MAGIC) return false;
 
@@ -680,16 +680,16 @@ public sealed class MBR : IPartition
             ulong  mnxStart      = mnxEntry.lba_start;
             ulong  mnxSectors    = mnxEntry.lba_sectors;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_entry.status {0}",         mnxEntry.status);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_entry.type {0}",           mnxEntry.type);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_entry.lba_start {0}",      mnxEntry.lba_start);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_entry.lba_sectors {0}",    mnxEntry.lba_sectors);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_entry.start_cylinder {0}", startCylinder);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_entry.start_head {0}",     mnxEntry.start_head);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_entry.start_sector {0}",   startSector);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_entry.end_cylinder {0}",   endCylinder);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_entry.end_head {0}",       mnxEntry.end_head);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_entry.end_sector {0}",     endSector);
+            AaruConsole.Debug(MODULE_NAME, "mnx_entry.status {0}",         mnxEntry.status);
+            AaruConsole.Debug(MODULE_NAME, "mnx_entry.type {0}",           mnxEntry.type);
+            AaruConsole.Debug(MODULE_NAME, "mnx_entry.lba_start {0}",      mnxEntry.lba_start);
+            AaruConsole.Debug(MODULE_NAME, "mnx_entry.lba_sectors {0}",    mnxEntry.lba_sectors);
+            AaruConsole.Debug(MODULE_NAME, "mnx_entry.start_cylinder {0}", startCylinder);
+            AaruConsole.Debug(MODULE_NAME, "mnx_entry.start_head {0}",     mnxEntry.start_head);
+            AaruConsole.Debug(MODULE_NAME, "mnx_entry.start_sector {0}",   startSector);
+            AaruConsole.Debug(MODULE_NAME, "mnx_entry.end_cylinder {0}",   endCylinder);
+            AaruConsole.Debug(MODULE_NAME, "mnx_entry.end_head {0}",       mnxEntry.end_head);
+            AaruConsole.Debug(MODULE_NAME, "mnx_entry.end_sector {0}",     endSector);
 
             mnxValid &= mnxEntry.status is 0x00 or 0x80;
             mnxValid &= mnxEntry.type is 0x81 or 0x80;
@@ -723,8 +723,8 @@ public sealed class MBR : IPartition
             mnxStart   /= divider;
             mnxSectors /= divider;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_start {0}",   mnxStart);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "mnx_sectors {0}", mnxSectors);
+            AaruConsole.Debug(MODULE_NAME, "mnx_start {0}",   mnxStart);
+            AaruConsole.Debug(MODULE_NAME, "mnx_sectors {0}", mnxSectors);
 
             if(!mnxValid) continue;
 
diff --git a/Aaru.Partitions/NeXT.cs b/Aaru.Partitions/NeXT.cs
index 5013944ae..1447894d6 100644
--- a/Aaru.Partitions/NeXT.cs
+++ b/Aaru.Partitions/NeXT.cs
@@ -124,49 +124,49 @@ public sealed class NeXTDisklabel : IPartition
         label.dl_dt              = Marshal.ByteArrayToStructureBigEndian<DiskTab>(disktabB);
         label.dl_dt.d_partitions = new Entry[8];
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_version = 0x{0:X8}", label.dl_version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_label_blkno = {0}",  label.dl_label_blkno);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_size = {0}",         label.dl_size);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_version = 0x{0:X8}", label.dl_version);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_label_blkno = {0}",  label.dl_label_blkno);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_size = {0}",         label.dl_size);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_label = \"{0}\"", StringHandlers.CToString(label.dl_label));
+        AaruConsole.Debug(MODULE_NAME, "label.dl_label = \"{0}\"", StringHandlers.CToString(label.dl_label));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_flags = {0}",    label.dl_flags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_tag = 0x{0:X8}", label.dl_tag);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_flags = {0}",    label.dl_flags);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_tag = 0x{0:X8}", label.dl_tag);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.dl_dt.d_name = \"{0}\"",
                                    StringHandlers.CToString(label.dl_dt.d_name));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.dl_dt.d_type = \"{0}\"",
                                    StringHandlers.CToString(label.dl_dt.d_type));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_secsize = {0}",    label.dl_dt.d_secsize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_ntracks = {0}",    label.dl_dt.d_ntracks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_nsectors = {0}",   label.dl_dt.d_nsectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_ncylinders = {0}", label.dl_dt.d_ncylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_rpm = {0}",        label.dl_dt.d_rpm);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_front = {0}",      label.dl_dt.d_front);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_back = {0}",       label.dl_dt.d_back);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_ngroups = {0}",    label.dl_dt.d_ngroups);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_ag_size = {0}",    label.dl_dt.d_ag_size);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_ag_alts = {0}",    label.dl_dt.d_ag_alts);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_ag_off = {0}",     label.dl_dt.d_ag_off);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_secsize = {0}",    label.dl_dt.d_secsize);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ntracks = {0}",    label.dl_dt.d_ntracks);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_nsectors = {0}",   label.dl_dt.d_nsectors);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ncylinders = {0}", label.dl_dt.d_ncylinders);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_rpm = {0}",        label.dl_dt.d_rpm);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_front = {0}",      label.dl_dt.d_front);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_back = {0}",       label.dl_dt.d_back);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ngroups = {0}",    label.dl_dt.d_ngroups);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ag_size = {0}",    label.dl_dt.d_ag_size);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ag_alts = {0}",    label.dl_dt.d_ag_alts);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_ag_off = {0}",     label.dl_dt.d_ag_off);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_boot0_blkno[0] = {0}", label.dl_dt.d_boot0_blkno[0]);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_boot0_blkno[0] = {0}", label.dl_dt.d_boot0_blkno[0]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_boot0_blkno[1] = {0}", label.dl_dt.d_boot0_blkno[1]);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_boot0_blkno[1] = {0}", label.dl_dt.d_boot0_blkno[1]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.dl_dt.d_bootfile = \"{0}\"",
                                    StringHandlers.CToString(label.dl_dt.d_bootfile));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "label.dl_dt.d_hostname = \"{0}\"",
                                    StringHandlers.CToString(label.dl_dt.d_hostname));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_rootpartition = {0}", label.dl_dt.d_rootpartition);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_rwpartition = {0}",   label.dl_dt.d_rwpartition);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_rootpartition = {0}", label.dl_dt.d_rootpartition);
+        AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_rwpartition = {0}",   label.dl_dt.d_rwpartition);
 
         for(int i = 0; i < 8; i++)
         {
@@ -174,62 +174,62 @@ public sealed class NeXTDisklabel : IPartition
             Array.Copy(labelSector, 44 + 146 + 44 * i, partB, 0, 44);
             label.dl_dt.d_partitions[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(partB);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_base = {1}",
                                        i,
                                        label.dl_dt.d_partitions[i].p_base);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_size = {1}",
                                        i,
                                        label.dl_dt.d_partitions[i].p_size);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_bsize = {1}",
                                        i,
                                        label.dl_dt.d_partitions[i].p_bsize);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_fsize = {1}",
                                        i,
                                        label.dl_dt.d_partitions[i].p_fsize);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_opt = {1}",
                                        i,
                                        label.dl_dt.d_partitions[i].p_opt);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_cpg = {1}",
                                        i,
                                        label.dl_dt.d_partitions[i].p_cpg);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_density = {1}",
                                        i,
                                        label.dl_dt.d_partitions[i].p_density);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_minfree = {1}",
                                        i,
                                        label.dl_dt.d_partitions[i].p_minfree);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_newfs = {1}",
                                        i,
                                        label.dl_dt.d_partitions[i].p_newfs);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_mountpt = \"{1}\"",
                                        i,
                                        StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_automnt = {1}",
                                        i,
                                        label.dl_dt.d_partitions[i].p_automnt);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "label.dl_dt.d_partitions[{0}].p_type = \"{1}\"",
                                        i,
                                        StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type));
@@ -257,11 +257,11 @@ public sealed class NeXTDisklabel : IPartition
 
             if(part.Start + part.Length > imagePlugin.Info.Sectors)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Partition_bigger_than_device_reducing);
+                AaruConsole.Debug(MODULE_NAME, Localization.Partition_bigger_than_device_reducing);
                 part.Length = imagePlugin.Info.Sectors - part.Start;
                 part.Size   = part.Length * sectorSize;
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "label.dl_dt.d_partitions[{0}].p_size = {1}", i, part.Length);
+                AaruConsole.Debug(MODULE_NAME, "label.dl_dt.d_partitions[{0}].p_size = {1}", i, part.Length);
             }
 
             sb.AppendFormat(Localization._0_bytes_per_block,    label.dl_dt.d_partitions[i].p_bsize).AppendLine();
diff --git a/Aaru.Partitions/PC98.cs b/Aaru.Partitions/PC98.cs
index deab283df..cdcc720c6 100644
--- a/Aaru.Partitions/PC98.cs
+++ b/Aaru.Partitions/PC98.cs
@@ -83,21 +83,21 @@ public sealed class PC98 : IPartition
 
         foreach(Partition entry in table.entries)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_mid = {0}",      entry.dp_mid);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_sid = {0}",      entry.dp_sid);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_dum1 = {0}",     entry.dp_dum1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_dum2 = {0}",     entry.dp_dum2);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_ipl_sct = {0}",  entry.dp_ipl_sct);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_ipl_head = {0}", entry.dp_ipl_head);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_ipl_cyl = {0}",  entry.dp_ipl_cyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_ssect = {0}",    entry.dp_ssect);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_shd = {0}",      entry.dp_shd);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_scyl = {0}",     entry.dp_scyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_esect = {0}",    entry.dp_esect);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_ehd = {0}",      entry.dp_ehd);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "entry.dp_ecyl = {0}",     entry.dp_ecyl);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_mid = {0}",      entry.dp_mid);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_sid = {0}",      entry.dp_sid);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_dum1 = {0}",     entry.dp_dum1);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_dum2 = {0}",     entry.dp_dum2);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_ipl_sct = {0}",  entry.dp_ipl_sct);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_ipl_head = {0}", entry.dp_ipl_head);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_ipl_cyl = {0}",  entry.dp_ipl_cyl);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_ssect = {0}",    entry.dp_ssect);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_shd = {0}",      entry.dp_shd);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_scyl = {0}",     entry.dp_scyl);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_esect = {0}",    entry.dp_esect);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_ehd = {0}",      entry.dp_ehd);
+            AaruConsole.Debug(MODULE_NAME, "entry.dp_ecyl = {0}",     entry.dp_ecyl);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "entry.dp_name = \"{0}\"",
                                        StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)));
 
@@ -136,13 +136,13 @@ public sealed class PC98 : IPartition
 
             part.Size = part.Length * imagePlugin.Info.SectorSize;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "part.Start = {0}",    part.Start);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "part.Type = {0}",     part.Type);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "part.Name = {0}",     part.Name);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "part.Sequence = {0}", part.Sequence);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "part.Offset = {0}",   part.Offset);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "part.Length = {0}",   part.Length);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "part.Size = {0}",     part.Size);
+            AaruConsole.Debug(MODULE_NAME, "part.Start = {0}",    part.Start);
+            AaruConsole.Debug(MODULE_NAME, "part.Type = {0}",     part.Type);
+            AaruConsole.Debug(MODULE_NAME, "part.Name = {0}",     part.Name);
+            AaruConsole.Debug(MODULE_NAME, "part.Sequence = {0}", part.Sequence);
+            AaruConsole.Debug(MODULE_NAME, "part.Offset = {0}",   part.Offset);
+            AaruConsole.Debug(MODULE_NAME, "part.Length = {0}",   part.Length);
+            AaruConsole.Debug(MODULE_NAME, "part.Size = {0}",     part.Size);
 
             if((entry.dp_mid & 0x20) != 0x20 && (entry.dp_mid & 0x44) != 0x44 ||
                part.Start >= imagePlugin.Info.Sectors                         ||
diff --git a/Aaru.Partitions/RDB.cs b/Aaru.Partitions/RDB.cs
index f13d5b4e7..fb7027c69 100644
--- a/Aaru.Partitions/RDB.cs
+++ b/Aaru.Partitions/RDB.cs
@@ -214,11 +214,11 @@ public sealed class AmigaRigidDiskBlock : IPartition
 
             uint magic = BigEndianBitConverter.ToUInt32(tmpSector, 0);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Possible_magic_at_block_0_is_1_X8, rdbBlock, magic);
+            AaruConsole.Debug(MODULE_NAME, Localization.Possible_magic_at_block_0_is_1_X8, rdbBlock, magic);
 
             if(magic == RIGID_DISK_BLOCK_MAGIC)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_RDB_magic_at_block_0, rdbBlock);
+                AaruConsole.Debug(MODULE_NAME, Localization.Found_RDB_magic_at_block_0, rdbBlock);
 
                 foundRdb = true;
 
@@ -310,61 +310,61 @@ public sealed class AmigaRigidDiskBlock : IPartition
         rdb.Reserved24 = BigEndianBitConverter.ToUInt32(sector, 0xF8);
         rdb.Reserved25 = BigEndianBitConverter.ToUInt32(sector, 0xFC);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.magic = 0x{0:X8}",             rdb.Magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.size = {0} longs, {1} bytes",  rdb.Size, rdb.Size * 4);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.checksum = 0x{0:X8}",          rdb.Checksum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.targetID = {0}",               rdb.TargetId);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.block_size = {0}",             rdb.BlockSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.badblock_ptr = {0}",           rdb.BadblockPtr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.partition_ptr = {0}",          rdb.PartitionPtr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.fsheader_ptr = {0}",           rdb.FsheaderPtr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.driveinitcode = {0}",          rdb.Driveinitcode);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved1 = 0x{0:X8}",         rdb.Reserved1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved2 = 0x{0:X8}",         rdb.Reserved2);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved3 = 0x{0:X8}",         rdb.Reserved3);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved4 = 0x{0:X8}",         rdb.Reserved4);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved5 = 0x{0:X8}",         rdb.Reserved5);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved6 = 0x{0:X8}",         rdb.Reserved6);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.cylinders = {0}",              rdb.Cylinders);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.spt = {0}",                    rdb.Spt);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.heads = {0}",                  rdb.Heads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.interleave = {0}",             rdb.Interleave);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.parking = {0}",                rdb.Parking);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved7 = 0x{0:X8}",         rdb.Reserved7);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved8 = 0x{0:X8}",         rdb.Reserved8);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved9 = 0x{0:X8}",         rdb.Reserved9);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.writeprecomp = {0}",           rdb.Writeprecomp);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reducedwrite = {0}",           rdb.Reducedwrite);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.steprate = {0}",               rdb.Steprate);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved10 = 0x{0:X8}",        rdb.Reserved10);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved11 = 0x{0:X8}",        rdb.Reserved11);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved12 = 0x{0:X8}",        rdb.Reserved12);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved13 = 0x{0:X8}",        rdb.Reserved13);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved14 = 0x{0:X8}",        rdb.Reserved14);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.RDBBlockLow = {0}",            rdb.RdbBlockLow);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.RDBBlockHigh = {0}",           rdb.RdbBlockHigh);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.LowCylinder = {0}",            rdb.LowCylinder);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.HighCylinder = {0}",           rdb.HighCylinder);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.CylBlocks = {0}",              rdb.CylBlocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.AutoParkSeconds = {0}",        rdb.AutoParkSeconds);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.HighCylinder = {0}",           rdb.HighCylinder);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved15 = 0x{0:X8}",        rdb.Reserved15);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.diskVendor = \"{0}\"",         rdb.DiskVendor);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.diskProduct = \"{0}\"",        rdb.DiskProduct);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.diskRevision = \"{0}\"",       rdb.DiskRevision);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.controllerVendor = \"{0}\"",   rdb.ControllerVendor);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.controllerProduct = \"{0}\"",  rdb.ControllerProduct);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.controllerRevision = \"{0}\"", rdb.ControllerRevision);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved16 = 0x{0:X8}",        rdb.Reserved16);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved17 = 0x{0:X8}",        rdb.Reserved17);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved18 = 0x{0:X8}",        rdb.Reserved18);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved19 = 0x{0:X8}",        rdb.Reserved19);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved20 = 0x{0:X8}",        rdb.Reserved20);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved21 = 0x{0:X8}",        rdb.Reserved21);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved22 = 0x{0:X8}",        rdb.Reserved22);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved23 = 0x{0:X8}",        rdb.Reserved23);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved24 = 0x{0:X8}",        rdb.Reserved24);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "RDB.reserved25 = 0x{0:X8}",        rdb.Reserved25);
+        AaruConsole.Debug(MODULE_NAME, "RDB.magic = 0x{0:X8}",             rdb.Magic);
+        AaruConsole.Debug(MODULE_NAME, "RDB.size = {0} longs, {1} bytes",  rdb.Size, rdb.Size * 4);
+        AaruConsole.Debug(MODULE_NAME, "RDB.checksum = 0x{0:X8}",          rdb.Checksum);
+        AaruConsole.Debug(MODULE_NAME, "RDB.targetID = {0}",               rdb.TargetId);
+        AaruConsole.Debug(MODULE_NAME, "RDB.block_size = {0}",             rdb.BlockSize);
+        AaruConsole.Debug(MODULE_NAME, "RDB.badblock_ptr = {0}",           rdb.BadblockPtr);
+        AaruConsole.Debug(MODULE_NAME, "RDB.partition_ptr = {0}",          rdb.PartitionPtr);
+        AaruConsole.Debug(MODULE_NAME, "RDB.fsheader_ptr = {0}",           rdb.FsheaderPtr);
+        AaruConsole.Debug(MODULE_NAME, "RDB.driveinitcode = {0}",          rdb.Driveinitcode);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved1 = 0x{0:X8}",         rdb.Reserved1);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved2 = 0x{0:X8}",         rdb.Reserved2);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved3 = 0x{0:X8}",         rdb.Reserved3);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved4 = 0x{0:X8}",         rdb.Reserved4);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved5 = 0x{0:X8}",         rdb.Reserved5);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved6 = 0x{0:X8}",         rdb.Reserved6);
+        AaruConsole.Debug(MODULE_NAME, "RDB.cylinders = {0}",              rdb.Cylinders);
+        AaruConsole.Debug(MODULE_NAME, "RDB.spt = {0}",                    rdb.Spt);
+        AaruConsole.Debug(MODULE_NAME, "RDB.heads = {0}",                  rdb.Heads);
+        AaruConsole.Debug(MODULE_NAME, "RDB.interleave = {0}",             rdb.Interleave);
+        AaruConsole.Debug(MODULE_NAME, "RDB.parking = {0}",                rdb.Parking);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved7 = 0x{0:X8}",         rdb.Reserved7);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved8 = 0x{0:X8}",         rdb.Reserved8);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved9 = 0x{0:X8}",         rdb.Reserved9);
+        AaruConsole.Debug(MODULE_NAME, "RDB.writeprecomp = {0}",           rdb.Writeprecomp);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reducedwrite = {0}",           rdb.Reducedwrite);
+        AaruConsole.Debug(MODULE_NAME, "RDB.steprate = {0}",               rdb.Steprate);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved10 = 0x{0:X8}",        rdb.Reserved10);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved11 = 0x{0:X8}",        rdb.Reserved11);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved12 = 0x{0:X8}",        rdb.Reserved12);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved13 = 0x{0:X8}",        rdb.Reserved13);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved14 = 0x{0:X8}",        rdb.Reserved14);
+        AaruConsole.Debug(MODULE_NAME, "RDB.RDBBlockLow = {0}",            rdb.RdbBlockLow);
+        AaruConsole.Debug(MODULE_NAME, "RDB.RDBBlockHigh = {0}",           rdb.RdbBlockHigh);
+        AaruConsole.Debug(MODULE_NAME, "RDB.LowCylinder = {0}",            rdb.LowCylinder);
+        AaruConsole.Debug(MODULE_NAME, "RDB.HighCylinder = {0}",           rdb.HighCylinder);
+        AaruConsole.Debug(MODULE_NAME, "RDB.CylBlocks = {0}",              rdb.CylBlocks);
+        AaruConsole.Debug(MODULE_NAME, "RDB.AutoParkSeconds = {0}",        rdb.AutoParkSeconds);
+        AaruConsole.Debug(MODULE_NAME, "RDB.HighCylinder = {0}",           rdb.HighCylinder);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved15 = 0x{0:X8}",        rdb.Reserved15);
+        AaruConsole.Debug(MODULE_NAME, "RDB.diskVendor = \"{0}\"",         rdb.DiskVendor);
+        AaruConsole.Debug(MODULE_NAME, "RDB.diskProduct = \"{0}\"",        rdb.DiskProduct);
+        AaruConsole.Debug(MODULE_NAME, "RDB.diskRevision = \"{0}\"",       rdb.DiskRevision);
+        AaruConsole.Debug(MODULE_NAME, "RDB.controllerVendor = \"{0}\"",   rdb.ControllerVendor);
+        AaruConsole.Debug(MODULE_NAME, "RDB.controllerProduct = \"{0}\"",  rdb.ControllerProduct);
+        AaruConsole.Debug(MODULE_NAME, "RDB.controllerRevision = \"{0}\"", rdb.ControllerRevision);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved16 = 0x{0:X8}",        rdb.Reserved16);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved17 = 0x{0:X8}",        rdb.Reserved17);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved18 = 0x{0:X8}",        rdb.Reserved18);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved19 = 0x{0:X8}",        rdb.Reserved19);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved20 = 0x{0:X8}",        rdb.Reserved20);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved21 = 0x{0:X8}",        rdb.Reserved21);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved22 = 0x{0:X8}",        rdb.Reserved22);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved23 = 0x{0:X8}",        rdb.Reserved23);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved24 = 0x{0:X8}",        rdb.Reserved24);
+        AaruConsole.Debug(MODULE_NAME, "RDB.reserved25 = 0x{0:X8}",        rdb.Reserved25);
 
         // Reading BadBlock list
         List<BadBlockList> badBlockChain = [];
@@ -372,7 +372,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
 
         while(nextBlock != 0xFFFFFFFF)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Going_to_block_0_in_search_of_a_BadBlock_block,
                                        nextBlock);
 
@@ -384,7 +384,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
 
             if(magic != BAD_BLOCK_LIST_MAGIC) break;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_BadBlock_block);
+            AaruConsole.Debug(MODULE_NAME, Localization.Found_BadBlock_block);
 
             var chainEntry = new BadBlockList
             {
@@ -399,17 +399,17 @@ public sealed class AmigaRigidDiskBlock : IPartition
             ulong entries = (chainEntry.Size - 6) / 2;
             chainEntry.BlockPairs = new BadBlockEntry[entries];
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "chainEntry.magic = 0x{0:X8}", chainEntry.Magic);
+            AaruConsole.Debug(MODULE_NAME, "chainEntry.magic = 0x{0:X8}", chainEntry.Magic);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "chainEntry.size = {0} longs, {1} bytes",
                                        chainEntry.Size,
                                        chainEntry.Size * 4);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "chainEntry.checksum = 0x{0:X8}", chainEntry.Checksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "chainEntry.targetID = {0}",      chainEntry.TargetId);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "chainEntry.next_ptr = {0}",      chainEntry.NextPtr);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "chainEntry.reserved = 0x{0:X8}", chainEntry.Reserved);
+            AaruConsole.Debug(MODULE_NAME, "chainEntry.checksum = 0x{0:X8}", chainEntry.Checksum);
+            AaruConsole.Debug(MODULE_NAME, "chainEntry.targetID = {0}",      chainEntry.TargetId);
+            AaruConsole.Debug(MODULE_NAME, "chainEntry.next_ptr = {0}",      chainEntry.NextPtr);
+            AaruConsole.Debug(MODULE_NAME, "chainEntry.reserved = 0x{0:X8}", chainEntry.Reserved);
 
             for(ulong i = 0; i < entries; i++)
             {
@@ -417,7 +417,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
 
                 chainEntry.BlockPairs[i].GoodBlock = BigEndianBitConverter.ToUInt32(sector, (int)(0x18 + i * 8 + 4));
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Bad_block_at_0_replaced_with_good_block_at_1,
                                            chainEntry.BlockPairs[i].BadBlock,
                                            chainEntry.BlockPairs[i].GoodBlock);
@@ -433,7 +433,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
 
         while(nextBlock != 0xFFFFFFFF)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Going_to_block_0_in_search_of_a_PartitionEntry_block,
                                        nextBlock + sectorOffset);
 
@@ -445,7 +445,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
 
             if(magic != PARTITION_BLOCK_MAGIC) break;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_PartitionEntry_block);
+            AaruConsole.Debug(MODULE_NAME, Localization.Found_PartitionEntry_block);
 
             var partEntry = new PartitionEntry
             {
@@ -503,105 +503,105 @@ public sealed class AmigaRigidDiskBlock : IPartition
             Array.Copy(sector, 0x24, driveName, 0, 32);
             partEntry.DriveName = StringHandlers.PascalToString(driveName, Encoding.GetEncoding("iso-8859-1"));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.magic = 0x{0:X8}", partEntry.Magic);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.magic = 0x{0:X8}", partEntry.Magic);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.size = {0} longs, {1} bytes",
                                        partEntry.Size,
                                        partEntry.Size * 4);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.checksum = 0x{0:X8}",   partEntry.Checksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.targetID = {0}",        partEntry.TargetId);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.next_ptr = {0}",        partEntry.NextPtr);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.flags = 0x{0:X8}",      partEntry.Flags);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved1 = 0x{0:X8}",  partEntry.Reserved1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved2 = 0x{0:X8}",  partEntry.Reserved2);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.devFlags = 0x{0:X8}",   partEntry.DevFlags);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.driveNameLen = {0}",    partEntry.DriveNameLen);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.driveName = \"{0}\"",   partEntry.DriveName);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved3 = 0x{0:X8}",  partEntry.Reserved3);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved4 = 0x{0:X8}",  partEntry.Reserved4);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved5 = 0x{0:X8}",  partEntry.Reserved5);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved6 = 0x{0:X8}",  partEntry.Reserved6);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved7 = 0x{0:X8}",  partEntry.Reserved7);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved8 = 0x{0:X8}",  partEntry.Reserved8);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved9 = 0x{0:X8}",  partEntry.Reserved9);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved10 = 0x{0:X8}", partEntry.Reserved10);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved11 = 0x{0:X8}", partEntry.Reserved11);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved12 = 0x{0:X8}", partEntry.Reserved12);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved13 = 0x{0:X8}", partEntry.Reserved13);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved14 = 0x{0:X8}", partEntry.Reserved14);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved15 = 0x{0:X8}", partEntry.Reserved15);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved16 = 0x{0:X8}", partEntry.Reserved16);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.reserved17 = 0x{0:X8}", partEntry.Reserved17);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.checksum = 0x{0:X8}",   partEntry.Checksum);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.targetID = {0}",        partEntry.TargetId);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.next_ptr = {0}",        partEntry.NextPtr);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.flags = 0x{0:X8}",      partEntry.Flags);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved1 = 0x{0:X8}",  partEntry.Reserved1);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved2 = 0x{0:X8}",  partEntry.Reserved2);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.devFlags = 0x{0:X8}",   partEntry.DevFlags);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.driveNameLen = {0}",    partEntry.DriveNameLen);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.driveName = \"{0}\"",   partEntry.DriveName);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved3 = 0x{0:X8}",  partEntry.Reserved3);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved4 = 0x{0:X8}",  partEntry.Reserved4);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved5 = 0x{0:X8}",  partEntry.Reserved5);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved6 = 0x{0:X8}",  partEntry.Reserved6);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved7 = 0x{0:X8}",  partEntry.Reserved7);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved8 = 0x{0:X8}",  partEntry.Reserved8);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved9 = 0x{0:X8}",  partEntry.Reserved9);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved10 = 0x{0:X8}", partEntry.Reserved10);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved11 = 0x{0:X8}", partEntry.Reserved11);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved12 = 0x{0:X8}", partEntry.Reserved12);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved13 = 0x{0:X8}", partEntry.Reserved13);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved14 = 0x{0:X8}", partEntry.Reserved14);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved15 = 0x{0:X8}", partEntry.Reserved15);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved16 = 0x{0:X8}", partEntry.Reserved16);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.reserved17 = 0x{0:X8}", partEntry.Reserved17);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.size = {0} longs, {1} bytes",
                                        partEntry.DosEnvVec.Size,
                                        partEntry.DosEnvVec.Size * 4);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.block_size = {0} longs, {1} bytes",
                                        partEntry.DosEnvVec.BlockSize,
                                        partEntry.DosEnvVec.BlockSize * 4);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.sec_org = 0x{0:X8}",
                                        partEntry.DosEnvVec.SecOrg);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.dosEnvVec.surfaces = {0}", partEntry.DosEnvVec.Surfaces);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.surfaces = {0}", partEntry.DosEnvVec.Surfaces);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.dosEnvVec.spb = {0}", partEntry.DosEnvVec.Spb);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.spb = {0}", partEntry.DosEnvVec.Spb);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.dosEnvVec.bpt = {0}", partEntry.DosEnvVec.Bpt);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.bpt = {0}", partEntry.DosEnvVec.Bpt);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.reservedblocks = {0}",
                                        partEntry.DosEnvVec.Reservedblocks);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.dosEnvVec.prealloc = {0}", partEntry.DosEnvVec.Prealloc);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.prealloc = {0}", partEntry.DosEnvVec.Prealloc);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.interleave = {0}",
                                        partEntry.DosEnvVec.Interleave);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.lowCylinder = {0}",
                                        partEntry.DosEnvVec.LowCylinder);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.highCylinder = {0}",
                                        partEntry.DosEnvVec.HighCylinder);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.numBuffer = {0}",
                                        partEntry.DosEnvVec.NumBuffer);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.bufMemType = {0}",
                                        partEntry.DosEnvVec.BufMemType);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.maxTransfer = {0}",
                                        partEntry.DosEnvVec.MaxTransfer);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.dosEnvVec.Mask = 0x{0:X8}", partEntry.DosEnvVec.Mask);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.Mask = 0x{0:X8}", partEntry.DosEnvVec.Mask);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.bootPriority = {0}",
                                        partEntry.DosEnvVec.BootPriority);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.dosType = {0}",
                                        AmigaDosTypeToString(partEntry.DosEnvVec.DosType));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "partEntry.dosEnvVec.baud = {0}", partEntry.DosEnvVec.Baud);
+            AaruConsole.Debug(MODULE_NAME, "partEntry.dosEnvVec.baud = {0}", partEntry.DosEnvVec.Baud);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.control = 0x{0:X8}",
                                        partEntry.DosEnvVec.Control);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "partEntry.dosEnvVec.bootBlocks = {0}",
                                        partEntry.DosEnvVec.BootBlocks);
 
@@ -616,7 +616,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
 
         while(nextBlock != 0xFFFFFFFF)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Going_to_block_0_in_search_of_a_FileSystemHeader_block,
                                        nextBlock);
 
@@ -628,7 +628,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
 
             if(magic != FILESYSTEM_HEADER_MAGIC) break;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_FileSystemHeader_block);
+            AaruConsole.Debug(MODULE_NAME, Localization.Found_FileSystemHeader_block);
 
             var fshd = new FileSystemHeader
             {
@@ -657,37 +657,37 @@ public sealed class AmigaRigidDiskBlock : IPartition
                 }
             };
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.magic = 0x{0:X8}", fshd.Magic);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.magic = 0x{0:X8}", fshd.Magic);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.size = {0} longs, {1} bytes", fshd.Size, fshd.Size * 4);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.size = {0} longs, {1} bytes", fshd.Size, fshd.Size * 4);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.checksum = 0x{0:X8}",  fshd.Checksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.targetID = {0}",       fshd.TargetId);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.next_ptr = {0}",       fshd.NextPtr);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.flags = 0x{0:X8}",     fshd.Flags);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.reserved1 = 0x{0:X8}", fshd.Reserved1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.reserved2 = 0x{0:X8}", fshd.Reserved2);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.checksum = 0x{0:X8}",  fshd.Checksum);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.targetID = {0}",       fshd.TargetId);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.next_ptr = {0}",       fshd.NextPtr);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.flags = 0x{0:X8}",     fshd.Flags);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.reserved1 = 0x{0:X8}", fshd.Reserved1);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.reserved2 = 0x{0:X8}", fshd.Reserved2);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.dosType = {0}", AmigaDosTypeToString(fshd.DosType));
+            AaruConsole.Debug(MODULE_NAME, "FSHD.dosType = {0}", AmigaDosTypeToString(fshd.DosType));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "FSHD.version = {0:D2}.{1:D2} (0x{2:X8})",
                                        (fshd.Version & 0xFFFF0000) >> 16,
                                        fshd.Version & 0xFFFF,
                                        fshd.Version);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.patchFlags = 0x{0:X8}", fshd.PatchFlags);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.patchFlags = 0x{0:X8}", fshd.PatchFlags);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.dnode.type = {0}",        fshd.Dnode.Type);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.dnode.task = {0}",        fshd.Dnode.Task);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.dnode.locked = {0}",      fshd.Dnode.Locked);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.dnode.handler = {0}",     fshd.Dnode.Handler);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.dnode.stackSize = {0}",   fshd.Dnode.StackSize);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.dnode.priority = {0}",    fshd.Dnode.Priority);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.dnode.startup = {0}",     fshd.Dnode.Startup);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.dnode.seglist_ptr = {0}", fshd.Dnode.SeglistPtr);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.type = {0}",        fshd.Dnode.Type);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.task = {0}",        fshd.Dnode.Task);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.locked = {0}",      fshd.Dnode.Locked);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.handler = {0}",     fshd.Dnode.Handler);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.stackSize = {0}",   fshd.Dnode.StackSize);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.priority = {0}",    fshd.Dnode.Priority);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.startup = {0}",     fshd.Dnode.Startup);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.seglist_ptr = {0}", fshd.Dnode.SeglistPtr);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "FSHD.dnode.global_vec = 0x{0:X8}", fshd.Dnode.GlobalVec);
+            AaruConsole.Debug(MODULE_NAME, "FSHD.dnode.global_vec = 0x{0:X8}", fshd.Dnode.GlobalVec);
 
             nextBlock = fshd.Dnode.SeglistPtr;
             bool thereAreLoadSegments = false;
@@ -695,7 +695,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
 
             while(nextBlock != 0xFFFFFFFF)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Going_to_block_0_in_search_of_a_LoadSegment_block,
                                            nextBlock);
 
@@ -707,7 +707,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
 
                 if(magicSeg != LOAD_SEG_MAGIC) break;
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Found_LoadSegment_block);
+                AaruConsole.Debug(MODULE_NAME, Localization.Found_LoadSegment_block);
 
                 thereAreLoadSegments = true;
 
@@ -723,16 +723,16 @@ public sealed class AmigaRigidDiskBlock : IPartition
                 loadSeg.LoadData = new byte[(loadSeg.Size - 5) * 4];
                 Array.Copy(sector, 0x14, loadSeg.LoadData, 0, (loadSeg.Size - 5) * 4);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "loadSeg.magic = 0x{0:X8}", loadSeg.Magic);
+                AaruConsole.Debug(MODULE_NAME, "loadSeg.magic = 0x{0:X8}", loadSeg.Magic);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "loadSeg.size = {0} longs, {1} bytes",
                                            loadSeg.Size,
                                            loadSeg.Size * 4);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "loadSeg.checksum = 0x{0:X8}", loadSeg.Checksum);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "loadSeg.targetID = {0}",      loadSeg.TargetId);
-                AaruConsole.DebugWriteLine(MODULE_NAME, "loadSeg.next_ptr = {0}",      loadSeg.NextPtr);
+                AaruConsole.Debug(MODULE_NAME, "loadSeg.checksum = 0x{0:X8}", loadSeg.Checksum);
+                AaruConsole.Debug(MODULE_NAME, "loadSeg.targetID = {0}",      loadSeg.TargetId);
+                AaruConsole.Debug(MODULE_NAME, "loadSeg.next_ptr = {0}",      loadSeg.NextPtr);
 
                 segmentEntries.Add(loadSeg);
                 nextBlock = loadSeg.NextPtr;
@@ -743,7 +743,7 @@ public sealed class AmigaRigidDiskBlock : IPartition
             if(thereAreLoadSegments)
             {
                 string loadSegSha1 = sha1Ctx.End();
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.LoadSegment_data_SHA1_0, loadSegSha1);
+                AaruConsole.Debug(MODULE_NAME, Localization.LoadSegment_data_SHA1_0, loadSegSha1);
             }
 
             fshdEntries.Add(fshd);
diff --git a/Aaru.Partitions/SGI.cs b/Aaru.Partitions/SGI.cs
index e5f389022..0fb754fc0 100644
--- a/Aaru.Partitions/SGI.cs
+++ b/Aaru.Partitions/SGI.cs
@@ -81,73 +81,73 @@ public sealed class SGI : IPartition
         for(int i = 0; i < dvh.partitions.Length; i++)
             dvh.partitions[i] = (Partition)Marshal.SwapStructureMembersEndian(dvh.partitions[i]);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    Localization.dvh_magic_equals_0_X8_should_be_1_X8,
                                    dvh.magic,
                                    SGI_MAGIC);
 
         if(dvh.magic != SGI_MAGIC) return false;
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.root_part_num = {0}", dvh.root_part_num);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.swap_part_num = {0}", dvh.swap_part_num);
+        AaruConsole.Debug(MODULE_NAME, "dvh.root_part_num = {0}", dvh.root_part_num);
+        AaruConsole.Debug(MODULE_NAME, "dvh.swap_part_num = {0}", dvh.swap_part_num);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.boot_file = \"{0}\"", StringHandlers.CToString(dvh.boot_file));
+        AaruConsole.Debug(MODULE_NAME, "dvh.boot_file = \"{0}\"", StringHandlers.CToString(dvh.boot_file));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_skew = {0}", dvh.device_params.dp_skew);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_gap1 = {0}", dvh.device_params.dp_gap1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_gap2 = {0}", dvh.device_params.dp_gap2);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_skew = {0}", dvh.device_params.dp_skew);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_gap1 = {0}", dvh.device_params.dp_gap1);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_gap2 = {0}", dvh.device_params.dp_gap2);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dvh.device_params.dp_spares_cyl = {0}",
                                    dvh.device_params.dp_spares_cyl);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_cyls = {0}",  dvh.device_params.dp_cyls);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_shd0 = {0}",  dvh.device_params.dp_shd0);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_trks0 = {0}", dvh.device_params.dp_trks0);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_cyls = {0}",  dvh.device_params.dp_cyls);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_shd0 = {0}",  dvh.device_params.dp_shd0);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_trks0 = {0}", dvh.device_params.dp_trks0);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_ctq_depth = {0}", dvh.device_params.dp_ctq_depth);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_ctq_depth = {0}", dvh.device_params.dp_ctq_depth);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_cylshi = {0}", dvh.device_params.dp_cylshi);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_cylshi = {0}", dvh.device_params.dp_cylshi);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_secs = {0}", dvh.device_params.dp_secs);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_secs = {0}", dvh.device_params.dp_secs);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_secbytes = {0}", dvh.device_params.dp_secbytes);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_secbytes = {0}", dvh.device_params.dp_secbytes);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "dvh.device_params.dp_interleave = {0}",
                                    dvh.device_params.dp_interleave);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_flags = {0}", dvh.device_params.dp_flags);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_flags = {0}", dvh.device_params.dp_flags);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_datarate = {0}", dvh.device_params.dp_datarate);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_datarate = {0}", dvh.device_params.dp_datarate);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_nretries = {0}", dvh.device_params.dp_nretries);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_nretries = {0}", dvh.device_params.dp_nretries);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_mspw = {0}",  dvh.device_params.dp_mspw);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_xgap1 = {0}", dvh.device_params.dp_xgap1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_xsync = {0}", dvh.device_params.dp_xsync);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_xrdly = {0}", dvh.device_params.dp_xrdly);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_xgap2 = {0}", dvh.device_params.dp_xgap2);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_mspw = {0}",  dvh.device_params.dp_mspw);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xgap1 = {0}", dvh.device_params.dp_xgap1);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xsync = {0}", dvh.device_params.dp_xsync);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xrdly = {0}", dvh.device_params.dp_xrdly);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xgap2 = {0}", dvh.device_params.dp_xgap2);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_xrgate = {0}", dvh.device_params.dp_xrgate);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xrgate = {0}", dvh.device_params.dp_xrgate);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.device_params.dp_xwcont = {0}", dvh.device_params.dp_xwcont);
+        AaruConsole.Debug(MODULE_NAME, "dvh.device_params.dp_xwcont = {0}", dvh.device_params.dp_xwcont);
 
         ulong counter = 0;
 
         for(int i = 0; i < dvh.partitions.Length; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dvh.partitions[{0}].num_blocks = {1}",
                                        i,
                                        dvh.partitions[i].num_blocks);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dvh.partitions[{0}].first_block = {1}",
                                        i,
                                        dvh.partitions[i].first_block);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dvh.partitions[{0}].type = {1}", i, dvh.partitions[i].type);
+            AaruConsole.Debug(MODULE_NAME, "dvh.partitions[{0}].type = {1}", i, dvh.partitions[i].type);
 
             var part = new CommonTypes.Partition
             {
diff --git a/Aaru.Partitions/Sun.cs b/Aaru.Partitions/Sun.cs
index d4085c698..2527b2177 100644
--- a/Aaru.Partitions/Sun.cs
+++ b/Aaru.Partitions/Sun.cs
@@ -113,9 +113,9 @@ public sealed class SunDisklabel : IPartition
         dk_label8  dkl8  = Marshal.ByteArrayToStructureLittleEndian<dk_label8>(sunSector);
         dk_label16 dkl16 = Marshal.ByteArrayToStructureLittleEndian<dk_label16>(sunSector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_magic = 0x{0:X4}",           dkl.dkl_magic);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}",  dkl8.dkl_vtoc.v_sanity);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
+        AaruConsole.Debug(MODULE_NAME, "dkl.dkl_magic = 0x{0:X4}",           dkl.dkl_magic);
+        AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}",  dkl8.dkl_vtoc.v_sanity);
+        AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
 
         if(dkl.dkl_magic is DKL_MAGIC or DKL_CIGAM)
         {
@@ -161,36 +161,36 @@ public sealed class SunDisklabel : IPartition
         {
             ulong sectorsPerCylinder = (ulong)(dkl.dkl_nsect * dkl.dkl_nhead);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dkl.dkl_asciilabel = \"{0}\"",
                                        StringHandlers.CToString(dkl.dkl_asciilabel));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_rpm = {0}",    dkl.dkl_rpm);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_pcyl = {0}",   dkl.dkl_pcyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_apc = {0}",    dkl.dkl_apc);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_gap1 = {0}",   dkl.dkl_gap1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_gap2 = {0}",   dkl.dkl_gap2);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_intrlv = {0}", dkl.dkl_intrlv);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_ncyl = {0}",   dkl.dkl_ncyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_acyl = {0}",   dkl.dkl_acyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_nhead = {0}",  dkl.dkl_nhead);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_nsect = {0}",  dkl.dkl_nsect);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_bhead = {0}",  dkl.dkl_bhead);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_ppart = {0}",  dkl.dkl_ppart);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_rpm = {0}",    dkl.dkl_rpm);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_pcyl = {0}",   dkl.dkl_pcyl);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_apc = {0}",    dkl.dkl_apc);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_gap1 = {0}",   dkl.dkl_gap1);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_gap2 = {0}",   dkl.dkl_gap2);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_intrlv = {0}", dkl.dkl_intrlv);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_ncyl = {0}",   dkl.dkl_ncyl);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_acyl = {0}",   dkl.dkl_acyl);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_nhead = {0}",  dkl.dkl_nhead);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_nsect = {0}",  dkl.dkl_nsect);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_bhead = {0}",  dkl.dkl_bhead);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_ppart = {0}",  dkl.dkl_ppart);
 
             for(int i = 0; i < NDKMAP; i++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl.dkl_map[{0}].dkl_cylno = {1}",
                                            i,
                                            dkl.dkl_map[i].dkl_cylno);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_map[{0}].dkl_nblk = {1}", i, dkl.dkl_map[i].dkl_nblk);
+                AaruConsole.Debug(MODULE_NAME, "dkl.dkl_map[{0}].dkl_nblk = {1}", i, dkl.dkl_map[i].dkl_nblk);
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl.dkl_cksum = 0x{0:X4}", dkl.dkl_cksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "sectorsPerCylinder = {0}", sectorsPerCylinder);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
+            AaruConsole.Debug(MODULE_NAME, "dkl.dkl_cksum = 0x{0:X4}", dkl.dkl_cksum);
+            AaruConsole.Debug(MODULE_NAME, "sectorsPerCylinder = {0}", sectorsPerCylinder);
 
             for(int i = 0; i < NDKMAP; i++)
             {
@@ -216,66 +216,66 @@ public sealed class SunDisklabel : IPartition
         {
             ulong sectorsPerCylinder = (ulong)(dkl8.dkl_nsect * dkl8.dkl_nhead);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dkl8.dkl_asciilabel = \"{0}\"",
                                        StringHandlers.CToString(dkl8.dkl_asciilabel));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_vtoc.v_version = {0}", dkl8.dkl_vtoc.v_version);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_version = {0}", dkl8.dkl_vtoc.v_version);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dkl8.dkl_vtoc.v_volume = \"{0}\"",
                                        StringHandlers.CToString(dkl8.dkl_vtoc.v_volume));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_vtoc.v_nparts = {0}",      dkl8.dkl_vtoc.v_nparts);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_write_reinstruct = {0}",   dkl8.dkl_write_reinstruct);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_read_reinstruct = {0}",    dkl8.dkl_read_reinstruct);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_rpm = {0}",                dkl8.dkl_rpm);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_pcyl = {0}",               dkl8.dkl_pcyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_apc = {0}",                dkl8.dkl_apc);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_obs1 = {0}",               dkl8.dkl_obs1);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_obs2 = {0}",               dkl8.dkl_obs2);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_intrlv = {0}",             dkl8.dkl_intrlv);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_ncyl = {0}",               dkl8.dkl_ncyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_acyl = {0}",               dkl8.dkl_acyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_nhead = {0}",              dkl8.dkl_nhead);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_nsect = {0}",              dkl8.dkl_nsect);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_obs3 = {0}",               dkl8.dkl_obs3);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_obs4 = {0}",               dkl8.dkl_obs4);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_nparts = {0}",      dkl8.dkl_vtoc.v_nparts);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_write_reinstruct = {0}",   dkl8.dkl_write_reinstruct);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_read_reinstruct = {0}",    dkl8.dkl_read_reinstruct);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_rpm = {0}",                dkl8.dkl_rpm);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_pcyl = {0}",               dkl8.dkl_pcyl);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_apc = {0}",                dkl8.dkl_apc);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_obs1 = {0}",               dkl8.dkl_obs1);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_obs2 = {0}",               dkl8.dkl_obs2);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_intrlv = {0}",             dkl8.dkl_intrlv);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_ncyl = {0}",               dkl8.dkl_ncyl);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_acyl = {0}",               dkl8.dkl_acyl);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_nhead = {0}",              dkl8.dkl_nhead);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_nsect = {0}",              dkl8.dkl_nsect);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_obs3 = {0}",               dkl8.dkl_obs3);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_obs4 = {0}",               dkl8.dkl_obs4);
 
             for(int i = 0; i < NDKMAP; i++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl8.dkl_map[{0}].dkl_cylno = {1}",
                                            i,
                                            dkl8.dkl_map[i].dkl_cylno);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl8.dkl_map[{0}].dkl_nblk = {1}",
                                            i,
                                            dkl8.dkl_map[i].dkl_nblk);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl8.dkl_vtoc.v_part[{0}].p_tag = {1} ({2})",
                                            i,
                                            dkl8.dkl_vtoc.v_part[i].p_tag,
                                            (ushort)dkl8.dkl_vtoc.v_part[i].p_tag);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl8.dkl_vtoc.v_part[{0}].p_flag = {1} ({2})",
                                            i,
                                            dkl8.dkl_vtoc.v_part[i].p_flag,
                                            (ushort)dkl8.dkl_vtoc.v_part[i].p_flag);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl8.dkl_vtoc.v_timestamp[{0}] = {1}",
                                            i,
                                            DateHandlers.UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i]));
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_magic = 0x{0:X4}", dkl8.dkl_magic);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl8.dkl_cksum = 0x{0:X4}", dkl8.dkl_cksum);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "sectorsPerCylinder = {0}",  sectorsPerCylinder);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_magic = 0x{0:X4}", dkl8.dkl_magic);
+            AaruConsole.Debug(MODULE_NAME, "dkl8.dkl_cksum = 0x{0:X4}", dkl8.dkl_cksum);
+            AaruConsole.Debug(MODULE_NAME, "sectorsPerCylinder = {0}",  sectorsPerCylinder);
 
             if(dkl8.dkl_vtoc.v_nparts > NDKMAP) return false;
 
@@ -313,67 +313,67 @@ public sealed class SunDisklabel : IPartition
         }
         else
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_vtoc.v_version = {0}",     dkl16.dkl_vtoc.v_version);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_version = {0}",     dkl16.dkl_vtoc.v_version);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dkl16.dkl_vtoc.v_volume = \"{0}\"",
                                        StringHandlers.CToString(dkl16.dkl_vtoc.v_volume));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_vtoc.v_sectorsz = {0}", dkl16.dkl_vtoc.v_sectorsz);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_vtoc.v_nparts = {0}",   dkl16.dkl_vtoc.v_nparts);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_sectorsz = {0}", dkl16.dkl_vtoc.v_sectorsz);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_vtoc.v_nparts = {0}",   dkl16.dkl_vtoc.v_nparts);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "dkl16.dkl_vtoc.v_asciilabel = \"{0}\"",
                                        StringHandlers.CToString(dkl16.dkl_vtoc.v_asciilabel));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_pcyl = {0}",   dkl16.dkl_pcyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_ncyl = {0}",   dkl16.dkl_ncyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_acyl = {0}",   dkl16.dkl_acyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_bcyl = {0}",   dkl16.dkl_bcyl);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_nhead = {0}",  dkl16.dkl_nhead);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_nsect = {0}",  dkl16.dkl_nsect);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_intrlv = {0}", dkl16.dkl_intrlv);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_skew = {0}",   dkl16.dkl_skew);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_apc = {0}",    dkl16.dkl_apc);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_rpm = {0}",    dkl16.dkl_rpm);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_pcyl = {0}",   dkl16.dkl_pcyl);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_ncyl = {0}",   dkl16.dkl_ncyl);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_acyl = {0}",   dkl16.dkl_acyl);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_bcyl = {0}",   dkl16.dkl_bcyl);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_nhead = {0}",  dkl16.dkl_nhead);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_nsect = {0}",  dkl16.dkl_nsect);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_intrlv = {0}", dkl16.dkl_intrlv);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_skew = {0}",   dkl16.dkl_skew);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_apc = {0}",    dkl16.dkl_apc);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_rpm = {0}",    dkl16.dkl_rpm);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_write_reinstruct = {0}", dkl16.dkl_write_reinstruct);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_write_reinstruct = {0}", dkl16.dkl_write_reinstruct);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_read_reinstruct = {0}", dkl16.dkl_read_reinstruct);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_read_reinstruct = {0}", dkl16.dkl_read_reinstruct);
 
             for(int i = 0; i < NDKMAP16; i++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl16.dkl_vtoc.v_part[{0}].p_start = {1}",
                                            i,
                                            dkl16.dkl_vtoc.v_part[i].p_start);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl16.dkl_vtoc.v_part[{0}].p_size = {1}",
                                            i,
                                            dkl16.dkl_vtoc.v_part[i].p_size);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl16.dkl_vtoc.v_part[{0}].p_tag = {1} ({2})",
                                            i,
                                            dkl16.dkl_vtoc.v_part[i].p_tag,
                                            (ushort)dkl16.dkl_vtoc.v_part[i].p_tag);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl16.dkl_vtoc.v_part[{0}].p_flag = {1} ({2})",
                                            i,
                                            dkl16.dkl_vtoc.v_part[i].p_flag,
                                            (ushort)dkl16.dkl_vtoc.v_part[i].p_flag);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "dkl16.dkl_vtoc.v_timestamp[{0}] = {1}",
                                            i,
                                            DateHandlers.UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i]));
             }
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_magic = 0x{0:X4}", dkl16.dkl_magic);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "dkl16.dkl_cksum = 0x{0:X4}", dkl16.dkl_cksum);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_magic = 0x{0:X4}", dkl16.dkl_magic);
+            AaruConsole.Debug(MODULE_NAME, "dkl16.dkl_cksum = 0x{0:X4}", dkl16.dkl_cksum);
 
             if(dkl16.dkl_vtoc.v_nparts > NDKMAP16) return false;
 
@@ -420,7 +420,7 @@ public sealed class SunDisklabel : IPartition
 
     static dk_label SwapDiskLabel(dk_label label)
     {
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Swapping_dk_label);
+        AaruConsole.Debug(MODULE_NAME, Localization.Swapping_dk_label);
         label = (dk_label)Marshal.SwapStructureMembersEndian(label);
 
         for(int i = 0; i < label.dkl_map.Length; i++)
@@ -431,7 +431,7 @@ public sealed class SunDisklabel : IPartition
 
     static dk_label8 SwapDiskLabel(dk_label8 label)
     {
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Swapping_dk_label8);
+        AaruConsole.Debug(MODULE_NAME, Localization.Swapping_dk_label8);
         label = (dk_label8)Marshal.SwapStructureMembersEndian(label);
 
         for(int i = 0; i < label.dkl_map.Length; i++)
@@ -457,7 +457,7 @@ public sealed class SunDisklabel : IPartition
 
     static dk_label16 SwapDiskLabel(dk_label16 label)
     {
-        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Swapping_dk_label16);
+        AaruConsole.Debug(MODULE_NAME, Localization.Swapping_dk_label16);
         label = (dk_label16)Marshal.SwapStructureMembersEndian(label);
 
         for(int i = 0; i < label.dkl_vtoc.v_bootinfo.Length; i++)
diff --git a/Aaru.Partitions/VTOC.cs b/Aaru.Partitions/VTOC.cs
index e9f5c6f60..1960fc948 100644
--- a/Aaru.Partitions/VTOC.cs
+++ b/Aaru.Partitions/VTOC.cs
@@ -91,7 +91,7 @@ public sealed class VTOC : IPartition
 
             magic = BitConverter.ToUInt32(pdsector, 4);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.sanity_at_0_is_1_X8_should_be_2_X8_or_3_X8,
                                        i + sectorOffset,
                                        magic,
@@ -122,49 +122,49 @@ public sealed class VTOC : IPartition
             pdold = Marshal.ByteArrayToStructureBigEndian<PDInfoOld>(pdsector);
         }
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.driveid = {0}", pd.driveid);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.driveid = {0}", pd.driveid);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.sanity = 0x{0:X8} (should be 0x{1:X8})", pd.sanity, PD_MAGIC);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.sanity = 0x{0:X8} (should be 0x{1:X8})", pd.sanity, PD_MAGIC);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.version = {0}",    pd.version);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.serial = \"{0}\"", StringHandlers.CToString(pd.serial));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.cyls = {0}",       pd.cyls);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.tracks = {0}",     pd.tracks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.sectors = {0}",    pd.sectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.bytes = {0}",      pd.bytes);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.logicalst = {0}",  pd.logicalst);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.errlogst = {0}",   pd.errlogst);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.errlogsz = {0}",   pd.errlogsz);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.mfgst = {0}",      pd.mfgst);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.mfgsz = {0}",      pd.mfgsz);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.defectst = {0}",   pd.defectst);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.defectsz = {0}",   pd.defectsz);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.relno = {0}",      pd.relno);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.relst = {0}",      pd.relst);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.relsz = {0}",      pd.relsz);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.relnext = {0}",    pd.relnext);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.allcstrt = {0}",   pdold.allcstrt);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.allcend = {0}",    pdold.allcend);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.vtoc_ptr = {0}",   pd.vtoc_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.vtoc_len = {0}",   pd.vtoc_len);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.vtoc_pad = {0}",   pd.vtoc_pad);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.alt_ptr = {0}",    pd.alt_ptr);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.alt_len = {0}",    pd.alt_len);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.pcyls = {0}",      pd.pcyls);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.ptracks = {0}",    pd.ptracks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.psectors = {0}",   pd.psectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.pbytes = {0}",     pd.pbytes);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.secovhd = {0}",    pd.secovhd);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.interleave = {0}", pd.interleave);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.skew = {0}",       pd.skew);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.pad[0] = {0}",     pd.pad[0]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.pad[1] = {0}",     pd.pad[1]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.pad[2] = {0}",     pd.pad[2]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.pad[3] = {0}",     pd.pad[3]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.pad[4] = {0}",     pd.pad[4]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.pad[5] = {0}",     pd.pad[5]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.pad[6] = {0}",     pd.pad[6]);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "pdinfo.pad[7] = {0}",     pd.pad[7]);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.version = {0}",    pd.version);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.serial = \"{0}\"", StringHandlers.CToString(pd.serial));
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.cyls = {0}",       pd.cyls);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.tracks = {0}",     pd.tracks);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.sectors = {0}",    pd.sectors);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.bytes = {0}",      pd.bytes);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.logicalst = {0}",  pd.logicalst);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.errlogst = {0}",   pd.errlogst);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.errlogsz = {0}",   pd.errlogsz);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.mfgst = {0}",      pd.mfgst);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.mfgsz = {0}",      pd.mfgsz);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.defectst = {0}",   pd.defectst);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.defectsz = {0}",   pd.defectsz);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.relno = {0}",      pd.relno);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.relst = {0}",      pd.relst);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.relsz = {0}",      pd.relsz);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.relnext = {0}",    pd.relnext);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.allcstrt = {0}",   pdold.allcstrt);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.allcend = {0}",    pdold.allcend);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.vtoc_ptr = {0}",   pd.vtoc_ptr);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.vtoc_len = {0}",   pd.vtoc_len);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.vtoc_pad = {0}",   pd.vtoc_pad);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.alt_ptr = {0}",    pd.alt_ptr);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.alt_len = {0}",    pd.alt_len);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.pcyls = {0}",      pd.pcyls);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.ptracks = {0}",    pd.ptracks);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.psectors = {0}",   pd.psectors);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.pbytes = {0}",     pd.pbytes);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.secovhd = {0}",    pd.secovhd);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.interleave = {0}", pd.interleave);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.skew = {0}",       pd.skew);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[0] = {0}",     pd.pad[0]);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[1] = {0}",     pd.pad[1]);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[2] = {0}",     pd.pad[2]);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[3] = {0}",     pd.pad[3]);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[4] = {0}",     pd.pad[4]);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[5] = {0}",     pd.pad[5]);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[6] = {0}",     pd.pad[6]);
+        AaruConsole.Debug(MODULE_NAME, "pdinfo.pad[7] = {0}",     pd.pad[7]);
 
         magicFound = false;
         bool useOld = false;
@@ -179,7 +179,7 @@ public sealed class VTOC : IPartition
         if(magic is VTOC_SANE or VTOC_ENAS)
         {
             magicFound = true;
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.New_VTOC_found_at_0, pdloc + sectorOffset + 1);
+            AaruConsole.Debug(MODULE_NAME, Localization.New_VTOC_found_at_0, pdloc + sectorOffset + 1);
 
             if(magic == VTOC_SANE)
                 vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(vtocsector);
@@ -206,7 +206,7 @@ public sealed class VTOC : IPartition
             {
                 magicFound = true;
                 useOld     = true;
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Old_VTOC_found_at_0, pdloc + sectorOffset + 1);
+                AaruConsole.Debug(MODULE_NAME, Localization.Old_VTOC_found_at_0, pdloc + sectorOffset + 1);
 
                 if(magic == VTOC_SANE)
                     vtocOld = Marshal.ByteArrayToStructureLittleEndian<VTocOld>(vtocsector);
@@ -228,14 +228,14 @@ public sealed class VTOC : IPartition
 
         if(!magicFound)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Searching_for_VTOC_on_relative_byte_0, pd.vtoc_ptr);
+            AaruConsole.Debug(MODULE_NAME, Localization.Searching_for_VTOC_on_relative_byte_0, pd.vtoc_ptr);
             ulong relSecPtr = pd.vtoc_ptr               / imagePlugin.Info.SectorSize;
             uint  relSecOff = pd.vtoc_ptr               % imagePlugin.Info.SectorSize;
             uint  secCount  = (relSecOff + pd.vtoc_len) / imagePlugin.Info.SectorSize;
 
             if((relSecOff + pd.vtoc_len) % imagePlugin.Info.SectorSize > 0) secCount++;
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        Localization.Going_to_read_0_sectors_from_sector_1_getting_VTOC_from_byte_2,
                                        secCount,
                                        relSecPtr + sectorOffset,
@@ -243,7 +243,7 @@ public sealed class VTOC : IPartition
 
             if(relSecPtr + sectorOffset + secCount >= imagePlugin.Info.Sectors)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Going_to_read_past_device_size_aborting);
+                AaruConsole.Debug(MODULE_NAME, Localization.Going_to_read_past_device_size_aborting);
 
                 return false;
             }
@@ -259,7 +259,7 @@ public sealed class VTOC : IPartition
             if(magic is VTOC_SANE or VTOC_ENAS)
             {
                 magicFound = true;
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.New_VTOC_found);
+                AaruConsole.Debug(MODULE_NAME, Localization.New_VTOC_found);
 
                 if(magic == VTOC_SANE)
                     vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(vtocsector);
@@ -281,52 +281,52 @@ public sealed class VTOC : IPartition
 
         if(!magicFound)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Cannot_find_VTOC);
+            AaruConsole.Debug(MODULE_NAME, Localization.Cannot_find_VTOC);
 
             return false;
         }
 
         if(useOld)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "vtocOld.v_sanity = 0x{0:X8} (should be 0x{1:X8})",
                                        vtocOld.v_sanity,
                                        VTOC_SANE);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "vtocOld.v_version = {0}", vtocOld.v_version);
+            AaruConsole.Debug(MODULE_NAME, "vtocOld.v_version = {0}", vtocOld.v_version);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "vtocOld.v_volume = \"{0}\"",
                                        StringHandlers.CToString(vtocOld.v_volume));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "vtocOld.v_sectorsz = {0}", vtocOld.v_sectorsz);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "vtocOld.v_nparts = {0}",   vtocOld.v_nparts);
+            AaruConsole.Debug(MODULE_NAME, "vtocOld.v_sectorsz = {0}", vtocOld.v_sectorsz);
+            AaruConsole.Debug(MODULE_NAME, "vtocOld.v_nparts = {0}",   vtocOld.v_nparts);
 
             for(int i = 0; i < V_NUMPAR; i++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vtocOld.v_part[{0}].p_tag = {1} ({2})",
                                            i,
                                            vtocOld.v_part[i].p_tag,
                                            (ushort)vtocOld.v_part[i].p_tag);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vtocOld.v_part[{0}].p_flag = {1} ({2})",
                                            i,
                                            vtocOld.v_part[i].p_flag,
                                            (ushort)vtocOld.v_part[i].p_flag);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vtocOld.v_part[{0}].p_start = {1}",
                                            i,
                                            vtocOld.v_part[i].p_start);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vtocOld.v_part[{0}].p_size = {1}",
                                            i,
                                            vtocOld.v_part[i].p_size);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vtocOld.timestamp[{0}] = {1}",
                                            i,
                                            DateHandlers.UnixToDateTime(vtocOld.timestamp[i]));
@@ -334,37 +334,37 @@ public sealed class VTOC : IPartition
         }
         else
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME,
+            AaruConsole.Debug(MODULE_NAME,
                                        "vtoc.v_sanity = 0x{0:X8} (should be 0x{1:X8})",
                                        vtoc.v_sanity,
                                        VTOC_SANE);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "vtoc.v_version = {0}", vtoc.v_version);
+            AaruConsole.Debug(MODULE_NAME, "vtoc.v_version = {0}", vtoc.v_version);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "vtoc.v_volume = \"{0}\"", StringHandlers.CToString(vtoc.v_volume));
+            AaruConsole.Debug(MODULE_NAME, "vtoc.v_volume = \"{0}\"", StringHandlers.CToString(vtoc.v_volume));
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, "vtoc.v_pad = {0}",    vtoc.v_pad);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "vtoc.v_nparts = {0}", vtoc.v_nparts);
+            AaruConsole.Debug(MODULE_NAME, "vtoc.v_pad = {0}",    vtoc.v_pad);
+            AaruConsole.Debug(MODULE_NAME, "vtoc.v_nparts = {0}", vtoc.v_nparts);
 
             for(int i = 0; i < V_NUMPAR; i++)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vtoc.v_part[{0}].p_tag = {1} ({2})",
                                            i,
                                            vtoc.v_part[i].p_tag,
                                            (ushort)vtoc.v_part[i].p_tag);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vtoc.v_part[{0}].p_flag = {1} ({2})",
                                            i,
                                            vtoc.v_part[i].p_flag,
                                            (ushort)vtoc.v_part[i].p_flag);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vtoc.v_part[{0}].p_start = {1}", i, vtoc.v_part[i].p_start);
+                AaruConsole.Debug(MODULE_NAME, "vtoc.v_part[{0}].p_start = {1}", i, vtoc.v_part[i].p_start);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, "vtoc.v_part[{0}].p_size = {1}", i, vtoc.v_part[i].p_size);
+                AaruConsole.Debug(MODULE_NAME, "vtoc.v_part[{0}].p_size = {1}", i, vtoc.v_part[i].p_size);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            "vtoc.timestamp[{0}] = {1}",
                                            i,
                                            DateHandlers.UnixToDateTime(vtoc.timestamp[i]));
diff --git a/Aaru.Partitions/XENIX.cs b/Aaru.Partitions/XENIX.cs
index a36c75711..adca74e33 100644
--- a/Aaru.Partitions/XENIX.cs
+++ b/Aaru.Partitions/XENIX.cs
@@ -77,7 +77,7 @@ public sealed class XENIX : IPartition
 
         Partable xnxtbl = Marshal.ByteArrayToStructureLittleEndian<Partable>(tblsector);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "xnxtbl.p_magic = 0x{0:X4} (should be 0x{1:X4})",
                                    xnxtbl.p_magic,
                                    PAMAGIC);
@@ -86,8 +86,8 @@ public sealed class XENIX : IPartition
 
         for(int i = 0; i < MAXPARTS; i++)
         {
-            AaruConsole.DebugWriteLine(MODULE_NAME, "xnxtbl.p[{0}].p_off = {1}",  i, xnxtbl.p[i].p_off);
-            AaruConsole.DebugWriteLine(MODULE_NAME, "xnxtbl.p[{0}].p_size = {1}", i, xnxtbl.p[i].p_size);
+            AaruConsole.Debug(MODULE_NAME, "xnxtbl.p[{0}].p_off = {1}",  i, xnxtbl.p[i].p_off);
+            AaruConsole.Debug(MODULE_NAME, "xnxtbl.p[{0}].p_size = {1}", i, xnxtbl.p[i].p_size);
 
             if(xnxtbl.p[i].p_size <= 0) continue;
 
diff --git a/Aaru.Tests.Devices/Main.cs b/Aaru.Tests.Devices/Main.cs
index a59ef5d95..bd1369ef8 100644
--- a/Aaru.Tests.Devices/Main.cs
+++ b/Aaru.Tests.Devices/Main.cs
@@ -39,9 +39,9 @@ static partial class MainClass
     {
         AaruConsole.WriteLineEvent        += Console.WriteLine;
         AaruConsole.WriteEvent            += Console.Write;
-        AaruConsole.ErrorWriteLineEvent   += Console.Error.WriteLine;
-        AaruConsole.DebugWriteLineEvent   += Console.Error.WriteLine;
-        AaruConsole.VerboseWriteLineEvent += Console.WriteLine;
+        AaruConsole.ErrorEvent   += Console.Error.WriteLine;
+        AaruConsole.DebugEvent   += Console.Error.WriteLine;
+        AaruConsole.VerboseEvent += Console.WriteLine;
         AaruConsole.WriteExceptionEvent   += Console.Error.WriteLine;
 
         DeviceInfo[] devices = Aaru.Devices.Device.ListDevices();
diff --git a/Aaru/Commands/Archive/Extract.cs b/Aaru/Commands/Archive/Extract.cs
index 39ffa31e0..e4c078c86 100644
--- a/Aaru/Commands/Archive/Extract.cs
+++ b/Aaru/Commands/Archive/Extract.cs
@@ -60,12 +60,12 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
 
         Statistics.AddCommand("archive-extract");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",    settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--encoding={0}", Markup.Escape(settings.Encoding  ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",    Markup.Escape(settings.Path      ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--output={0}",   Markup.Escape(settings.OutputDir ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",  settings.Verbose);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--xattrs={0}",   settings.XAttrs);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",    settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--encoding={0}", Markup.Escape(settings.Encoding  ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",    Markup.Escape(settings.Path      ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--output={0}",   Markup.Escape(settings.OutputDir ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",  settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--xattrs={0}",   settings.XAttrs);
 
         IFilter inputFilter = null;
 
@@ -77,7 +77,7 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -90,11 +90,11 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
             {
                 encodingClass = Claunia.Encoding.Encoding.GetEncoding(settings.Encoding);
 
-                if(settings.Verbose) AaruConsole.VerboseWriteLine(UI.encoding_for_0, encodingClass.EncodingName);
+                if(settings.Verbose) AaruConsole.Verbose(UI.encoding_for_0, encodingClass.EncodingName);
             }
             catch(ArgumentException)
             {
-                AaruConsole.ErrorWriteLine(UI.Specified_encoding_is_not_supported);
+                AaruConsole.Error(UI.Specified_encoding_is_not_supported);
 
                 return (int)ErrorNumber.EncodingUnknown;
             }
@@ -118,7 +118,7 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
             }
 
             if(settings.Verbose)
-                AaruConsole.VerboseWriteLine(UI.Archive_format_identified_by_0_1, archive.Name, archive.Id);
+                AaruConsole.Verbose(UI.Archive_format_identified_by_0_1, archive.Name, archive.Id);
             else
                 AaruConsole.WriteLine(UI.Archive_format_identified_by_0, archive.Name);
 
@@ -134,13 +134,13 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
 
                 if(opened != ErrorNumber.NoError)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Unable_to_open_archive_format);
-                    AaruConsole.ErrorWriteLine(Localization.Core.Error_0, opened);
+                    AaruConsole.Error(UI.Unable_to_open_archive_format);
+                    AaruConsole.Error(Localization.Core.Error_0, opened);
 
                     return (int)opened;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, UI.Correctly_opened_archive_file);
+                AaruConsole.Debug(MODULE_NAME, UI.Correctly_opened_archive_file);
 
                 // TODO: Implement
                 //Statistics.AddArchiveFormat(archive.Name);
@@ -148,9 +148,9 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
             }
             catch(Exception ex)
             {
-                AaruConsole.ErrorWriteLine(UI.Unable_to_open_archive_format);
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
-                AaruConsole.WriteException(ex);
+                AaruConsole.Error(UI.Unable_to_open_archive_format);
+                AaruConsole.Error(Localization.Core.Error_0, ex.Message);
+                AaruConsole.Exception(ex);
 
                 return (int)ErrorNumber.CannotOpenFormat;
             }
@@ -162,7 +162,7 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
 
                 if(errno != ErrorNumber.NoError)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Error_0_getting_filename_for_archive_entry_1, errno, i);
+                    AaruConsole.Error(UI.Error_0_getting_filename_for_archive_entry_1, errno, i);
 
                     continue;
                 }
@@ -171,7 +171,7 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
 
                 if(errno != ErrorNumber.NoError)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Error_0_retrieving_stat_for_archive_entry_1, errno, i);
+                    AaruConsole.Error(UI.Error_0_retrieving_stat_for_archive_entry_1, errno, i);
 
                     continue;
                 }
@@ -180,7 +180,7 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
 
                 if(errno != ErrorNumber.NoError)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Error_0_getting_uncompressed_size_for_archive_entry_1, errno, i);
+                    AaruConsole.Error(UI.Error_0_getting_uncompressed_size_for_archive_entry_1, errno, i);
 
                     continue;
                 }
@@ -189,7 +189,7 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
 
                 if(errno != ErrorNumber.NoError)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Error_0_getting_filter_for_archive_entry_1, errno, i);
+                    AaruConsole.Error(UI.Error_0_getting_filter_for_archive_entry_1, errno, i);
 
                     continue;
                 }
@@ -214,7 +214,7 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
 
                 if(File.Exists(destinationDir))
                 {
-                    AaruConsole.ErrorWriteLine(UI.Cannot_write_file_0_output_exists, Markup.Escape(fileName));
+                    AaruConsole.Error(UI.Cannot_write_file_0_output_exists, Markup.Escape(fileName));
 
                     continue;
                 }
@@ -300,7 +300,7 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
                                           Markup.Escape(outputPath));
                 }
                 else
-                    AaruConsole.ErrorWriteLine(UI.Cannot_write_file_0_output_exists, Markup.Escape(fileName));
+                    AaruConsole.Error(UI.Cannot_write_file_0_output_exists, Markup.Escape(fileName));
 
                 if(!settings.XAttrs) continue;
 
@@ -308,7 +308,7 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
 
                 if(errno != ErrorNumber.NoError)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Error_0_listing_extended_attributes_for_archive_entry_1, errno, i);
+                    AaruConsole.Error(UI.Error_0_listing_extended_attributes_for_archive_entry_1, errno, i);
 
                     continue;
                 }
@@ -325,7 +325,7 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
 
                     if(errno != ErrorNumber.NoError)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                        AaruConsole.Debug(MODULE_NAME,
                                                    UI.Error_0_reading_extended_attribute_1_for_archive_entry_2,
                                                    errno,
                                                    xattrName,
@@ -400,14 +400,14 @@ sealed class ArchiveExtractCommand : Command<ArchiveExtractCommand.Settings>
                         });
                     }
                     else
-                        AaruConsole.ErrorWriteLine(UI.Cannot_write_file_0_output_exists, Markup.Escape(fileName));
+                        AaruConsole.Error(UI.Cannot_write_file_0_output_exists, Markup.Escape(fileName));
                 }
             }
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
+            AaruConsole.Exception(ex);
 
             return (int)ErrorNumber.UnexpectedException;
         }
diff --git a/Aaru/Commands/Archive/Info.cs b/Aaru/Commands/Archive/Info.cs
index 824fda992..d0ca6d8fa 100644
--- a/Aaru/Commands/Archive/Info.cs
+++ b/Aaru/Commands/Archive/Info.cs
@@ -55,10 +55,10 @@ sealed class ArchiveInfoCommand : Command<ArchiveInfoCommand.Settings>
 
         Statistics.AddCommand("archive-info");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "debug={0}",    settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "input={0}",    Markup.Escape(settings.Path ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "verbose={0}",  settings.Verbose);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "encoding={0}", Markup.Escape(settings.Encoding ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "debug={0}",    settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "input={0}",    Markup.Escape(settings.Path ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "verbose={0}",  settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "encoding={0}", Markup.Escape(settings.Encoding ?? ""));
 
         IFilter inputFilter = null;
 
@@ -70,7 +70,7 @@ sealed class ArchiveInfoCommand : Command<ArchiveInfoCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -83,11 +83,11 @@ sealed class ArchiveInfoCommand : Command<ArchiveInfoCommand.Settings>
             {
                 encodingClass = Claunia.Encoding.Encoding.GetEncoding(settings.Encoding);
 
-                if(settings.Verbose) AaruConsole.VerboseWriteLine(UI.encoding_for_0, encodingClass.EncodingName);
+                if(settings.Verbose) AaruConsole.Verbose(UI.encoding_for_0, encodingClass.EncodingName);
             }
             catch(ArgumentException)
             {
-                AaruConsole.ErrorWriteLine(UI.Specified_encoding_is_not_supported);
+                AaruConsole.Error(UI.Specified_encoding_is_not_supported);
 
                 return (int)ErrorNumber.EncodingUnknown;
             }
@@ -127,17 +127,17 @@ sealed class ArchiveInfoCommand : Command<ArchiveInfoCommand.Settings>
             }
             catch(Exception ex)
             {
-                AaruConsole.ErrorWriteLine(UI.Unable_to_get_information_about_archive);
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
-                AaruConsole.WriteException(ex);
+                AaruConsole.Error(UI.Unable_to_get_information_about_archive);
+                AaruConsole.Error(Localization.Core.Error_0, ex.Message);
+                AaruConsole.Exception(ex);
 
                 return (int)ErrorNumber.CannotOpenFormat;
             }
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
+            AaruConsole.Exception(ex);
 
             return (int)ErrorNumber.UnexpectedException;
         }
diff --git a/Aaru/Commands/Archive/List.cs b/Aaru/Commands/Archive/List.cs
index 13580a3e6..23f2336aa 100644
--- a/Aaru/Commands/Archive/List.cs
+++ b/Aaru/Commands/Archive/List.cs
@@ -53,11 +53,11 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
     {
         MainClass.PrintCopyright();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",       settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--encoding={0}",    Markup.Escape(settings.Encoding ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--long-format={0}", settings.LongFormat);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",       Markup.Escape(settings.Path ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",     settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",       settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--encoding={0}",    Markup.Escape(settings.Encoding ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--long-format={0}", settings.LongFormat);
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",       Markup.Escape(settings.Path ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",     settings.Verbose);
         Statistics.AddCommand("archive-list");
 
         IFilter inputFilter = null;
@@ -70,7 +70,7 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -83,11 +83,11 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
             {
                 encodingClass = Claunia.Encoding.Encoding.GetEncoding(settings.Encoding);
 
-                if(settings.Verbose) AaruConsole.VerboseWriteLine(UI.encoding_for_0, encodingClass.EncodingName);
+                if(settings.Verbose) AaruConsole.Verbose(UI.encoding_for_0, encodingClass.EncodingName);
             }
             catch(ArgumentException)
             {
-                AaruConsole.ErrorWriteLine(UI.Specified_encoding_is_not_supported);
+                AaruConsole.Error(UI.Specified_encoding_is_not_supported);
 
                 return (int)ErrorNumber.EncodingUnknown;
             }
@@ -113,7 +113,7 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
             }
 
             if(settings.Verbose)
-                AaruConsole.VerboseWriteLine(UI.Archive_format_identified_by_0_1, archive.Name, archive.Id);
+                AaruConsole.Verbose(UI.Archive_format_identified_by_0_1, archive.Name, archive.Id);
             else
                 AaruConsole.WriteLine(UI.Archive_format_identified_by_0, archive.Name);
 
@@ -129,13 +129,13 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
 
                 if(opened != ErrorNumber.NoError)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Unable_to_open_archive_format);
-                    AaruConsole.ErrorWriteLine(Localization.Core.Error_0, opened);
+                    AaruConsole.Error(UI.Unable_to_open_archive_format);
+                    AaruConsole.Error(Localization.Core.Error_0, opened);
 
                     return (int)opened;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, UI.Correctly_opened_archive_file);
+                AaruConsole.Debug(MODULE_NAME, UI.Correctly_opened_archive_file);
 
                 // TODO: Implement
                 //Statistics.AddArchiveFormat(archive.Name);
@@ -143,9 +143,9 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
             }
             catch(Exception ex)
             {
-                AaruConsole.ErrorWriteLine(UI.Unable_to_open_archive_format);
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
-                AaruConsole.WriteException(ex);
+                AaruConsole.Error(UI.Unable_to_open_archive_format);
+                AaruConsole.Error(Localization.Core.Error_0, ex.Message);
+                AaruConsole.Exception(ex);
 
                 return (int)ErrorNumber.CannotOpenFormat;
             }
@@ -159,7 +159,7 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
                     // Ignore that file
                     if(errno != ErrorNumber.NoError)
                     {
-                        AaruConsole.ErrorWriteLine(UI.Error_0_getting_filename_for_archive_entry_1, errno, i);
+                        AaruConsole.Error(UI.Error_0_getting_filename_for_archive_entry_1, errno, i);
 
                         continue;
                     }
@@ -237,7 +237,7 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
 
                                 if(errno != ErrorNumber.NoError)
                                 {
-                                    AaruConsole.ErrorWriteLine(UI.Error_0_getting_filename_for_archive_entry_1,
+                                    AaruConsole.Error(UI.Error_0_getting_filename_for_archive_entry_1,
                                                                errno,
                                                                i);
 
@@ -248,7 +248,7 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
 
                                 if(errno != ErrorNumber.NoError)
                                 {
-                                    AaruConsole.ErrorWriteLine(UI.Error_0_retrieving_stat_for_archive_entry_1,
+                                    AaruConsole.Error(UI.Error_0_retrieving_stat_for_archive_entry_1,
                                                                errno,
                                                                i);
 
@@ -294,7 +294,7 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
 
                                 if(errno != ErrorNumber.NoError)
                                 {
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                UI.Error_0_getting_compressed_size_for_archive_entry_1,
                                                                errno,
                                                                i);
@@ -306,7 +306,7 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
 
                                 if(errno != ErrorNumber.NoError)
                                 {
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                UI.Error_0_getting_uncompressed_size_for_archive_entry_1,
                                                                errno,
                                                                i);
@@ -367,8 +367,8 @@ sealed class ArchiveListCommand : Command<ArchiveListCommand.Settings>
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
+            AaruConsole.Exception(ex);
 
             return (int)ErrorNumber.UnexpectedException;
         }
diff --git a/Aaru/Commands/Database/Update.cs b/Aaru/Commands/Database/Update.cs
index 709af3c93..205baf558 100644
--- a/Aaru/Commands/Database/Update.cs
+++ b/Aaru/Commands/Database/Update.cs
@@ -54,8 +54,8 @@ sealed class UpdateCommand : AsyncCommand<UpdateCommand.Settings>
     {
         MainClass.PrintCopyright();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
 
         if(settings.ClearAll)
         {
@@ -69,7 +69,7 @@ sealed class UpdateCommand : AsyncCommand<UpdateCommand.Settings>
             }
             catch(Exception) when(!Debugger.IsAttached)
             {
-                AaruConsole.ErrorWriteLine(UI.Could_not_remove_local_database);
+                AaruConsole.Error(UI.Could_not_remove_local_database);
 
                 return (int)ErrorNumber.CannotRemoveDatabase;
             }
@@ -83,7 +83,7 @@ sealed class UpdateCommand : AsyncCommand<UpdateCommand.Settings>
             }
             catch(Exception) when(!Debugger.IsAttached)
             {
-                AaruConsole.ErrorWriteLine(UI.Could_not_remove_main_database);
+                AaruConsole.Error(UI.Could_not_remove_main_database);
 
                 return (int)ErrorNumber.CannotRemoveDatabase;
             }
diff --git a/Aaru/Commands/Device/DeviceReport.cs b/Aaru/Commands/Device/DeviceReport.cs
index 9f78372e9..13b337876 100644
--- a/Aaru/Commands/Device/DeviceReport.cs
+++ b/Aaru/Commands/Device/DeviceReport.cs
@@ -66,9 +66,9 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
 
         Statistics.AddCommand("device-report");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--device={0}",  Markup.Escape(settings.Path ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--device={0}",  Markup.Escape(settings.Path ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
 
         string devicePath = settings.Path;
 
@@ -80,7 +80,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
         switch(dev)
         {
             case null:
-                AaruConsole.ErrorWriteLine(string.Format(UI.Could_not_open_device_error_0, devErrno));
+                AaruConsole.Error(string.Format(UI.Could_not_open_device_error_0, devErrno));
 
                 return (int)devErrno;
             case Devices.Remote.Device remoteDev:
@@ -95,7 +95,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
 
         if(dev.Error)
         {
-            AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
+            AaruConsole.Error(Error.Print(dev.LastError));
 
             return (int)ErrorNumber.CannotOpenDevice;
         }
@@ -106,9 +106,9 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
 
         if(!isAdmin)
         {
-            AaruConsole.ErrorWriteLine(UI.Device_report_must_be_run_as_admin);
+            AaruConsole.Error(UI.Device_report_must_be_run_as_admin);
 
-            AaruConsole.ErrorWriteLine(UI.Not_continuing);
+            AaruConsole.Error(UI.Not_continuing);
 
             return (int)ErrorNumber.NotPermitted;
         }
@@ -149,7 +149,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
 
         if(settings.TrapDisc && dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
         {
-            AaruConsole.ErrorWriteLine(UI.Device_does_not_report_with_trap_discs);
+            AaruConsole.Error(UI.Device_does_not_report_with_trap_discs);
 
             return (int)ErrorNumber.InvalidArgument;
         }
@@ -306,7 +306,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
                         break;
                     default:
                     {
-                        AaruConsole.ErrorWriteLine(UI.Unsupported_device_type_for_report);
+                        AaruConsole.Error(UI.Unsupported_device_type_for_report);
 
                         throw new IOException();
                     }
@@ -378,7 +378,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
                         {
                             if(iomegaRev)
                             {
-                                AaruConsole.ErrorWriteLine(UI.Device_does_not_report_with_trap_discs);
+                                AaruConsole.Error(UI.Device_does_not_report_with_trap_discs);
 
                                 return (int)ErrorNumber.InvalidArgument;
                             }
@@ -388,7 +388,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
 
                             if(!AnsiConsole.Confirm($"[italic]{UI.Do_you_have_audio_trap_disc}[/]"))
                             {
-                                AaruConsole.ErrorWriteLine(UI.Please_burn_audio_trap_disc);
+                                AaruConsole.Error(UI.Please_burn_audio_trap_disc);
 
                                 return (int)ErrorNumber.NoError;
                             }
@@ -762,7 +762,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
                                                                              break;
                                                                          }
                                                                          default:
-                                                                             AaruConsole.DebugWriteLine(MODULE_NAME,
+                                                                             AaruConsole.Debug(MODULE_NAME,
                                                                                  Localization.Core
                                                                                     .Device_not_ready_Sense,
                                                                                  decSense.Value.SenseKey,
@@ -776,7 +776,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
                                                                  }
                                                                  else
                                                                  {
-                                                                     AaruConsole.DebugWriteLine(MODULE_NAME,
+                                                                     AaruConsole.Debug(MODULE_NAME,
                                                                          Localization.Core
                                                                             .Got_sense_status_but_no_sense_buffer);
 
@@ -938,7 +938,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
                                                                  dev.Timeout,
                                                                  out _);
 
-                                                             AaruConsole.DebugWriteLine(MODULE_NAME,
+                                                             AaruConsole.Debug(MODULE_NAME,
                                                                  "sense = {0}",
                                                                  sense);
 
@@ -978,7 +978,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
                                                                          break;
                                                                      }
                                                                      default:
-                                                                         AaruConsole.DebugWriteLine(MODULE_NAME,
+                                                                         AaruConsole.Debug(MODULE_NAME,
                                                                              Localization.Core.Device_not_ready_Sense,
                                                                              decSense.Value.SenseKey,
                                                                              decSense.Value.ASC,
@@ -991,7 +991,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
                                                              }
                                                              else
                                                              {
-                                                                 AaruConsole.DebugWriteLine(MODULE_NAME,
+                                                                 AaruConsole.Debug(MODULE_NAME,
                                                                      Localization.Core
                                                                         .Got_sense_status_but_no_sense_buffer);
 
@@ -1091,7 +1091,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
                                                                          break;
                                                                      }
                                                                      default:
-                                                                         AaruConsole.DebugWriteLine(MODULE_NAME,
+                                                                         AaruConsole.Debug(MODULE_NAME,
                                                                              Localization.Core.Device_not_ready_Sense,
                                                                              decSense.Value.SenseKey,
                                                                              decSense.Value.ASC,
@@ -1104,7 +1104,7 @@ sealed class DeviceReportCommand : AsyncCommand<DeviceReportCommand.Settings>
                                                              }
                                                              else
                                                              {
-                                                                 AaruConsole.DebugWriteLine(MODULE_NAME,
+                                                                 AaruConsole.Debug(MODULE_NAME,
                                                                      Localization.Core
                                                                         .Got_sense_status_but_no_sense_buffer);
 
diff --git a/Aaru/Commands/Device/Info.cs b/Aaru/Commands/Device/Info.cs
index f1b3314a3..c6d7a8182 100644
--- a/Aaru/Commands/Device/Info.cs
+++ b/Aaru/Commands/Device/Info.cs
@@ -72,10 +72,10 @@ sealed class DeviceInfoCommand : Command<DeviceInfoCommand.Settings>
 
         Statistics.AddCommand("device-info");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",         settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--device={0}",        Markup.Escape(settings.Path         ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--output-prefix={0}", Markup.Escape(settings.OutputPrefix ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",       settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",         settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--device={0}",        Markup.Escape(settings.Path         ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--output-prefix={0}", Markup.Escape(settings.OutputPrefix ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",       settings.Verbose);
 
         string devicePath = settings.Path;
 
@@ -87,7 +87,7 @@ sealed class DeviceInfoCommand : Command<DeviceInfoCommand.Settings>
         switch(dev)
         {
             case null:
-                AaruConsole.ErrorWriteLine(string.Format(UI.Could_not_open_device_error_0, devErrno));
+                AaruConsole.Error(string.Format(UI.Could_not_open_device_error_0, devErrno));
 
                 return (int)devErrno;
             case Devices.Remote.Device remoteDev:
@@ -102,7 +102,7 @@ sealed class DeviceInfoCommand : Command<DeviceInfoCommand.Settings>
 
         if(dev.Error)
         {
-            AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
+            AaruConsole.Error(Error.Print(dev.LastError));
 
             return (int)ErrorNumber.CannotOpenDevice;
         }
@@ -219,13 +219,13 @@ sealed class DeviceInfoCommand : Command<DeviceInfoCommand.Settings>
                         case TupleCodes.CISTPL_SPCL:
                         case TupleCodes.CISTPL_SWIL:
                         case TupleCodes.CISTPL_VERS_2:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.Invoke_Found_undecoded_tuple_ID_0,
                                                        tuple.Code);
 
                             break;
                         default:
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.Found_unknown_tuple_ID_0,
                                                        (byte)tuple.Code);
 
@@ -234,7 +234,7 @@ sealed class DeviceInfoCommand : Command<DeviceInfoCommand.Settings>
                 }
             }
             else
-                AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Could_not_get_tuples);
+                AaruConsole.Debug(MODULE_NAME, Localization.Core.Could_not_get_tuples);
         }
 
         var devInfo = new DeviceInfo(dev);
@@ -613,7 +613,7 @@ sealed class DeviceInfoCommand : Command<DeviceInfoCommand.Settings>
                         {
                             if(page.Key == 0x00) continue;
 
-                            AaruConsole.DebugWriteLine(MODULE_NAME,
+                            AaruConsole.Debug(MODULE_NAME,
                                                        Localization.Core.Found_undecoded_SCSI_VPD_page_0,
                                                        page.Key);
 
@@ -664,11 +664,11 @@ sealed class DeviceInfoCommand : Command<DeviceInfoCommand.Settings>
 
                 Features.SeparatedFeatures ftr = Features.Separate(devInfo.MmcConfiguration);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Core.GET_CONFIGURATION_length_is_0,
                                            ftr.DataLength);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            Localization.Core.GET_CONFIGURATION_current_profile_is_0,
                                            ftr.CurrentProfile);
 
@@ -678,7 +678,7 @@ sealed class DeviceInfoCommand : Command<DeviceInfoCommand.Settings>
 
                     foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
                     {
-                        AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Core.Feature_0, desc.Code);
+                        AaruConsole.Debug(MODULE_NAME, Localization.Core.Feature_0, desc.Code);
 
                         switch(desc.Code)
                         {
@@ -923,7 +923,7 @@ sealed class DeviceInfoCommand : Command<DeviceInfoCommand.Settings>
                 }
                 else
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                    AaruConsole.Debug(MODULE_NAME,
                                                Localization.Core.GET_CONFIGURATION_returned_no_feature_descriptors);
                 }
             }
diff --git a/Aaru/Commands/Device/List.cs b/Aaru/Commands/Device/List.cs
index 5b787789e..052ce36fc 100644
--- a/Aaru/Commands/Device/List.cs
+++ b/Aaru/Commands/Device/List.cs
@@ -55,8 +55,8 @@ sealed class ListDevicesCommand : Command<ListDevicesCommand.Settings>
 
         Statistics.AddCommand("list-devices");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
 
         Log.Information(UI.List_devices_command);
 
diff --git a/Aaru/Commands/Filesystem/ExtractFiles.cs b/Aaru/Commands/Filesystem/ExtractFiles.cs
index 0acc6305d..de32764aa 100644
--- a/Aaru/Commands/Filesystem/ExtractFiles.cs
+++ b/Aaru/Commands/Filesystem/ExtractFiles.cs
@@ -61,13 +61,13 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
 
         Statistics.AddCommand("extract-files");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",    settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--encoding={0}", Markup.Escape(settings.Encoding  ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",    Markup.Escape(settings.ImagePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--options={0}",  Markup.Escape(settings.Options   ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--output={0}",   Markup.Escape(settings.OutputDir ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",  settings.Verbose);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--xattrs={0}",   settings.Xattrs);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",    settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--encoding={0}", Markup.Escape(settings.Encoding  ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",    Markup.Escape(settings.ImagePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--options={0}",  Markup.Escape(settings.Options   ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--output={0}",   Markup.Escape(settings.OutputDir ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",  settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--xattrs={0}",   settings.Xattrs);
 
         IFilter inputFilter = null;
 
@@ -78,16 +78,16 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
         });
 
         Dictionary<string, string> parsedOptions = Options.Parse(settings.Options);
-        AaruConsole.DebugWriteLine(MODULE_NAME, UI.Parsed_options);
+        AaruConsole.Debug(MODULE_NAME, UI.Parsed_options);
 
         foreach(KeyValuePair<string, string> parsedOption in parsedOptions)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "{0} = {1}", parsedOption.Key, parsedOption.Value);
+            AaruConsole.Debug(MODULE_NAME, "{0} = {1}", parsedOption.Key, parsedOption.Value);
 
         parsedOptions.Add("debug", settings.Debug.ToString());
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -100,11 +100,11 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
             {
                 encodingClass = Claunia.Encoding.Encoding.GetEncoding(settings.Encoding);
 
-                if(settings.Verbose) AaruConsole.VerboseWriteLine(UI.encoding_for_0, encodingClass.EncodingName);
+                if(settings.Verbose) AaruConsole.Verbose(UI.encoding_for_0, encodingClass.EncodingName);
             }
             catch(ArgumentException)
             {
-                AaruConsole.ErrorWriteLine(UI.Specified_encoding_is_not_supported);
+                AaruConsole.Error(UI.Specified_encoding_is_not_supported);
 
                 return (int)ErrorNumber.EncodingUnknown;
             }
@@ -139,7 +139,7 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
             }
 
             if(settings.Verbose)
-                AaruConsole.VerboseWriteLine(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
+                AaruConsole.Verbose(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
             else
                 AaruConsole.WriteLine(UI.Image_format_identified_by_0, imageFormat.Name);
 
@@ -152,7 +152,7 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
 
             if(Directory.Exists(settings.OutputDir) || File.Exists(settings.OutputDir))
             {
-                AaruConsole.ErrorWriteLine(UI.Destination_exists_aborting);
+                AaruConsole.Error(UI.Destination_exists_aborting);
 
                 return (int)ErrorNumber.FileExists;
             }
@@ -177,15 +177,15 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
                     return (int)opened;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, UI.Correctly_opened_image_file);
+                AaruConsole.Debug(MODULE_NAME, UI.Correctly_opened_image_file);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            UI.Image_without_headers_is_0_bytes,
                                            imageFormat.Info.ImageSize);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, UI.Image_has_0_sectors, imageFormat.Info.Sectors);
+                AaruConsole.Debug(MODULE_NAME, UI.Image_has_0_sectors, imageFormat.Info.Sectors);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            UI.Image_identifies_media_type_as_0,
                                            imageFormat.Info.MediaType);
 
@@ -195,9 +195,9 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
             }
             catch(Exception ex)
             {
-                AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
-                AaruConsole.WriteException(ex);
+                AaruConsole.Error(UI.Unable_to_open_image_format);
+                AaruConsole.Error(Localization.Core.Error_0, ex.Message);
+                AaruConsole.Exception(ex);
 
                 return (int)ErrorNumber.CannotOpenFormat;
             }
@@ -214,7 +214,7 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
 
             if(partitions.Count == 0)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, UI.No_partitions_found);
+                AaruConsole.Debug(MODULE_NAME, UI.No_partitions_found);
 
                 partitions.Add(new Partition
                 {
@@ -285,7 +285,7 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
                                 Statistics.AddFilesystem(fs.Metadata.Type);
                             }
                             else
-                                AaruConsole.ErrorWriteLine(UI.Unable_to_mount_volume_error_0, error.ToString());
+                                AaruConsole.Error(UI.Unable_to_mount_volume_error_0, error.ToString());
                         }
                     }
                     else
@@ -318,15 +318,15 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
                             Statistics.AddFilesystem(fs.Metadata.Type);
                         }
                         else
-                            AaruConsole.ErrorWriteLine(UI.Unable_to_mount_volume_error_0, error.ToString());
+                            AaruConsole.Error(UI.Unable_to_mount_volume_error_0, error.ToString());
                     }
                 }
             }
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
+            AaruConsole.Exception(ex);
 
             return (int)ErrorNumber.UnexpectedException;
         }
@@ -343,7 +343,7 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
 
         if(error != ErrorNumber.NoError)
         {
-            AaruConsole.ErrorWriteLine(UI.Error_0_reading_directory_1, error.ToString(), path);
+            AaruConsole.Error(UI.Error_0_reading_directory_1, error.ToString(), path);
 
             return;
         }
@@ -527,7 +527,7 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
                                                       outputPath);
                             }
                             else
-                                AaruConsole.ErrorWriteLine(UI.Cannot_write_xattr_0_for_1_output_exists, xattr, entry);
+                                AaruConsole.Error(UI.Cannot_write_xattr_0_for_1_output_exists, xattr, entry);
                         }
                     }
                 }
@@ -600,7 +600,7 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
                                                 outputFile.Write(outBuf, 0, (int)bytesRead);
                                             else
                                             {
-                                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_file_1, error, entry);
+                                                AaruConsole.Error(UI.Error_0_reading_file_1, error, entry);
 
                                                 break;
                                             }
@@ -612,7 +612,7 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
                                         fs.CloseFile(fileNode);
                                     }
                                     else
-                                        AaruConsole.ErrorWriteLine(UI.Error_0_reading_file_1, error, entry);
+                                        AaruConsole.Error(UI.Error_0_reading_file_1, error, entry);
                                 });
 
                     outputFile.Close();
@@ -652,10 +652,10 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
                                           Markup.Escape(outputPath));
                 }
                 else
-                    AaruConsole.ErrorWriteLine(UI.Cannot_write_file_0_output_exists, Markup.Escape(entry));
+                    AaruConsole.Error(UI.Cannot_write_file_0_output_exists, Markup.Escape(entry));
             }
             else
-                AaruConsole.ErrorWriteLine(UI.Error_reading_file_0, Markup.Escape(entry));
+                AaruConsole.Error(UI.Error_reading_file_0, Markup.Escape(entry));
         }
 
         fs.CloseDir(node);
diff --git a/Aaru/Commands/Filesystem/Info.cs b/Aaru/Commands/Filesystem/Info.cs
index 0923f1ffe..db02f6dde 100644
--- a/Aaru/Commands/Filesystem/Info.cs
+++ b/Aaru/Commands/Filesystem/Info.cs
@@ -57,12 +57,12 @@ sealed class FilesystemInfoCommand : Command<FilesystemInfoCommand.Settings>
 
         Statistics.AddCommand("fs-info");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",       settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--encoding={0}",    Markup.Escape(settings.Encoding ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--filesystems={0}", settings.Filesystems);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",       Markup.Escape(settings.ImagePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--partitions={0}",  settings.Partitions);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",     settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",       settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--encoding={0}",    Markup.Escape(settings.Encoding ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--filesystems={0}", settings.Filesystems);
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",       Markup.Escape(settings.ImagePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--partitions={0}",  settings.Partitions);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",     settings.Verbose);
 
         IFilter inputFilter = null;
 
@@ -74,7 +74,7 @@ sealed class FilesystemInfoCommand : Command<FilesystemInfoCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -87,11 +87,11 @@ sealed class FilesystemInfoCommand : Command<FilesystemInfoCommand.Settings>
             {
                 encodingClass = Claunia.Encoding.Encoding.GetEncoding(settings.Encoding);
 
-                if(settings.Verbose) AaruConsole.VerboseWriteLine(UI.encoding_for_0, encodingClass.EncodingName);
+                if(settings.Verbose) AaruConsole.Verbose(UI.encoding_for_0, encodingClass.EncodingName);
             }
             catch(ArgumentException)
             {
-                AaruConsole.ErrorWriteLine(UI.Specified_encoding_is_not_supported);
+                AaruConsole.Error(UI.Specified_encoding_is_not_supported);
 
                 return (int)ErrorNumber.EncodingUnknown;
             }
@@ -128,7 +128,7 @@ sealed class FilesystemInfoCommand : Command<FilesystemInfoCommand.Settings>
             }
 
             if(settings.Verbose)
-                AaruConsole.VerboseWriteLine(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
+                AaruConsole.Verbose(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
             else
                 AaruConsole.WriteLine(UI.Image_format_identified_by_0, imageFormat.Name);
 
@@ -164,9 +164,9 @@ sealed class FilesystemInfoCommand : Command<FilesystemInfoCommand.Settings>
             }
             catch(Exception ex)
             {
-                AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
-                AaruConsole.WriteException(ex);
+                AaruConsole.Error(UI.Unable_to_open_image_format);
+                AaruConsole.Error(Localization.Core.Error_0, ex.Message);
+                AaruConsole.Exception(ex);
 
                 return (int)ErrorNumber.CannotOpenFormat;
             }
@@ -189,7 +189,7 @@ sealed class FilesystemInfoCommand : Command<FilesystemInfoCommand.Settings>
 
                 if(partitionsList.Count == 0)
                 {
-                    AaruConsole.DebugWriteLine(MODULE_NAME, UI.No_partitions_found);
+                    AaruConsole.Debug(MODULE_NAME, UI.No_partitions_found);
 
                     if(!settings.Filesystems)
                     {
@@ -367,8 +367,8 @@ sealed class FilesystemInfoCommand : Command<FilesystemInfoCommand.Settings>
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(Markup.Escape(string.Format(UI.Error_reading_file_0, ex.Message)));
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(Markup.Escape(string.Format(UI.Error_reading_file_0, ex.Message)));
+            AaruConsole.Exception(ex);
 
             return (int)ErrorNumber.UnexpectedException;
         }
diff --git a/Aaru/Commands/Filesystem/Ls.cs b/Aaru/Commands/Filesystem/Ls.cs
index 4b732d7b2..9f5d8df73 100644
--- a/Aaru/Commands/Filesystem/Ls.cs
+++ b/Aaru/Commands/Filesystem/Ls.cs
@@ -56,11 +56,11 @@ sealed class LsCommand : Command<LsCommand.Settings>
     {
         MainClass.PrintCopyright();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",    settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--encoding={0}", Markup.Escape(settings.Encoding  ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",    Markup.Escape(settings.ImagePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--options={0}",  Markup.Escape(settings.Options   ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",  settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",    settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--encoding={0}", Markup.Escape(settings.Encoding  ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",    Markup.Escape(settings.ImagePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--options={0}",  Markup.Escape(settings.Options   ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",  settings.Verbose);
         Statistics.AddCommand("ls");
 
         IFilter inputFilter = null;
@@ -72,16 +72,16 @@ sealed class LsCommand : Command<LsCommand.Settings>
         });
 
         Dictionary<string, string> parsedOptions = Options.Parse(settings.Options);
-        AaruConsole.DebugWriteLine(MODULE_NAME, UI.Parsed_options);
+        AaruConsole.Debug(MODULE_NAME, UI.Parsed_options);
 
         foreach(KeyValuePair<string, string> parsedOption in parsedOptions)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "{0} = {1}", parsedOption.Key, parsedOption.Value);
+            AaruConsole.Debug(MODULE_NAME, "{0} = {1}", parsedOption.Key, parsedOption.Value);
 
         parsedOptions.Add("debug", settings.Debug.ToString());
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -94,11 +94,11 @@ sealed class LsCommand : Command<LsCommand.Settings>
             {
                 encodingClass = Claunia.Encoding.Encoding.GetEncoding(settings.Encoding);
 
-                if(settings.Verbose) AaruConsole.VerboseWriteLine(UI.encoding_for_0, encodingClass.EncodingName);
+                if(settings.Verbose) AaruConsole.Verbose(UI.encoding_for_0, encodingClass.EncodingName);
             }
             catch(ArgumentException)
             {
-                AaruConsole.ErrorWriteLine(UI.Specified_encoding_is_not_supported);
+                AaruConsole.Error(UI.Specified_encoding_is_not_supported);
 
                 return (int)ErrorNumber.EncodingUnknown;
             }
@@ -133,7 +133,7 @@ sealed class LsCommand : Command<LsCommand.Settings>
             }
 
             if(settings.Verbose)
-                AaruConsole.VerboseWriteLine(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
+                AaruConsole.Verbose(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
             else
                 AaruConsole.WriteLine(UI.Image_format_identified_by_0, imageFormat.Name);
 
@@ -155,15 +155,15 @@ sealed class LsCommand : Command<LsCommand.Settings>
                     return (int)opened;
                 }
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, UI.Correctly_opened_image_file);
+                AaruConsole.Debug(MODULE_NAME, UI.Correctly_opened_image_file);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            UI.Image_without_headers_is_0_bytes,
                                            imageFormat.Info.ImageSize);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME, UI.Image_has_0_sectors, imageFormat.Info.Sectors);
+                AaruConsole.Debug(MODULE_NAME, UI.Image_has_0_sectors, imageFormat.Info.Sectors);
 
-                AaruConsole.DebugWriteLine(MODULE_NAME,
+                AaruConsole.Debug(MODULE_NAME,
                                            UI.Image_identifies_media_type_as_0,
                                            imageFormat.Info.MediaType);
 
@@ -173,9 +173,9 @@ sealed class LsCommand : Command<LsCommand.Settings>
             }
             catch(Exception ex)
             {
-                AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
-                AaruConsole.WriteException(ex);
+                AaruConsole.Error(UI.Unable_to_open_image_format);
+                AaruConsole.Error(Localization.Core.Error_0, ex.Message);
+                AaruConsole.Exception(ex);
 
                 return (int)ErrorNumber.CannotOpenFormat;
             }
@@ -192,7 +192,7 @@ sealed class LsCommand : Command<LsCommand.Settings>
 
             if(partitions.Count == 0)
             {
-                AaruConsole.DebugWriteLine(MODULE_NAME, UI.No_partitions_found);
+                AaruConsole.Debug(MODULE_NAME, UI.No_partitions_found);
 
                 partitions.Add(new Partition
                 {
@@ -258,7 +258,7 @@ sealed class LsCommand : Command<LsCommand.Settings>
                                 Statistics.AddFilesystem(fs.Metadata.Type);
                             }
                             else
-                                AaruConsole.ErrorWriteLine(UI.Unable_to_mount_volume_error_0, error.ToString());
+                                AaruConsole.Error(UI.Unable_to_mount_volume_error_0, error.ToString());
                         }
                     }
                     else
@@ -287,15 +287,15 @@ sealed class LsCommand : Command<LsCommand.Settings>
                             Statistics.AddFilesystem(fs.Metadata.Type);
                         }
                         else
-                            AaruConsole.ErrorWriteLine(UI.Unable_to_mount_volume_error_0, error.ToString());
+                            AaruConsole.Error(UI.Unable_to_mount_volume_error_0, error.ToString());
                     }
                 }
             }
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
+            AaruConsole.Exception(ex);
 
             return (int)ErrorNumber.UnexpectedException;
         }
@@ -322,7 +322,7 @@ sealed class LsCommand : Command<LsCommand.Settings>
 
         if(error != ErrorNumber.NoError)
         {
-            AaruConsole.ErrorWriteLine(UI.Error_0_reading_directory_1, error.ToString(), path);
+            AaruConsole.Error(UI.Error_0_reading_directory_1, error.ToString(), path);
 
             return;
         }
diff --git a/Aaru/Commands/Filesystem/Options.cs b/Aaru/Commands/Filesystem/Options.cs
index 75c249a62..1bb8b69bd 100644
--- a/Aaru/Commands/Filesystem/Options.cs
+++ b/Aaru/Commands/Filesystem/Options.cs
@@ -54,8 +54,8 @@ sealed class ListOptionsCommand : Command<ListOptionsCommand.Settings>
     {
         MainClass.PrintCopyright();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
         Statistics.AddCommand("list-options");
 
         PluginRegister plugins = PluginRegister.Singleton;
diff --git a/Aaru/Commands/Formats.cs b/Aaru/Commands/Formats.cs
index 94e17afd9..11ff4645f 100644
--- a/Aaru/Commands/Formats.cs
+++ b/Aaru/Commands/Formats.cs
@@ -54,8 +54,8 @@ sealed class FormatsCommand : Command<FormatsCommand.Settings>
 
         Statistics.AddCommand("formats");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
 
         PluginRegister plugins = PluginRegister.Singleton;
 
diff --git a/Aaru/Commands/Image/Checksum.cs b/Aaru/Commands/Image/Checksum.cs
index ef16bb1c5..f4a95d207 100644
--- a/Aaru/Commands/Image/Checksum.cs
+++ b/Aaru/Commands/Image/Checksum.cs
@@ -60,23 +60,23 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
 
         Statistics.AddCommand("checksum");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--adler32={0}",          settings.Adler32);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--crc16={0}",            settings.Crc16);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--crc32={0}",            settings.Crc32);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--crc64={0}",            settings.Crc64);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",            settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--fletcher16={0}",       settings.Fletcher16);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--fletcher32={0}",       settings.Fletcher32);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",            Markup.Escape(settings.ImagePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--md5={0}",              settings.Md5);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--separated-tracks={0}", settings.SeparatedTracks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--sha1={0}",             settings.Sha1);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--sha256={0}",           settings.Sha256);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--sha384={0}",           settings.Sha384);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--sha512={0}",           settings.Sha512);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--spamsum={0}",          settings.SpamSum);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",          settings.Verbose);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--whole-disc={0}",       settings.WholeDisc);
+        AaruConsole.Debug(MODULE_NAME, "--adler32={0}",          settings.Adler32);
+        AaruConsole.Debug(MODULE_NAME, "--crc16={0}",            settings.Crc16);
+        AaruConsole.Debug(MODULE_NAME, "--crc32={0}",            settings.Crc32);
+        AaruConsole.Debug(MODULE_NAME, "--crc64={0}",            settings.Crc64);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",            settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--fletcher16={0}",       settings.Fletcher16);
+        AaruConsole.Debug(MODULE_NAME, "--fletcher32={0}",       settings.Fletcher32);
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",            Markup.Escape(settings.ImagePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--md5={0}",              settings.Md5);
+        AaruConsole.Debug(MODULE_NAME, "--separated-tracks={0}", settings.SeparatedTracks);
+        AaruConsole.Debug(MODULE_NAME, "--sha1={0}",             settings.Sha1);
+        AaruConsole.Debug(MODULE_NAME, "--sha256={0}",           settings.Sha256);
+        AaruConsole.Debug(MODULE_NAME, "--sha384={0}",           settings.Sha384);
+        AaruConsole.Debug(MODULE_NAME, "--sha512={0}",           settings.Sha512);
+        AaruConsole.Debug(MODULE_NAME, "--spamsum={0}",          settings.SpamSum);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",          settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--whole-disc={0}",       settings.WholeDisc);
 
         IFilter inputFilter = null;
 
@@ -88,7 +88,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -103,7 +103,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
 
         if(inputFormat == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Unable_to_recognize_image_format_not_checksumming);
+            AaruConsole.Error(UI.Unable_to_recognize_image_format_not_checksumming);
 
             return (int)ErrorNumber.UnrecognizedFormat;
         }
@@ -198,7 +198,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                             }
                                         */
 
-                                        AaruConsole.DebugWriteLine(MODULE_NAME,
+                                        AaruConsole.Debug(MODULE_NAME,
                                                                    UI.Track_0_starts_at_sector_1_and_ends_at_sector_2,
                                                                    currentTrack.Sequence,
                                                                    currentTrack.StartSector,
@@ -232,7 +232,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                                 if(errno != ErrorNumber.NoError)
                                                 {
                                                     AaruConsole
-                                                       .ErrorWriteLine(string
+                                                       .Error(string
                                                                           .Format(UI
                                                                                   .Error_0_while_reading_1_sectors_from_sector_2,
                                                                                errno,
@@ -260,7 +260,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                                 if(errno != ErrorNumber.NoError)
                                                 {
                                                     AaruConsole
-                                                       .ErrorWriteLine(string
+                                                       .Error(string
                                                                           .Format(UI
                                                                                   .Error_0_while_reading_1_sectors_from_sector_2,
                                                                                errno,
@@ -325,7 +325,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                 catch(Exception ex)
                 {
                     if(settings.Debug)
-                        AaruConsole.DebugWriteLine(Localization.Core.Could_not_get_tracks_because_0, ex.Message);
+                        AaruConsole.Debug(Localization.Core.Could_not_get_tracks_because_0, ex.Message);
                     else
                         AaruConsole.WriteLine("Unable to get separate tracks, not checksumming them");
                 }
@@ -368,7 +368,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                             if(errno != ErrorNumber.NoError)
                                             {
                                                 AaruConsole
-                                                   .ErrorWriteLine(string.Format(UI.Error_0_while_reading_block_1,
+                                                   .Error(string.Format(UI.Error_0_while_reading_block_1,
                                                                        errno,
                                                                        i));
 
@@ -382,7 +382,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                         preFileTask.StopTask();
                                     }
 
-                                    AaruConsole.DebugWriteLine(MODULE_NAME,
+                                    AaruConsole.Debug(MODULE_NAME,
                                                                UI.File_0_starts_at_block_1_and_ends_at_block_2,
                                                                currentFile.File,
                                                                currentFile.FirstBlock,
@@ -409,7 +409,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                             if(errno != ErrorNumber.NoError)
                                             {
                                                 AaruConsole
-                                                   .ErrorWriteLine(string
+                                                   .Error(string
                                                                       .Format(UI
                                                                                  .Error_0_while_reading_1_sectors_from_sector_2,
                                                                               errno,
@@ -435,7 +435,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                             if(errno != ErrorNumber.NoError)
                                             {
                                                 AaruConsole
-                                                   .ErrorWriteLine(string
+                                                   .Error(string
                                                                       .Format(UI
                                                                                  .Error_0_while_reading_1_sectors_from_sector_2,
                                                                               errno,
@@ -493,7 +493,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
 
                                     if(errno != ErrorNumber.NoError)
                                     {
-                                        AaruConsole.ErrorWriteLine(string.Format(UI.Error_0_while_reading_block_1,
+                                        AaruConsole.Error(string.Format(UI.Error_0_while_reading_block_1,
                                                                        errno,
                                                                        i));
 
@@ -548,7 +548,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                         if(errno != ErrorNumber.NoError)
                                         {
                                             AaruConsole
-                                               .ErrorWriteLine(string.Format(UI.Error_0_while_reading_1_bytes_from_2,
+                                               .Error(string.Format(UI.Error_0_while_reading_1_bytes_from_2,
                                                                              errno,
                                                                              BYTES_TO_READ,
                                                                              doneBytes));
@@ -575,7 +575,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                         if(errno != ErrorNumber.NoError)
                                         {
                                             AaruConsole
-                                               .ErrorWriteLine(string.Format(UI.Error_0_while_reading_1_bytes_from_2,
+                                               .Error(string.Format(UI.Error_0_while_reading_1_bytes_from_2,
                                                                              errno,
                                                                              length - doneBytes,
                                                                              doneBytes));
@@ -633,7 +633,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                         if(errno != ErrorNumber.NoError)
                                         {
                                             AaruConsole
-                                               .ErrorWriteLine(string
+                                               .Error(string
                                                                   .Format(UI
                                                                              .Error_0_while_reading_1_sectors_from_sector_2,
                                                                           errno,
@@ -659,7 +659,7 @@ sealed class ChecksumCommand : Command<ChecksumCommand.Settings>
                                         if(errno != ErrorNumber.NoError)
                                         {
                                             AaruConsole
-                                               .ErrorWriteLine(string
+                                               .Error(string
                                                                   .Format(UI
                                                                              .Error_0_while_reading_1_sectors_from_sector_2,
                                                                           errno,
diff --git a/Aaru/Commands/Image/Compare.cs b/Aaru/Commands/Image/Compare.cs
index 519f9fe1a..a44529f21 100644
--- a/Aaru/Commands/Image/Compare.cs
+++ b/Aaru/Commands/Image/Compare.cs
@@ -59,10 +59,10 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
 
         Statistics.AddCommand("compare");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input1={0}",  Markup.Escape(settings.ImagePath1 ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input2={0}",  Markup.Escape(settings.ImagePath2 ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--input1={0}",  Markup.Escape(settings.ImagePath1 ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--input2={0}",  Markup.Escape(settings.ImagePath2 ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
 
         IFilter inputFilter1 = null;
         IFilter inputFilter2 = null;
@@ -81,14 +81,14 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
 
         if(inputFilter1 == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_first_input_file);
+            AaruConsole.Error(UI.Cannot_open_first_input_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
 
         if(inputFilter2 == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_second_input_file);
+            AaruConsole.Error(UI.Cannot_open_second_input_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -110,14 +110,14 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
 
         if(input1Format == null)
         {
-            AaruConsole.ErrorWriteLine(UI.First_input_file_format_not_identified);
+            AaruConsole.Error(UI.First_input_file_format_not_identified);
 
             return (int)ErrorNumber.UnrecognizedFormat;
         }
 
         if(settings.Verbose)
         {
-            AaruConsole.VerboseWriteLine(UI.First_input_file_format_identified_by_0_1,
+            AaruConsole.Verbose(UI.First_input_file_format_identified_by_0_1,
                                          input1Format.Name,
                                          input1Format.Id);
         }
@@ -126,14 +126,14 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
 
         if(input2Format == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Second_input_file_format_not_identified);
+            AaruConsole.Error(UI.Second_input_file_format_not_identified);
 
             return (int)ErrorNumber.UnrecognizedFormat;
         }
 
         if(settings.Verbose)
         {
-            AaruConsole.VerboseWriteLine(UI.Second_input_file_format_identified_by_0_1,
+            AaruConsole.Verbose(UI.Second_input_file_format_identified_by_0_1,
                                          input2Format.Name,
                                          input2Format.Id);
         }
@@ -406,7 +406,7 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
                                     if(errno != ErrorNumber.NoError)
                                     {
                                         AaruConsole
-                                           .ErrorWriteLine(string.Format(UI.Error_0_reading_sector_1_from_first_image,
+                                           .Error(string.Format(UI.Error_0_reading_sector_1_from_first_image,
                                                                          errno,
                                                                          sector));
                                     }
@@ -416,7 +416,7 @@ sealed class CompareCommand : Command<CompareCommand.Settings>
                                     if(errno != ErrorNumber.NoError)
                                     {
                                         AaruConsole
-                                           .ErrorWriteLine(string.Format(UI.Error_0_reading_sector_1_from_second_image,
+                                           .Error(string.Format(UI.Error_0_reading_sector_1_from_second_image,
                                                                          errno,
                                                                          sector));
                                     }
diff --git a/Aaru/Commands/Image/Convert.cs b/Aaru/Commands/Image/Convert.cs
index 722840749..d8ae3e850 100644
--- a/Aaru/Commands/Image/Convert.cs
+++ b/Aaru/Commands/Image/Convert.cs
@@ -81,63 +81,63 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
         Statistics.AddCommand("convert-image");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--cicm-xml={0}", Markup.Escape(settings.CicmXml  ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--comments={0}", Markup.Escape(settings.Comments ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--count={0}",    settings.Count);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--creator={0}",  Markup.Escape(settings.Creator ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",    settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--cicm-xml={0}", Markup.Escape(settings.CicmXml  ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--comments={0}", Markup.Escape(settings.Comments ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--count={0}",    settings.Count);
+        AaruConsole.Debug(MODULE_NAME, "--creator={0}",  Markup.Escape(settings.Creator ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",    settings.Debug);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "--drive-manufacturer={0}",
                                    Markup.Escape(settings.DriveManufacturer ?? ""));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--drive-model={0}", Markup.Escape(settings.DriveModel ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--drive-model={0}", Markup.Escape(settings.DriveModel ?? ""));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "--drive-revision={0}",
                                    Markup.Escape(settings.DriveFirmwareRevision ?? ""));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--drive-serial={0}", Markup.Escape(settings.DriveSerialNumber ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--force={0}", settings.Force);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--format={0}", Markup.Escape(settings.Format ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--geometry={0}", Markup.Escape(settings.Geometry ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}", Markup.Escape(settings.InputPath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--media-barcode={0}", Markup.Escape(settings.MediaBarcode ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--media-lastsequence={0}", settings.LastMediaSequence);
+        AaruConsole.Debug(MODULE_NAME, "--drive-serial={0}", Markup.Escape(settings.DriveSerialNumber ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--force={0}", settings.Force);
+        AaruConsole.Debug(MODULE_NAME, "--format={0}", Markup.Escape(settings.Format ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--geometry={0}", Markup.Escape(settings.Geometry ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--input={0}", Markup.Escape(settings.InputPath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--media-barcode={0}", Markup.Escape(settings.MediaBarcode ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--media-lastsequence={0}", settings.LastMediaSequence);
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "--media-manufacturer={0}",
                                    Markup.Escape(settings.MediaManufacturer ?? ""));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--media-model={0}", Markup.Escape(settings.MediaModel ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--media-model={0}", Markup.Escape(settings.MediaModel ?? ""));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME,
+        AaruConsole.Debug(MODULE_NAME,
                                    "--media-partnumber={0}",
                                    Markup.Escape(settings.MediaPartNumber ?? ""));
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--media-sequence={0}", settings.MediaSequence);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--media-serial={0}", Markup.Escape(settings.MediaSerialNumber ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--media-title={0}", Markup.Escape(settings.MediaTitle ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--options={0}", Markup.Escape(settings.Options ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--output={0}", Markup.Escape(settings.OutputPath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--resume-file={0}", Markup.Escape(settings.ResumeFile ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--fix-subchannel-position={0}", fixSubchannelPosition);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--fix-subchannel={0}", fixSubchannel);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--fix-subchannel-crc={0}", fixSubchannelCrc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--generate-subchannels={0}", settings.GenerateSubchannels);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--decrypt={0}", settings.Decrypt);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--aaru-metadata={0}", Markup.Escape(settings.AaruMetadata ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--media-sequence={0}", settings.MediaSequence);
+        AaruConsole.Debug(MODULE_NAME, "--media-serial={0}", Markup.Escape(settings.MediaSerialNumber ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--media-title={0}", Markup.Escape(settings.MediaTitle ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--options={0}", Markup.Escape(settings.Options ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--output={0}", Markup.Escape(settings.OutputPath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--resume-file={0}", Markup.Escape(settings.ResumeFile ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--fix-subchannel-position={0}", fixSubchannelPosition);
+        AaruConsole.Debug(MODULE_NAME, "--fix-subchannel={0}", fixSubchannel);
+        AaruConsole.Debug(MODULE_NAME, "--fix-subchannel-crc={0}", fixSubchannelCrc);
+        AaruConsole.Debug(MODULE_NAME, "--generate-subchannels={0}", settings.GenerateSubchannels);
+        AaruConsole.Debug(MODULE_NAME, "--decrypt={0}", settings.Decrypt);
+        AaruConsole.Debug(MODULE_NAME, "--aaru-metadata={0}", Markup.Escape(settings.AaruMetadata ?? ""));
 
         Dictionary<string, string> parsedOptions = Options.Parse(settings.Options);
-        AaruConsole.DebugWriteLine(MODULE_NAME, UI.Parsed_options);
+        AaruConsole.Debug(MODULE_NAME, UI.Parsed_options);
 
         foreach(KeyValuePair<string, string> parsedOption in parsedOptions)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "{0} = {1}", parsedOption.Key, parsedOption.Value);
+            AaruConsole.Debug(MODULE_NAME, "{0} = {1}", parsedOption.Key, parsedOption.Value);
 
         if(settings.Count == 0)
         {
-            AaruConsole.ErrorWriteLine(UI.Need_to_specify_more_than_zero_sectors_to_copy_at_once);
+            AaruConsole.Error(UI.Need_to_specify_more_than_zero_sectors_to_copy_at_once);
 
             return (int)ErrorNumber.InvalidArgument;
         }
@@ -152,28 +152,28 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
             if(geometryPieces.Length != 3)
             {
-                AaruConsole.ErrorWriteLine(UI.Invalid_geometry_specified);
+                AaruConsole.Error(UI.Invalid_geometry_specified);
 
                 return (int)ErrorNumber.InvalidArgument;
             }
 
             if(!uint.TryParse(geometryPieces[0], out uint cylinders) || cylinders == 0)
             {
-                AaruConsole.ErrorWriteLine(UI.Invalid_number_of_cylinders_specified);
+                AaruConsole.Error(UI.Invalid_number_of_cylinders_specified);
 
                 return (int)ErrorNumber.InvalidArgument;
             }
 
             if(!uint.TryParse(geometryPieces[1], out uint heads) || heads == 0)
             {
-                AaruConsole.ErrorWriteLine(UI.Invalid_number_of_heads_specified);
+                AaruConsole.Error(UI.Invalid_number_of_heads_specified);
 
                 return (int)ErrorNumber.InvalidArgument;
             }
 
             if(!uint.TryParse(geometryPieces[2], out uint spt) || spt == 0)
             {
-                AaruConsole.ErrorWriteLine(UI.Invalid_sectors_per_track_specified);
+                AaruConsole.Error(UI.Invalid_sectors_per_track_specified);
 
                 return (int)ErrorNumber.InvalidArgument;
             }
@@ -202,15 +202,15 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                 }
                 catch(Exception ex)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Incorrect_metadata_sidecar_file_not_continuing);
-                    AaruConsole.WriteException(ex);
+                    AaruConsole.Error(UI.Incorrect_metadata_sidecar_file_not_continuing);
+                    AaruConsole.Exception(ex);
 
                     return (int)ErrorNumber.InvalidSidecar;
                 }
             }
             else
             {
-                AaruConsole.ErrorWriteLine(UI.Could_not_find_metadata_sidecar);
+                AaruConsole.Error(UI.Could_not_find_metadata_sidecar);
 
                 return (int)ErrorNumber.NoSuchFile;
             }
@@ -238,15 +238,15 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                 }
                 catch(Exception ex)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Incorrect_metadata_sidecar_file_not_continuing);
-                    AaruConsole.WriteException(ex);
+                    AaruConsole.Error(UI.Incorrect_metadata_sidecar_file_not_continuing);
+                    AaruConsole.Exception(ex);
 
                     return (int)ErrorNumber.InvalidSidecar;
                 }
             }
             else
             {
-                AaruConsole.ErrorWriteLine(UI.Could_not_find_metadata_sidecar);
+                AaruConsole.Error(UI.Could_not_find_metadata_sidecar);
 
                 return (int)ErrorNumber.NoSuchFile;
             }
@@ -288,15 +288,15 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                 }
                 catch(Exception ex)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Incorrect_resume_file_not_continuing);
-                    AaruConsole.WriteException(ex);
+                    AaruConsole.Error(UI.Incorrect_resume_file_not_continuing);
+                    AaruConsole.Exception(ex);
 
                     return (int)ErrorNumber.InvalidResume;
                 }
             }
             else
             {
-                AaruConsole.ErrorWriteLine(UI.Could_not_find_resume_file);
+                AaruConsole.Error(UI.Could_not_find_resume_file);
 
                 return (int)ErrorNumber.NoSuchFile;
             }
@@ -312,14 +312,14 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
 
         if(File.Exists(settings.OutputPath))
         {
-            AaruConsole.ErrorWriteLine(UI.Output_file_already_exists);
+            AaruConsole.Error(UI.Output_file_already_exists);
 
             return (int)ErrorNumber.FileExists;
         }
@@ -351,7 +351,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
         }
 
         if(settings.Verbose)
-            AaruConsole.VerboseWriteLine(UI.Input_image_format_identified_by_0_1, inputFormat.Name, inputFormat.Id);
+            AaruConsole.Verbose(UI.Input_image_format_identified_by_0_1, inputFormat.Name, inputFormat.Id);
         else
             AaruConsole.WriteLine(UI.Input_image_format_identified_by_0, inputFormat.Name);
 
@@ -386,13 +386,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                         };
 #pragma warning restore 612
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, UI.Correctly_opened_image_file);
+            AaruConsole.Debug(MODULE_NAME, UI.Correctly_opened_image_file);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, UI.Image_without_headers_is_0_bytes, inputFormat.Info.ImageSize);
+            AaruConsole.Debug(MODULE_NAME, UI.Image_without_headers_is_0_bytes, inputFormat.Info.ImageSize);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, UI.Image_has_0_sectors, inputFormat.Info.Sectors);
+            AaruConsole.Debug(MODULE_NAME, UI.Image_has_0_sectors, inputFormat.Info.Sectors);
 
-            AaruConsole.DebugWriteLine(MODULE_NAME, UI.Image_identifies_media_type_as_0, mediaType);
+            AaruConsole.Debug(MODULE_NAME, UI.Image_identifies_media_type_as_0, mediaType);
 
             Statistics.AddMediaFormat(inputFormat.Format);
             Statistics.AddMedia(mediaType, false);
@@ -400,9 +400,9 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
-            AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(UI.Unable_to_open_image_format);
+            AaruConsole.Error(Localization.Core.Error_0, ex.Message);
+            AaruConsole.Exception(ex);
 
             return (int)ErrorNumber.CannotOpenFormat;
         }
@@ -451,13 +451,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
         IBaseWritableImage outputFormat = candidates[0];
 
         if(settings.Verbose)
-            AaruConsole.VerboseWriteLine(UI.Output_image_format_0_1, outputFormat.Name, outputFormat.Id);
+            AaruConsole.Verbose(UI.Output_image_format_0_1, outputFormat.Name, outputFormat.Id);
         else
             AaruConsole.WriteLine(UI.Output_image_format_0, outputFormat.Name);
 
         if(!outputFormat.SupportedMediaTypes.Contains(mediaType))
         {
-            AaruConsole.ErrorWriteLine(UI.Output_format_does_not_support_media_type);
+            AaruConsole.Error(UI.Output_format_does_not_support_media_type);
 
             return (int)ErrorNumber.UnsupportedMedia;
         }
@@ -465,8 +465,8 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
         foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags.Where(mediaTag =>
                     !outputFormat.SupportedMediaTags.Contains(mediaTag) && !settings.Force))
         {
-            AaruConsole.ErrorWriteLine(UI.Converting_image_will_lose_media_tag_0, mediaTag);
-            AaruConsole.ErrorWriteLine(UI.If_you_dont_care_use_force_option);
+            AaruConsole.Error(UI.Converting_image_will_lose_media_tag_0, mediaTag);
+            AaruConsole.Error(UI.If_you_dont_care_use_force_option);
 
             return (int)ErrorNumber.DataWillBeLost;
         }
@@ -486,9 +486,9 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                 continue;
             }
 
-            AaruConsole.ErrorWriteLine(UI.Converting_image_will_lose_sector_tag_0, sectorTag);
+            AaruConsole.Error(UI.Converting_image_will_lose_sector_tag_0, sectorTag);
 
-            AaruConsole.ErrorWriteLine(UI
+            AaruConsole.Error(UI
                                           .If_you_dont_care_use_force_option_This_will_skip_all_sector_tags_converting_only_user_data);
 
             return (int)ErrorNumber.DataWillBeLost;
@@ -499,7 +499,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
         if(inputTape?.IsTape == true && outputTape is null)
         {
-            AaruConsole.ErrorWriteLine(UI.Input_format_contains_a_tape_image_and_is_not_supported_by_output_format);
+            AaruConsole.Error(UI.Input_format_contains_a_tape_image_and_is_not_supported_by_output_format);
 
             return (int)ErrorNumber.UnsupportedMedia;
         }
@@ -513,8 +513,8 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
             // Cannot set image to tape mode
             if(!ret)
             {
-                AaruConsole.ErrorWriteLine(UI.Error_setting_output_image_in_tape_mode);
-                AaruConsole.ErrorWriteLine(outputFormat.ErrorMessage);
+                AaruConsole.Error(UI.Error_setting_output_image_in_tape_mode);
+                AaruConsole.Error(outputFormat.ErrorMessage);
 
                 return (int)ErrorNumber.WriteError;
             }
@@ -528,7 +528,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
             // TODO: Disabled until 6.0
             /*if(!_force)
             {*/
-            AaruConsole.ErrorWriteLine(Localization.Core.Output_format_does_not_support_sessions);
+            AaruConsole.Error(Localization.Core.Output_format_does_not_support_sessions);
 
             return (int)ErrorNumber.UnsupportedMedia;
             /*}
@@ -544,7 +544,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
             // TODO: Disabled until 6.0
             /*if(!_force)
             {*/
-            AaruConsole.ErrorWriteLine(Localization.Core.Output_format_does_not_support_hidden_tracks);
+            AaruConsole.Error(Localization.Core.Output_format_does_not_support_hidden_tracks);
 
             return (int)ErrorNumber.UnsupportedMedia;
             /*}
@@ -567,7 +567,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
         if(!created)
         {
-            AaruConsole.ErrorWriteLine(UI.Error_0_creating_output_image, outputFormat.ErrorMessage);
+            AaruConsole.Error(UI.Error_0_creating_output_image, outputFormat.ErrorMessage);
 
             return (int)ErrorNumber.CannotCreateFormat;
         }
@@ -597,12 +597,12 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
         {
             if(!settings.Force)
             {
-                AaruConsole.ErrorWriteLine(UI.Error_0_setting_metadata_not_continuing, outputFormat.ErrorMessage);
+                AaruConsole.Error(UI.Error_0_setting_metadata_not_continuing, outputFormat.ErrorMessage);
 
                 return (int)ErrorNumber.WriteError;
             }
 
-            AaruConsole.ErrorWriteLine(Localization.Core.Error_0_setting_metadata, outputFormat.ErrorMessage);
+            AaruConsole.Error(Localization.Core.Error_0_setting_metadata, outputFormat.ErrorMessage);
         }
 
         Metadata           metadata     = inputFormat.AaruMetadata;
@@ -625,10 +625,10 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                             if(errno != ErrorNumber.NoError)
                             {
                                 if(settings.Force)
-                                    AaruConsole.ErrorWriteLine(UI.Error_0_reading_media_tag, errno);
+                                    AaruConsole.Error(UI.Error_0_reading_media_tag, errno);
                                 else
                                 {
-                                    AaruConsole.ErrorWriteLine(UI.Error_0_reading_media_tag_not_continuing, errno);
+                                    AaruConsole.Error(UI.Error_0_reading_media_tag_not_continuing, errno);
 
                                     errorNumber = errno;
                                 }
@@ -639,10 +639,10 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                             if((outputFormat as IWritableImage)?.WriteMediaTag(tag, mediaTag) == true) return;
 
                             if(settings.Force)
-                                AaruConsole.ErrorWriteLine(UI.Error_0_writing_media_tag, outputFormat.ErrorMessage);
+                                AaruConsole.Error(UI.Error_0_writing_media_tag, outputFormat.ErrorMessage);
                             else
                             {
-                                AaruConsole.ErrorWriteLine(UI.Error_0_writing_media_tag_not_continuing,
+                                AaruConsole.Error(UI.Error_0_writing_media_tag_not_continuing,
                                                            outputFormat.ErrorMessage);
 
                                 errorNumber = ErrorNumber.WriteError;
@@ -661,7 +661,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
         {
             if(!outputOptical.SetTracks(inputOptical.Tracks))
             {
-                AaruConsole.ErrorWriteLine(UI.Error_0_sending_tracks_list_to_output_image, outputOptical.ErrorMessage);
+                AaruConsole.Error(UI.Error_0_sending_tracks_list_to_output_image, outputOptical.ErrorMessage);
 
                 return (int)ErrorNumber.WriteError;
             }
@@ -735,13 +735,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
                                             if(settings.Force)
                                             {
-                                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing,
+                                                AaruConsole.Error(UI.Error_0_reading_sector_1_continuing,
                                                                            errno,
                                                                            doneSectors + track.StartSector);
                                             }
                                             else
                                             {
-                                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing,
+                                                AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing,
                                                                            errno,
                                                                            doneSectors + track.StartSector);
 
@@ -756,7 +756,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                             if(!settings.Force)
                                             {
                                                 AaruConsole
-                                                   .ErrorWriteLine(UI
+                                                   .Error(UI
                                                                       .Input_image_is_not_returning_raw_sectors_use_force_if_you_want_to_continue);
 
                                                 errno = ErrorNumber.InOutError;
@@ -821,7 +821,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                                                       .TryGetValue("iso9660 filesystem",
                                                                            out IReadOnlyFilesystem rofs))
                                                             {
-                                                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                                                AaruConsole.Debug(MODULE_NAME,
                                                                     UI.Generating_decryption_keys);
 
                                                                 generatedTitleKeys =
@@ -879,7 +879,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                                                       .TryGetValue("iso9660 filesystem",
                                                                            out IReadOnlyFilesystem rofs))
                                                             {
-                                                                AaruConsole.DebugWriteLine(MODULE_NAME,
+                                                                AaruConsole.Debug(MODULE_NAME,
                                                                     UI.Generating_decryption_keys);
 
                                                                 generatedTitleKeys =
@@ -923,13 +923,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
                                             if(settings.Force)
                                             {
-                                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing,
+                                                AaruConsole.Error(UI.Error_0_reading_sector_1_continuing,
                                                                            errno,
                                                                            doneSectors + track.StartSector);
                                             }
                                             else
                                             {
-                                                AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing,
+                                                AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing,
                                                                            errno,
                                                                            doneSectors + track.StartSector);
 
@@ -944,13 +944,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                     {
                                         if(settings.Force)
                                         {
-                                            AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_continuing,
+                                            AaruConsole.Error(UI.Error_0_writing_sector_1_continuing,
                                                                        outputOptical.ErrorMessage,
                                                                        doneSectors + track.StartSector);
                                         }
                                         else
                                         {
-                                            AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_not_continuing,
+                                            AaruConsole.Error(UI.Error_0_writing_sector_1_not_continuing,
                                                                        outputOptical.ErrorMessage,
                                                                        doneSectors + track.StartSector);
 
@@ -1100,13 +1100,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                                 {
                                                     if(settings.Force)
                                                     {
-                                                        AaruConsole.ErrorWriteLine(UI.Error_0_writing_tag_continuing,
+                                                        AaruConsole.Error(UI.Error_0_writing_tag_continuing,
                                                             outputOptical.ErrorMessage);
 
                                                         continue;
                                                     }
 
-                                                    AaruConsole.ErrorWriteLine(UI.Error_0_writing_tag_not_continuing,
+                                                    AaruConsole.Error(UI.Error_0_writing_tag_not_continuing,
                                                                                outputOptical.ErrorMessage);
 
                                                     errno = ErrorNumber.WriteError;
@@ -1119,12 +1119,12 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                             {
                                                 if(settings.Force)
                                                 {
-                                                    AaruConsole.ErrorWriteLine(UI.Error_0_writing_tag_continuing,
+                                                    AaruConsole.Error(UI.Error_0_writing_tag_continuing,
                                                                                outputOptical.ErrorMessage);
                                                 }
                                                 else
                                                 {
-                                                    AaruConsole.ErrorWriteLine(UI.Error_0_writing_tag_not_continuing,
+                                                    AaruConsole.Error(UI.Error_0_writing_tag_not_continuing,
                                                                                outputOptical.ErrorMessage);
 
                                                     errno = ErrorNumber.WriteError;
@@ -1205,14 +1205,14 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                                 if(settings.Force)
                                                 {
                                                     AaruConsole
-                                                       .ErrorWriteLine(UI.Error_0_reading_tag_for_sector_1_continuing,
+                                                       .Error(UI.Error_0_reading_tag_for_sector_1_continuing,
                                                                        errno,
                                                                        doneSectors + track.StartSector);
                                                 }
                                                 else
                                                 {
                                                     AaruConsole
-                                                       .ErrorWriteLine(UI
+                                                       .Error(UI
                                                                           .Error_0_reading_tag_for_sector_1_not_continuing,
                                                                        errno,
                                                                        doneSectors + track.StartSector);
@@ -1273,14 +1273,14 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                                 if(settings.Force)
                                                 {
                                                     AaruConsole
-                                                       .ErrorWriteLine(UI.Error_0_reading_tag_for_sector_1_continuing,
+                                                       .Error(UI.Error_0_reading_tag_for_sector_1_continuing,
                                                                        errno,
                                                                        doneSectors + track.StartSector);
                                                 }
                                                 else
                                                 {
                                                     AaruConsole
-                                                       .ErrorWriteLine(UI
+                                                       .Error(UI
                                                                           .Error_0_reading_tag_for_sector_1_not_continuing,
                                                                        errno,
                                                                        doneSectors + track.StartSector);
@@ -1295,14 +1295,14 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                             if(settings.Force)
                                             {
                                                 AaruConsole
-                                                   .ErrorWriteLine(UI.Error_0_writing_tag_for_sector_1_continuing,
+                                                   .Error(UI.Error_0_writing_tag_for_sector_1_continuing,
                                                                    outputOptical.ErrorMessage,
                                                                    doneSectors + track.StartSector);
                                             }
                                             else
                                             {
                                                 AaruConsole
-                                                   .ErrorWriteLine(UI.Error_0_writing_tag_for_sector_1_not_continuing,
+                                                   .Error(UI.Error_0_writing_tag_for_sector_1_not_continuing,
                                                                    outputOptical.ErrorMessage,
                                                                    doneSectors + track.StartSector);
 
@@ -1413,7 +1413,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
                 if(!outputMedia.SetGeometry(chs.cylinders, chs.heads, chs.sectors))
                 {
-                    AaruConsole.ErrorWriteLine(UI.Error_0_setting_geometry_image_may_be_incorrect_continuing,
+                    AaruConsole.Error(UI.Error_0_setting_geometry_image_may_be_incorrect_continuing,
                                                outputMedia.ErrorMessage);
                 }
             }
@@ -1465,13 +1465,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
                                         if(settings.Force)
                                         {
-                                            AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing,
+                                            AaruConsole.Error(UI.Error_0_reading_sector_1_continuing,
                                                                        errno,
                                                                        doneSectors);
                                         }
                                         else
                                         {
-                                            AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing,
+                                            AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing,
                                                                        errno,
                                                                        doneSectors);
 
@@ -1497,13 +1497,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
                                         if(settings.Force)
                                         {
-                                            AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing,
+                                            AaruConsole.Error(UI.Error_0_reading_sector_1_continuing,
                                                                        errno,
                                                                        doneSectors);
                                         }
                                         else
                                         {
-                                            AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing,
+                                            AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing,
                                                                        errno,
                                                                        doneSectors);
 
@@ -1516,13 +1516,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                 {
                                     if(settings.Force)
                                     {
-                                        AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_continuing,
+                                        AaruConsole.Error(UI.Error_0_writing_sector_1_continuing,
                                                                    outputMedia.ErrorMessage,
                                                                    doneSectors);
                                     }
                                     else
                                     {
-                                        AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_not_continuing,
+                                        AaruConsole.Error(UI.Error_0_writing_sector_1_not_continuing,
                                                                    outputMedia.ErrorMessage,
                                                                    doneSectors);
 
@@ -1596,13 +1596,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
                                         if(settings.Force)
                                         {
-                                            AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_continuing,
+                                            AaruConsole.Error(UI.Error_0_reading_sector_1_continuing,
                                                                        errno,
                                                                        doneSectors);
                                         }
                                         else
                                         {
-                                            AaruConsole.ErrorWriteLine(UI.Error_0_reading_sector_1_not_continuing,
+                                            AaruConsole.Error(UI.Error_0_reading_sector_1_not_continuing,
                                                                        errno,
                                                                        doneSectors);
 
@@ -1614,13 +1614,13 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
                                     {
                                         if(settings.Force)
                                         {
-                                            AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_continuing,
+                                            AaruConsole.Error(UI.Error_0_writing_sector_1_continuing,
                                                                        outputMedia.ErrorMessage,
                                                                        doneSectors);
                                         }
                                         else
                                         {
-                                            AaruConsole.ErrorWriteLine(UI.Error_0_writing_sector_1_not_continuing,
+                                            AaruConsole.Error(UI.Error_0_writing_sector_1_not_continuing,
                                                                        outputMedia.ErrorMessage,
                                                                        doneSectors);
 
@@ -1756,7 +1756,7 @@ sealed class ConvertImageCommand : Command<ConvertImageCommand.Settings>
 
         if(!closed)
         {
-            AaruConsole.ErrorWriteLine(UI.Error_0_closing_output_image_Contents_are_not_correct,
+            AaruConsole.Error(UI.Error_0_closing_output_image_Contents_are_not_correct,
                                        outputFormat.ErrorMessage);
 
             return (int)ErrorNumber.WriteError;
diff --git a/Aaru/Commands/Image/CreateSidecar.cs b/Aaru/Commands/Image/CreateSidecar.cs
index 86754fe12..ad6085183 100644
--- a/Aaru/Commands/Image/CreateSidecar.cs
+++ b/Aaru/Commands/Image/CreateSidecar.cs
@@ -62,12 +62,12 @@ sealed class CreateSidecarCommand : Command<CreateSidecarCommand.Settings>
 
         Statistics.AddCommand("create-sidecar");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--block-size={0}", settings.BlockSize);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",      settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--encoding={0}",   Markup.Escape(settings.Encoding  ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",      Markup.Escape(settings.ImagePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--tape={0}",       settings.Tape);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",    settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--block-size={0}", settings.BlockSize);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",      settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--encoding={0}",   Markup.Escape(settings.Encoding  ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",      Markup.Escape(settings.ImagePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--tape={0}",       settings.Tape);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",    settings.Verbose);
 
         Encoding encodingClass = null;
 
@@ -77,11 +77,11 @@ sealed class CreateSidecarCommand : Command<CreateSidecarCommand.Settings>
             {
                 encodingClass = Claunia.Encoding.Encoding.GetEncoding(settings.Encoding);
 
-                if(settings.Verbose) AaruConsole.VerboseWriteLine(UI.encoding_for_0, encodingClass.EncodingName);
+                if(settings.Verbose) AaruConsole.Verbose(UI.encoding_for_0, encodingClass.EncodingName);
             }
             catch(ArgumentException)
             {
-                AaruConsole.ErrorWriteLine(UI.Specified_encoding_is_not_supported);
+                AaruConsole.Error(UI.Specified_encoding_is_not_supported);
 
                 return (int)ErrorNumber.EncodingUnknown;
             }
@@ -91,7 +91,7 @@ sealed class CreateSidecarCommand : Command<CreateSidecarCommand.Settings>
         {
             if(settings.Tape)
             {
-                AaruConsole.ErrorWriteLine(UI.You_cannot_use_tape_option_when_input_is_a_file);
+                AaruConsole.Error(UI.You_cannot_use_tape_option_when_input_is_a_file);
 
                 return (int)ErrorNumber.NotDirectory;
             }
@@ -106,7 +106,7 @@ sealed class CreateSidecarCommand : Command<CreateSidecarCommand.Settings>
 
             if(inputFilter == null)
             {
-                AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+                AaruConsole.Error(UI.Cannot_open_specified_file);
 
                 return (int)ErrorNumber.CannotOpenFile;
             }
@@ -129,7 +129,7 @@ sealed class CreateSidecarCommand : Command<CreateSidecarCommand.Settings>
                 }
 
                 if(settings.Verbose)
-                    AaruConsole.VerboseWriteLine(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
+                    AaruConsole.Verbose(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
                 else
                     AaruConsole.WriteLine(UI.Image_format_identified_by_0, imageFormat.Name);
 
@@ -151,13 +151,13 @@ sealed class CreateSidecarCommand : Command<CreateSidecarCommand.Settings>
                         return (int)opened;
                     }
 
-                    AaruConsole.DebugWriteLine(MODULE_NAME, UI.Correctly_opened_image_file);
+                    AaruConsole.Debug(MODULE_NAME, UI.Correctly_opened_image_file);
                 }
                 catch(Exception ex)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
-                    AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
-                    AaruConsole.WriteException(ex);
+                    AaruConsole.Error(UI.Unable_to_open_image_format);
+                    AaruConsole.Error(Localization.Core.Error_0, ex.Message);
+                    AaruConsole.Exception(ex);
 
                     return (int)ErrorNumber.CannotOpenFormat;
                 }
@@ -244,8 +244,8 @@ sealed class CreateSidecarCommand : Command<CreateSidecarCommand.Settings>
             }
             catch(Exception ex)
             {
-                AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
-                AaruConsole.WriteException(ex);
+                AaruConsole.Error(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
+                AaruConsole.Exception(ex);
 
                 return (int)ErrorNumber.UnexpectedException;
             }
@@ -254,7 +254,7 @@ sealed class CreateSidecarCommand : Command<CreateSidecarCommand.Settings>
         {
             if(!settings.Tape)
             {
-                AaruConsole.ErrorWriteLine(Localization.Core.Cannot_create_a_sidecar_from_a_directory);
+                AaruConsole.Error(Localization.Core.Cannot_create_a_sidecar_from_a_directory);
 
                 return (int)ErrorNumber.IsDirectory;
             }
@@ -341,7 +341,7 @@ sealed class CreateSidecarCommand : Command<CreateSidecarCommand.Settings>
             });
         }
         else
-            AaruConsole.ErrorWriteLine(UI.The_specified_input_file_cannot_be_found);
+            AaruConsole.Error(UI.The_specified_input_file_cannot_be_found);
 
         return (int)ErrorNumber.NoError;
     }
diff --git a/Aaru/Commands/Image/Decode.cs b/Aaru/Commands/Image/Decode.cs
index 8983df677..5651c5752 100644
--- a/Aaru/Commands/Image/Decode.cs
+++ b/Aaru/Commands/Image/Decode.cs
@@ -56,13 +56,13 @@ sealed class DecodeCommand : Command<DecodeCommand.Settings>
 
         Statistics.AddCommand("decode");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",       settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--disk-tags={0}",   settings.DiskTags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",       Markup.Escape(settings.ImagePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--length={0}",      Markup.Escape(settings.Length    ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--sector-tags={0}", settings.SectorTags);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--start={0}",       settings.StartSector);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",     settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",       settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--disk-tags={0}",   settings.DiskTags);
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",       Markup.Escape(settings.ImagePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--length={0}",      Markup.Escape(settings.Length    ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--sector-tags={0}", settings.SectorTags);
+        AaruConsole.Debug(MODULE_NAME, "--start={0}",       settings.StartSector);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",     settings.Verbose);
 
         IFilter inputFilter = null;
 
@@ -74,7 +74,7 @@ sealed class DecodeCommand : Command<DecodeCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -91,7 +91,7 @@ sealed class DecodeCommand : Command<DecodeCommand.Settings>
 
         if(baseImage == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Unable_to_recognize_image_format_not_decoding);
+            AaruConsole.Error(UI.Unable_to_recognize_image_format_not_decoding);
 
             return (int)ErrorNumber.UnrecognizedFormat;
         }
diff --git a/Aaru/Commands/Image/Entropy.cs b/Aaru/Commands/Image/Entropy.cs
index 1404db831..9537ad05a 100644
--- a/Aaru/Commands/Image/Entropy.cs
+++ b/Aaru/Commands/Image/Entropy.cs
@@ -54,12 +54,12 @@ sealed class EntropyCommand : Command<EntropyCommand.Settings>
 
         Statistics.AddCommand("entropy");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",              settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--duplicated-sectors={0}", settings.DuplicatedSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",              Markup.Escape(settings.ImagePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--separated-tracks={0}",   settings.SeparatedTracks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",            settings.Verbose);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--whole-disc={0}",         settings.WholeDisc);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",              settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--duplicated-sectors={0}", settings.DuplicatedSectors);
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",              Markup.Escape(settings.ImagePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--separated-tracks={0}",   settings.SeparatedTracks);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",            settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--whole-disc={0}",         settings.WholeDisc);
 
         IFilter inputFilter = null;
 
@@ -71,7 +71,7 @@ sealed class EntropyCommand : Command<EntropyCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -86,7 +86,7 @@ sealed class EntropyCommand : Command<EntropyCommand.Settings>
 
         if(inputFormat == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Unable_to_recognize_image_format_not_checksumming);
+            AaruConsole.Error(UI.Unable_to_recognize_image_format_not_checksumming);
 
             return (int)ErrorNumber.UnrecognizedFormat;
         }
@@ -159,7 +159,7 @@ sealed class EntropyCommand : Command<EntropyCommand.Settings>
                             if(opticalFormat.Sessions?.Count > 1)
                             {
                                 AaruConsole
-                                   .ErrorWriteLine(UI
+                                   .Error(UI
                                                       .Calculating_disc_entropy_of_multisession_images_is_not_yet_implemented);
 
                                 wholeDisc = false;
diff --git a/Aaru/Commands/Image/Info.cs b/Aaru/Commands/Image/Info.cs
index dda413c70..b628547b9 100644
--- a/Aaru/Commands/Image/Info.cs
+++ b/Aaru/Commands/Image/Info.cs
@@ -53,9 +53,9 @@ sealed class ImageInfoCommand : Command<ImageInfoCommand.Settings>
 
         Statistics.AddCommand("image-info");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",   Markup.Escape(settings.ImagePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",   Markup.Escape(settings.ImagePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
 
         IFilter inputFilter = null;
 
@@ -67,7 +67,7 @@ sealed class ImageInfoCommand : Command<ImageInfoCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -118,17 +118,17 @@ sealed class ImageInfoCommand : Command<ImageInfoCommand.Settings>
             }
             catch(Exception ex)
             {
-                AaruConsole.ErrorWriteLine(UI.Unable_to_open_image_format);
-                AaruConsole.ErrorWriteLine(Localization.Core.Error_0, ex.Message);
-                AaruConsole.WriteException(ex);
+                AaruConsole.Error(UI.Unable_to_open_image_format);
+                AaruConsole.Error(Localization.Core.Error_0, ex.Message);
+                AaruConsole.Exception(ex);
 
                 return (int)ErrorNumber.CannotOpenFormat;
             }
         }
         catch(Exception ex)
         {
-            AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
-            AaruConsole.WriteException(ex);
+            AaruConsole.Error(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
+            AaruConsole.Exception(ex);
 
             return (int)ErrorNumber.UnexpectedException;
         }
diff --git a/Aaru/Commands/Image/Options.cs b/Aaru/Commands/Image/Options.cs
index cb5825fba..9e618bb4e 100644
--- a/Aaru/Commands/Image/Options.cs
+++ b/Aaru/Commands/Image/Options.cs
@@ -54,8 +54,8 @@ sealed class ListOptionsCommand : Command<ListOptionsCommand.Settings>
     {
         MainClass.PrintCopyright();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
         Statistics.AddCommand("list-options");
 
         PluginRegister plugins = PluginRegister.Singleton;
diff --git a/Aaru/Commands/Image/Print.cs b/Aaru/Commands/Image/Print.cs
index 5e7dc9204..774b73a67 100644
--- a/Aaru/Commands/Image/Print.cs
+++ b/Aaru/Commands/Image/Print.cs
@@ -55,13 +55,13 @@ sealed class PrintHexCommand : Command<PrintHexCommand.Settings>
 
         Statistics.AddCommand("print-hex");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",        settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",        Markup.Escape(settings.ImagePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--length={0}",       settings.Length);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--long-sectors={0}", settings.LongSectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--start={0}",        settings.Start);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",      settings.Verbose);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--width={0}",        settings.Width);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",        settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",        Markup.Escape(settings.ImagePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--length={0}",       settings.Length);
+        AaruConsole.Debug(MODULE_NAME, "--long-sectors={0}", settings.LongSectors);
+        AaruConsole.Debug(MODULE_NAME, "--start={0}",        settings.Start);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",      settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--width={0}",        settings.Width);
 
         IFilter inputFilter = null;
 
@@ -73,7 +73,7 @@ sealed class PrintHexCommand : Command<PrintHexCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -90,7 +90,7 @@ sealed class PrintHexCommand : Command<PrintHexCommand.Settings>
 
         if(inputFormat == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Unable_to_recognize_image_format_not_printing);
+            AaruConsole.Error(UI.Unable_to_recognize_image_format_not_printing);
 
             return (int)ErrorNumber.UnrecognizedFormat;
         }
@@ -144,7 +144,7 @@ sealed class PrintHexCommand : Command<PrintHexCommand.Settings>
             if(errno == ErrorNumber.NoError)
                 AaruConsole.WriteLine(Markup.Escape(PrintHex.ByteArrayToHexArrayString(data, settings.Width, true)));
             else
-                AaruConsole.ErrorWriteLine(string.Format(UI.Error_0_reading_data_from_1, errno, settings.Start));
+                AaruConsole.Error(string.Format(UI.Error_0_reading_data_from_1, errno, settings.Start));
         }
         else
         {
@@ -152,7 +152,7 @@ sealed class PrintHexCommand : Command<PrintHexCommand.Settings>
             {
                 if(inputFormat is not IMediaImage blockImage)
                 {
-                    AaruConsole.ErrorWriteLine(UI.Cannot_open_image_file_aborting);
+                    AaruConsole.Error(UI.Cannot_open_image_file_aborting);
 
                     break;
                 }
@@ -196,7 +196,7 @@ sealed class PrintHexCommand : Command<PrintHexCommand.Settings>
                                                             true)));
                 }
                 else
-                    AaruConsole.ErrorWriteLine(string.Format(UI.Error_0_reading_sector_1, errno, settings.Start + i));
+                    AaruConsole.Error(string.Format(UI.Error_0_reading_sector_1, errno, settings.Start + i));
             }
         }
 
diff --git a/Aaru/Commands/Image/Verify.cs b/Aaru/Commands/Image/Verify.cs
index e1854092a..efd282801 100644
--- a/Aaru/Commands/Image/Verify.cs
+++ b/Aaru/Commands/Image/Verify.cs
@@ -59,13 +59,13 @@ sealed class VerifyCommand : Command<VerifyCommand.Settings>
 
         Statistics.AddCommand("verify");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",          settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--input={0}",          Markup.Escape(settings.ImagePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",        settings.Verbose);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verify-disc={0}",    settings.VerifyDisc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verify-sectors={0}", settings.VerifySectors);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--create-graph={0}",   settings.CreateGraph);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--dimensions={0}",     settings.Dimensions);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",          settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--input={0}",          Markup.Escape(settings.ImagePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",        settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--verify-disc={0}",    settings.VerifyDisc);
+        AaruConsole.Debug(MODULE_NAME, "--verify-sectors={0}", settings.VerifySectors);
+        AaruConsole.Debug(MODULE_NAME, "--create-graph={0}",   settings.CreateGraph);
+        AaruConsole.Debug(MODULE_NAME, "--dimensions={0}",     settings.Dimensions);
 
         IFilter inputFilter = null;
 
@@ -77,7 +77,7 @@ sealed class VerifyCommand : Command<VerifyCommand.Settings>
 
         if(inputFilter == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Cannot_open_specified_file);
+            AaruConsole.Error(UI.Cannot_open_specified_file);
 
             return (int)ErrorNumber.CannotOpenFile;
         }
@@ -92,7 +92,7 @@ sealed class VerifyCommand : Command<VerifyCommand.Settings>
 
         if(inputFormat == null)
         {
-            AaruConsole.ErrorWriteLine(UI.Unable_to_recognize_image_format_not_verifying);
+            AaruConsole.Error(UI.Unable_to_recognize_image_format_not_verifying);
 
             return (int)ErrorNumber.FormatNotFound;
         }
@@ -125,7 +125,7 @@ sealed class VerifyCommand : Command<VerifyCommand.Settings>
 
         if(verifiableImage is null && verifiableSectorsImage is null)
         {
-            AaruConsole.ErrorWriteLine(UI.The_specified_image_does_not_support_any_kind_of_verification);
+            AaruConsole.Error(UI.The_specified_image_does_not_support_any_kind_of_verification);
 
             return (int)ErrorNumber.NotVerifiable;
         }
@@ -163,7 +163,7 @@ sealed class VerifyCommand : Command<VerifyCommand.Settings>
 
             correctImage = discCheckStatus;
 
-            AaruConsole.VerboseWriteLine(UI.Checking_disc_image_checksums_took_0,
+            AaruConsole.Verbose(UI.Checking_disc_image_checksums_took_0,
                                          chkWatch.Elapsed.Humanize(minUnit: TimeUnit.Second));
         }
 
@@ -390,27 +390,27 @@ sealed class VerifyCommand : Command<VerifyCommand.Settings>
 
         if(unknownLbas.Count == 0 && failingLbas.Count == 0) AaruConsole.WriteLine(UI.All_sector_checksums_are_correct);
 
-        AaruConsole.VerboseWriteLine(UI.Checking_sector_checksums_took_0,
+        AaruConsole.Verbose(UI.Checking_sector_checksums_took_0,
                                      stopwatch.Elapsed.Humanize(minUnit: TimeUnit.Second));
 
         if(settings.Verbose)
         {
-            AaruConsole.VerboseWriteLine($"[red]{UI.LBAs_with_error}[/]");
+            AaruConsole.Verbose($"[red]{UI.LBAs_with_error}[/]");
 
             if(failingLbas.Count == (int)inputFormat.Info.Sectors)
-                AaruConsole.VerboseWriteLine($"\t[red]{UI.all_sectors}[/]");
+                AaruConsole.Verbose($"\t[red]{UI.all_sectors}[/]");
             else
             {
-                foreach(ulong t in failingLbas) AaruConsole.VerboseWriteLine("\t{0}", t);
+                foreach(ulong t in failingLbas) AaruConsole.Verbose("\t{0}", t);
             }
 
             AaruConsole.WriteLine($"[yellow3_1]{UI.LBAs_without_checksum}[/]");
 
             if(unknownLbas.Count == (int)inputFormat.Info.Sectors)
-                AaruConsole.VerboseWriteLine($"\t[yellow3_1]{UI.all_sectors}[/]");
+                AaruConsole.Verbose($"\t[yellow3_1]{UI.all_sectors}[/]");
             else
             {
-                foreach(ulong t in unknownLbas) AaruConsole.VerboseWriteLine("\t{0}", t);
+                foreach(ulong t in unknownLbas) AaruConsole.Verbose("\t{0}", t);
             }
         }
 
diff --git a/Aaru/Commands/ListEncodings.cs b/Aaru/Commands/ListEncodings.cs
index 1d397672a..7332ad614 100644
--- a/Aaru/Commands/ListEncodings.cs
+++ b/Aaru/Commands/ListEncodings.cs
@@ -53,8 +53,8 @@ sealed class ListEncodingsCommand : Command<ListEncodingsCommand.Settings>
 
         Statistics.AddCommand("list-encodings");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
 
         Log.Information(UI.List_encodings_command);
 
diff --git a/Aaru/Commands/ListNamespaces.cs b/Aaru/Commands/ListNamespaces.cs
index 75bea5408..f9e8a8cfc 100644
--- a/Aaru/Commands/ListNamespaces.cs
+++ b/Aaru/Commands/ListNamespaces.cs
@@ -52,8 +52,8 @@ sealed class ListNamespacesCommand : Command<ListNamespacesCommand.Settings>
     {
         MainClass.PrintCopyright();
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
         Statistics.AddCommand("list-namespaces");
 
         Log.Information(UI.List_namespaces_command);
diff --git a/Aaru/Commands/Media/Dump.cs b/Aaru/Commands/Media/Dump.cs
index 731080689..197f32220 100644
--- a/Aaru/Commands/Media/Dump.cs
+++ b/Aaru/Commands/Media/Dump.cs
@@ -85,50 +85,50 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
 
         Statistics.AddCommand("dump-media");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--cicm-xml={0}", Markup.Escape(settings.CicmXml ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}", settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--device={0}", Markup.Escape(settings.DevicePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--encoding={0}", Markup.Escape(settings.Encoding ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--first-pregap={0}", settings.FirstPregap);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--fix-offset={0}", settings.FixOffset);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--force={0}", settings.Force);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--format={0}", Markup.Escape(settings.Format ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--metadata={0}", settings.Metadata);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--options={0}", Markup.Escape(settings.Options ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--output={0}", Markup.Escape(settings.OutputPath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--persistent={0}", settings.Persistent);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--resume={0}", settings.Resume);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--retry-passes={0}", settings.RetryPasses);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--skip={0}", settings.Skip);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--stop-on-error={0}", settings.StopOnError);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--trim={0}", settings.Trim);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}", settings.Verbose);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--subchannel={0}", Markup.Escape(settings.Subchannel ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "----private={0}", settings.Private);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--fix-subchannel-position={0}", settings.FixSubchannelPosition);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--retry-subchannel={0}", settings.RetrySubchannel);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--fix-subchannel={0}", fixSubchannel);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--fix-subchannel-crc={0}", fixSubchannelCrc);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--generate-subchannels={0}", settings.GenerateSubchannels);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--skip-cdiready-hole={0}", settings.SkipCdiReadyHole);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--eject={0}", eject);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--max-blocks={0}", maxBlocks);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--use-buffered-reads={0}", settings.UseBufferedReads);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--store-encrypted={0}", settings.StoreEncrypted);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--title-keys={0}", settings.TitleKeys);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--ignore-cdr-runouts={0}", settings.IgnoreCdrRunOuts);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--create-graph={0}", settings.CreateGraph);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--dimensions={0}", settings.Dimensions);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--aaru-metadata={0}", Markup.Escape(settings.AaruMetadata ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--cicm-xml={0}", Markup.Escape(settings.CicmXml ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}", settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--device={0}", Markup.Escape(settings.DevicePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--encoding={0}", Markup.Escape(settings.Encoding ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--first-pregap={0}", settings.FirstPregap);
+        AaruConsole.Debug(MODULE_NAME, "--fix-offset={0}", settings.FixOffset);
+        AaruConsole.Debug(MODULE_NAME, "--force={0}", settings.Force);
+        AaruConsole.Debug(MODULE_NAME, "--format={0}", Markup.Escape(settings.Format ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--metadata={0}", settings.Metadata);
+        AaruConsole.Debug(MODULE_NAME, "--options={0}", Markup.Escape(settings.Options ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--output={0}", Markup.Escape(settings.OutputPath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--persistent={0}", settings.Persistent);
+        AaruConsole.Debug(MODULE_NAME, "--resume={0}", settings.Resume);
+        AaruConsole.Debug(MODULE_NAME, "--retry-passes={0}", settings.RetryPasses);
+        AaruConsole.Debug(MODULE_NAME, "--skip={0}", settings.Skip);
+        AaruConsole.Debug(MODULE_NAME, "--stop-on-error={0}", settings.StopOnError);
+        AaruConsole.Debug(MODULE_NAME, "--trim={0}", settings.Trim);
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--subchannel={0}", Markup.Escape(settings.Subchannel ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "----private={0}", settings.Private);
+        AaruConsole.Debug(MODULE_NAME, "--fix-subchannel-position={0}", settings.FixSubchannelPosition);
+        AaruConsole.Debug(MODULE_NAME, "--retry-subchannel={0}", settings.RetrySubchannel);
+        AaruConsole.Debug(MODULE_NAME, "--fix-subchannel={0}", fixSubchannel);
+        AaruConsole.Debug(MODULE_NAME, "--fix-subchannel-crc={0}", fixSubchannelCrc);
+        AaruConsole.Debug(MODULE_NAME, "--generate-subchannels={0}", settings.GenerateSubchannels);
+        AaruConsole.Debug(MODULE_NAME, "--skip-cdiready-hole={0}", settings.SkipCdiReadyHole);
+        AaruConsole.Debug(MODULE_NAME, "--eject={0}", eject);
+        AaruConsole.Debug(MODULE_NAME, "--max-blocks={0}", maxBlocks);
+        AaruConsole.Debug(MODULE_NAME, "--use-buffered-reads={0}", settings.UseBufferedReads);
+        AaruConsole.Debug(MODULE_NAME, "--store-encrypted={0}", settings.StoreEncrypted);
+        AaruConsole.Debug(MODULE_NAME, "--title-keys={0}", settings.TitleKeys);
+        AaruConsole.Debug(MODULE_NAME, "--ignore-cdr-runouts={0}", settings.IgnoreCdrRunOuts);
+        AaruConsole.Debug(MODULE_NAME, "--create-graph={0}", settings.CreateGraph);
+        AaruConsole.Debug(MODULE_NAME, "--dimensions={0}", settings.Dimensions);
+        AaruConsole.Debug(MODULE_NAME, "--aaru-metadata={0}", Markup.Escape(settings.AaruMetadata ?? ""));
 
         // TODO: Disabled temporarily
         //AaruConsole.DebugWriteLine(MODULE_NAME, "--raw={0}", Markup.Escape(raw ?? ""));
 
         Dictionary<string, string> parsedOptions = Options.Parse(settings.Options);
-        AaruConsole.DebugWriteLine(MODULE_NAME, UI.Parsed_options);
+        AaruConsole.Debug(MODULE_NAME, UI.Parsed_options);
 
         foreach(KeyValuePair<string, string> parsedOption in parsedOptions)
-            AaruConsole.DebugWriteLine(MODULE_NAME, "{0} = {1}", parsedOption.Key, parsedOption.Value);
+            AaruConsole.Debug(MODULE_NAME, "{0} = {1}", parsedOption.Key, parsedOption.Value);
 
         Encoding encodingClass = null;
 
@@ -138,11 +138,11 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
             {
                 encodingClass = Claunia.Encoding.Encoding.GetEncoding(settings.Encoding);
 
-                if(settings.Verbose) AaruConsole.VerboseWriteLine(UI.encoding_for_0, encodingClass.EncodingName);
+                if(settings.Verbose) AaruConsole.Verbose(UI.encoding_for_0, encodingClass.EncodingName);
             }
             catch(ArgumentException)
             {
-                AaruConsole.ErrorWriteLine(UI.Specified_encoding_is_not_supported);
+                AaruConsole.Error(UI.Specified_encoding_is_not_supported);
 
                 return (int)ErrorNumber.EncodingUnknown;
             }
@@ -233,7 +233,7 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
 
             if(responseLine.Any(c => c < 0x20))
             {
-                AaruConsole.ErrorWriteLine(UI.Invalid_characters_found_in_list_of_files);
+                AaruConsole.Error(UI.Invalid_characters_found_in_list_of_files);
 
                 return (int)ErrorNumber.InvalidArgument;
             }
@@ -279,7 +279,7 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
             {
                 case null:
                 {
-                    AaruConsole.ErrorWriteLine(string.Format(UI.Could_not_open_device_error_0, devErrno));
+                    AaruConsole.Error(string.Format(UI.Could_not_open_device_error_0, devErrno));
 
                     if(isResponse) continue;
 
@@ -297,7 +297,7 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
 
             if(dev.Error)
             {
-                AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
+                AaruConsole.Error(Error.Print(dev.LastError));
 
                 if(isResponse) continue;
 
@@ -346,7 +346,7 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
                 }
                 catch
                 {
-                    AaruConsole.ErrorWriteLine(UI.Incorrect_resume_file_not_continuing);
+                    AaruConsole.Error(UI.Incorrect_resume_file_not_continuing);
 
                     if(isResponse) continue;
 
@@ -386,7 +386,7 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
                     }
                     catch
                     {
-                        AaruConsole.ErrorWriteLine(UI.Incorrect_metadata_sidecar_file_not_continuing);
+                        AaruConsole.Error(UI.Incorrect_metadata_sidecar_file_not_continuing);
 
                         if(isResponse) continue;
 
@@ -395,7 +395,7 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine(UI.Could_not_find_metadata_sidecar);
+                    AaruConsole.Error(UI.Could_not_find_metadata_sidecar);
 
                     if(isResponse) continue;
 
@@ -424,7 +424,7 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
                     }
                     catch
                     {
-                        AaruConsole.ErrorWriteLine(UI.Incorrect_metadata_sidecar_file_not_continuing);
+                        AaruConsole.Error(UI.Incorrect_metadata_sidecar_file_not_continuing);
 
                         if(isResponse) continue;
 
@@ -433,7 +433,7 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine(UI.Could_not_find_metadata_sidecar);
+                    AaruConsole.Error(UI.Could_not_find_metadata_sidecar);
 
                     if(isResponse) continue;
 
@@ -479,7 +479,7 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
             if(settings.Verbose)
             {
                 dumpLog.WriteLine(UI.Output_image_format_0_1, outputFormat.Name, outputFormat.Id);
-                AaruConsole.VerboseWriteLine(UI.Output_image_format_0_1, outputFormat.Name, outputFormat.Id);
+                AaruConsole.Verbose(UI.Output_image_format_0_1, outputFormat.Name, outputFormat.Id);
             }
             else
             {
@@ -539,12 +539,12 @@ sealed class DumpMediaCommand : Command<DumpMediaCommand.Settings>
 
                             dumper.ErrorMessage += text =>
                                 {
-                                    AaruConsole.ErrorWriteLine($"[red]{Markup.Escape(text)}[/]");
+                                    AaruConsole.Error($"[red]{Markup.Escape(text)}[/]");
                                 };
 
                             dumper.StoppingErrorMessage += text =>
                             {
-                                AaruConsole.ErrorWriteLine($"[red]{Markup.Escape(text)}[/]");
+                                AaruConsole.Error($"[red]{Markup.Escape(text)}[/]");
                             };
 
                             dumper.UpdateProgress += (text, current, maximum) =>
diff --git a/Aaru/Commands/Media/Info.cs b/Aaru/Commands/Media/Info.cs
index 37eae1f5d..2b721d2d1 100644
--- a/Aaru/Commands/Media/Info.cs
+++ b/Aaru/Commands/Media/Info.cs
@@ -73,10 +73,10 @@ sealed class MediaInfoCommand : Command<MediaInfoCommand.Settings>
 
         Statistics.AddCommand("media-info");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "debug={0}",         settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "device={0}",        Markup.Escape(settings.DevicePath   ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "output-prefix={0}", Markup.Escape(settings.OutputPrefix ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "verbose={0}",       settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "debug={0}",         settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "device={0}",        Markup.Escape(settings.DevicePath   ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "output-prefix={0}", Markup.Escape(settings.OutputPrefix ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "verbose={0}",       settings.Verbose);
 
         string devicePath = settings.DevicePath;
 
@@ -95,7 +95,7 @@ sealed class MediaInfoCommand : Command<MediaInfoCommand.Settings>
         switch(dev)
         {
             case null:
-                AaruConsole.ErrorWriteLine(string.Format(UI.Could_not_open_device_error_0, devErrno));
+                AaruConsole.Error(string.Format(UI.Could_not_open_device_error_0, devErrno));
 
                 return (int)devErrno;
             case Devices.Remote.Device remoteDev:
@@ -110,7 +110,7 @@ sealed class MediaInfoCommand : Command<MediaInfoCommand.Settings>
 
         if(dev.Error)
         {
-            AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
+            AaruConsole.Error(Error.Print(dev.LastError));
 
             return (int)ErrorNumber.CannotOpenDevice;
         }
@@ -144,7 +144,7 @@ sealed class MediaInfoCommand : Command<MediaInfoCommand.Settings>
         return (int)ErrorNumber.NoError;
     }
 
-    static void DoAtaMediaInfo() => AaruConsole.ErrorWriteLine(UI.Please_use_device_info_command_for_ATA_devices);
+    static void DoAtaMediaInfo() => AaruConsole.Error(UI.Please_use_device_info_command_for_ATA_devices);
 
     // ReSharper disable UnusedParameter.Local
     static void DoNvmeMediaInfo(string outputPrefix, Devices.Device dev) =>
@@ -152,7 +152,7 @@ sealed class MediaInfoCommand : Command<MediaInfoCommand.Settings>
 
     // ReSharper restore UnusedParameter.Local
 
-    static void DoSdMediaInfo() => AaruConsole.ErrorWriteLine(UI.Please_use_device_info_command_for_MMC_SD_devices);
+    static void DoSdMediaInfo() => AaruConsole.Error(UI.Please_use_device_info_command_for_MMC_SD_devices);
 
     static void DoScsiMediaInfo(bool debug, string outputPrefix, Devices.Device dev)
     {
diff --git a/Aaru/Commands/Media/Scan.cs b/Aaru/Commands/Media/Scan.cs
index 8a3122b01..bef9e8a4a 100644
--- a/Aaru/Commands/Media/Scan.cs
+++ b/Aaru/Commands/Media/Scan.cs
@@ -56,12 +56,12 @@ sealed class MediaScanCommand : Command<MediaScanCommand.Settings>
 
         Statistics.AddCommand("media-scan");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--debug={0}",              settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--device={0}",             Markup.Escape(settings.DevicePath ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--ibg-log={0}",            Markup.Escape(settings.IbgLog     ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--mhdd-log={0}",           Markup.Escape(settings.MhddLog    ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--verbose={0}",            settings.Verbose);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "--use-buffered-reads={0}", settings.UseBufferedReads);
+        AaruConsole.Debug(MODULE_NAME, "--debug={0}",              settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "--device={0}",             Markup.Escape(settings.DevicePath ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--ibg-log={0}",            Markup.Escape(settings.IbgLog     ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--mhdd-log={0}",           Markup.Escape(settings.MhddLog    ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "--verbose={0}",            settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "--use-buffered-reads={0}", settings.UseBufferedReads);
 
         string devicePath = settings.DevicePath;
 
@@ -80,7 +80,7 @@ sealed class MediaScanCommand : Command<MediaScanCommand.Settings>
         switch(dev)
         {
             case null:
-                AaruConsole.ErrorWriteLine(string.Format(UI.Could_not_open_device_error_0, devErrno));
+                AaruConsole.Error(string.Format(UI.Could_not_open_device_error_0, devErrno));
 
                 return (int)devErrno;
             case Devices.Remote.Device remoteDev:
@@ -95,7 +95,7 @@ sealed class MediaScanCommand : Command<MediaScanCommand.Settings>
 
         if(dev.Error)
         {
-            AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
+            AaruConsole.Error(Error.Print(dev.LastError));
 
             return (int)ErrorNumber.CannotOpenDevice;
         }
@@ -115,7 +115,7 @@ sealed class MediaScanCommand : Command<MediaScanCommand.Settings>
 
                         scanner.StoppingErrorMessage += text =>
                             {
-                                AaruConsole.ErrorWriteLine($"[red]{Markup.Escape(text)}[/]");
+                                AaruConsole.Error($"[red]{Markup.Escape(text)}[/]");
                             };
 
                         scanner.UpdateProgress += (text, current, maximum) =>
diff --git a/Aaru/Commands/Remote.cs b/Aaru/Commands/Remote.cs
index c2a735ee8..566e6720b 100644
--- a/Aaru/Commands/Remote.cs
+++ b/Aaru/Commands/Remote.cs
@@ -53,9 +53,9 @@ sealed class RemoteCommand : Command<RemoteCommand.Settings>
 
         Statistics.AddCommand("remote");
 
-        AaruConsole.DebugWriteLine(MODULE_NAME, "debug={0}",   settings.Debug);
-        AaruConsole.DebugWriteLine(MODULE_NAME, "host={0}",    Markup.Escape(settings.Host ?? ""));
-        AaruConsole.DebugWriteLine(MODULE_NAME, "verbose={0}", settings.Verbose);
+        AaruConsole.Debug(MODULE_NAME, "debug={0}",   settings.Debug);
+        AaruConsole.Debug(MODULE_NAME, "host={0}",    Markup.Escape(settings.Host ?? ""));
+        AaruConsole.Debug(MODULE_NAME, "verbose={0}", settings.Verbose);
 
         try
         {
@@ -89,7 +89,7 @@ sealed class RemoteCommand : Command<RemoteCommand.Settings>
         }
         catch(Exception)
         {
-            AaruConsole.ErrorWriteLine("Error connecting to host.");
+            AaruConsole.Error("Error connecting to host.");
 
             return (int)ErrorNumber.CannotOpenDevice;
         }
diff --git a/Aaru/Main.cs b/Aaru/Main.cs
index b58031332..f7b9201ee 100644
--- a/Aaru/Main.cs
+++ b/Aaru/Main.cs
@@ -102,7 +102,7 @@ class MainClass
                 AnsiConsole.Markup(format, objects);
         };
 
-        AaruConsole.ErrorWriteLineEvent += (format, objects) =>
+        AaruConsole.ErrorEvent += (format, objects) =>
         {
             if(objects is null)
                 stderrConsole.MarkupLine(format);
@@ -112,9 +112,9 @@ class MainClass
             Log.Error(format, objects);
         };
 
-        AaruConsole.VerboseWriteLineEvent += Log.Verbose;
+        AaruConsole.VerboseEvent += Log.Verbose;
 
-        AaruConsole.DebugWriteLineEvent += Log.Debug;
+        AaruConsole.DebugEvent += Log.Debug;
 
         AaruConsole.WriteExceptionEvent += ex => Log.Error(ex, "Unhandled exception");
 
@@ -207,8 +207,8 @@ class MainClass
             }
             catch(Exception)
             {
-                AaruConsole.ErrorWriteLine(UI.Exception_trying_to_remove_old_database_version);
-                AaruConsole.ErrorWriteLine(UI.Please_manually_remove_file_at_0, Settings.Settings.MainDbPath);
+                AaruConsole.Error(UI.Exception_trying_to_remove_old_database_version);
+                AaruConsole.Error(UI.Please_manually_remove_file_at_0, Settings.Settings.MainDbPath);
 
                 return (int)ErrorNumber.CannotRemoveDatabase;
             }