From 363cdbdd372d75837d09da57d268a39e5044dfc8 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Wed, 19 Nov 2025 05:26:14 +0000
Subject: [PATCH] [GUI] Use compiled bindings.

---
 Aaru.Gui/Aaru.Gui.csproj                          |  1 +
 Aaru.Gui/Models/SubdirectoryModel.cs              |  1 +
 Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs |  4 ++++
 .../ViewModels/Panels/SubdirectoryViewModel.cs    | 11 ++++++-----
 Aaru.Gui/Views/Dialogs/About.xaml                 |  1 +
 Aaru.Gui/Views/Dialogs/Console.xaml               |  1 +
 Aaru.Gui/Views/Dialogs/Encodings.xaml             |  1 +
 Aaru.Gui/Views/Dialogs/LicenseDialog.xaml         |  1 +
 Aaru.Gui/Views/Dialogs/PluginsDialog.xaml         |  1 +
 Aaru.Gui/Views/Dialogs/SettingsDialog.xaml        |  1 +
 Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml      |  1 +
 Aaru.Gui/Views/Panels/DeviceInfo.xaml             |  1 +
 Aaru.Gui/Views/Panels/FileSystem.xaml             |  1 +
 Aaru.Gui/Views/Panels/ImageInfo.xaml              |  1 +
 Aaru.Gui/Views/Panels/MediaInfo.xaml              |  1 +
 Aaru.Gui/Views/Panels/Partition.xaml              |  1 +
 Aaru.Gui/Views/Panels/Subdirectory.xaml           |  1 +
 Aaru.Gui/Views/Tabs/AtaInfo.xaml                  |  1 +
 Aaru.Gui/Views/Tabs/BlurayInfo.xaml               |  1 +
 Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml          |  1 +
 Aaru.Gui/Views/Tabs/DvdInfo.xaml                  |  1 +
 Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml          |  1 +
 Aaru.Gui/Views/Tabs/PcmciaInfo.xaml               |  1 +
 Aaru.Gui/Views/Tabs/ScsiInfo.xaml                 |  1 +
 Aaru.Gui/Views/Tabs/SdMmcInfo.xaml                |  1 +
 Aaru.Gui/Views/Tabs/XboxInfo.xaml                 |  1 +
 Aaru.Gui/Views/Windows/DecodeMediaTags.xaml       |  1 +
 Aaru.Gui/Views/Windows/IbgLogView.axaml           |  1 +
 Aaru.Gui/Views/Windows/ImageChecksum.xaml         |  1 +
 Aaru.Gui/Views/Windows/ImageConvert.xaml          |  1 +
 Aaru.Gui/Views/Windows/ImageEntropy.xaml          |  1 +
 Aaru.Gui/Views/Windows/ImageSidecar.xaml          |  1 +
 Aaru.Gui/Views/Windows/ImageVerify.xaml           |  1 +
 Aaru.Gui/Views/Windows/MainWindow.axaml           | 15 ++++++++-------
 Aaru.Gui/Views/Windows/MediaDump.xaml             |  1 +
 Aaru.Gui/Views/Windows/MediaScan.xaml             |  1 +
 Aaru.Gui/Views/Windows/SplashWindow.xaml          |  1 +
 Aaru.Gui/Views/Windows/ViewSector.xaml            |  1 +
 38 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
index 594360b37..cfa8cf095 100644
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -5,6 +5,7 @@
     <Title>Aaru Data Preservation Suite</Title>
     <NoWarn>CS0649,CS0169</NoWarn>
     <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <NoWarn>CS1591;CS1574</NoWarn>
diff --git a/Aaru.Gui/Models/SubdirectoryModel.cs b/Aaru.Gui/Models/SubdirectoryModel.cs
index 26550aac2..e1a3582f5 100644
--- a/Aaru.Gui/Models/SubdirectoryModel.cs
+++ b/Aaru.Gui/Models/SubdirectoryModel.cs
@@ -32,6 +32,7 @@
 
 using System.Collections.ObjectModel;
 using Aaru.CommonTypes.Interfaces;
+using Avalonia.Media;
 using Avalonia.Media.Imaging;
 
 namespace Aaru.Gui.Models;
diff --git a/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
index f7a52c91f..950751a65 100644
--- a/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
@@ -199,6 +199,8 @@ public sealed partial class DeviceInfoViewModel : ViewModelBase
     [ObservableProperty]
     bool _removable;
     [ObservableProperty]
+    bool _removableChecked;
+    [ObservableProperty]
     string _revision;
     [ObservableProperty]
     bool _saveUsbDescriptorsEnabled;
@@ -213,6 +215,8 @@ public sealed partial class DeviceInfoViewModel : ViewModelBase
     [ObservableProperty]
     SdMmcInfo _sdMmcInfo;
     [ObservableProperty]
+    string _sdMmcText;
+    [ObservableProperty]
     string _secureDigital;
     [ObservableProperty]
     string _serial;
diff --git a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
index a214a222c..0818610f3 100644
--- a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
@@ -116,11 +116,11 @@ public sealed class SubdirectoryViewModel
                 Name = dirent,
                 Stat = stat,
                 Color =
-                    new SolidColorBrush(Color.Parse(DirColorsParser.Instance.ExtensionColors
-                                                                   .TryGetValue(Path.GetExtension(dirent),
-                                                                                    out string hex)
-                                                        ? hex
-                                                        : DirColorsParser.Instance.NormalColor))
+                    new SolidColorBrush(Avalonia.Media.Color.Parse(DirColorsParser.Instance.ExtensionColors
+                                                                      .TryGetValue(Path.GetExtension(dirent),
+                                                                           out string hex)
+                                                                       ? hex
+                                                                       : DirColorsParser.Instance.NormalColor))
             });
         }
 
@@ -130,6 +130,7 @@ public sealed class SubdirectoryViewModel
     public ObservableCollection<FileModel> Entries             { get; }
     public List<FileModel>                 SelectedEntries     { get; }
     public ICommand                        ExtractFilesCommand { get; }
+    public IBrush                          Color               { get; }
 
     async Task ExtractFiles()
     {
diff --git a/Aaru.Gui/Views/Dialogs/About.xaml b/Aaru.Gui/Views/Dialogs/About.xaml
index 6a5a90227..0c8802f68 100644
--- a/Aaru.Gui/Views/Dialogs/About.xaml
+++ b/Aaru.Gui/Views/Dialogs/About.xaml
@@ -46,6 +46,7 @@
         x:Class="Aaru.Gui.Views.Dialogs.About"
         Icon="/Assets/aaru-logo.png"
         CanResize="False"
+        x:DataType="dialogs:AboutViewModel"
         Title="{x:Static localization:UI.Title_About_Aaru}">
     <Design.DataContext>
         <dialogs:AboutViewModel />
diff --git a/Aaru.Gui/Views/Dialogs/Console.xaml b/Aaru.Gui/Views/Dialogs/Console.xaml
index f7c59dd2e..6652ac5b3 100644
--- a/Aaru.Gui/Views/Dialogs/Console.xaml
+++ b/Aaru.Gui/Views/Dialogs/Console.xaml
@@ -45,6 +45,7 @@
         Height="450"
         x:Class="Aaru.Gui.Views.Dialogs.Console"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="dialogs:ConsoleViewModel"
         Title="{x:Static localization:UI.Title_Console}">
     <Design.DataContext>
         <dialogs:ConsoleViewModel />
diff --git a/Aaru.Gui/Views/Dialogs/Encodings.xaml b/Aaru.Gui/Views/Dialogs/Encodings.xaml
index b485493a3..31b593173 100644
--- a/Aaru.Gui/Views/Dialogs/Encodings.xaml
+++ b/Aaru.Gui/Views/Dialogs/Encodings.xaml
@@ -46,6 +46,7 @@
         x:Class="Aaru.Gui.Views.Dialogs.Encodings"
         Icon="/Assets/aaru-logo.png"
         CanResize="False"
+        x:DataType="dialogs:EncodingsViewModel"
         Title="{x:Static localization:UI.Encodings}">
     <Design.DataContext>
         <dialogs:EncodingsViewModel />
diff --git a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
index 2a3d071c9..593ffb162 100644
--- a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml
@@ -46,6 +46,7 @@
         x:Class="Aaru.Gui.Views.Dialogs.LicenseDialog"
         Icon="/Assets/aaru-logo.png"
         CanResize="False"
+        x:DataType="dialogs:LicenseViewModel"
         Title="{x:Static localization:UI.Title_Aaru_license}">
     <Design.DataContext>
         <dialogs:LicenseViewModel />
diff --git a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
index bce06310b..329ff5b8c 100644
--- a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml
@@ -45,6 +45,7 @@
         Height="600"
         x:Class="Aaru.Gui.Views.Dialogs.PluginsDialog"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="dialogs:PluginsViewModel"
         Title="{x:Static localization:UI.Title_Plugins}">
     <Design.DataContext>
         <dialogs:PluginsViewModel />
diff --git a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
index 91c4ad0f5..e993f669f 100644
--- a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml
@@ -45,6 +45,7 @@
         x:Class="Aaru.Gui.Views.Dialogs.SettingsDialog"
         Icon="/Assets/aaru-logo.png"
         CanResize="False"
+        x:DataType="dialogs:SettingsViewModel"
         Title="{x:Static localization:UI.Title_Settings}">
     <Design.DataContext>
         <dialogs:SettingsViewModel />
diff --git a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
index 954420bc8..2b9cd2e1f 100644
--- a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
+++ b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml
@@ -46,6 +46,7 @@
         x:Class="Aaru.Gui.Views.Dialogs.StatisticsDialog"
         Icon="/Assets/aaru-logo.png"
         CanResize="False"
+        x:DataType="dialogs:StatisticsViewModel"
         Title="{x:Static localization:UI.Title_Statistics}">
     <Design.DataContext>
         <dialogs:StatisticsViewModel />
diff --git a/Aaru.Gui/Views/Panels/DeviceInfo.xaml b/Aaru.Gui/Views/Panels/DeviceInfo.xaml
index 986b71196..f5b836c48 100644
--- a/Aaru.Gui/Views/Panels/DeviceInfo.xaml
+++ b/Aaru.Gui/Views/Panels/DeviceInfo.xaml
@@ -40,6 +40,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="panels:DeviceInfoViewModel"
              x:Class="Aaru.Gui.Views.Panels.DeviceInfo">
     <Design.DataContext>
         <panels:DeviceInfoViewModel />
diff --git a/Aaru.Gui/Views/Panels/FileSystem.xaml b/Aaru.Gui/Views/Panels/FileSystem.xaml
index dce90626a..5cefa31a3 100644
--- a/Aaru.Gui/Views/Panels/FileSystem.xaml
+++ b/Aaru.Gui/Views/Panels/FileSystem.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="panels:FileSystemViewModel"
              x:Class="Aaru.Gui.Views.Panels.FileSystem">
     <Design.DataContext>
         <panels:FileSystemViewModel />
diff --git a/Aaru.Gui/Views/Panels/ImageInfo.xaml b/Aaru.Gui/Views/Panels/ImageInfo.xaml
index 5822bfc76..cb40e0bcd 100644
--- a/Aaru.Gui/Views/Panels/ImageInfo.xaml
+++ b/Aaru.Gui/Views/Panels/ImageInfo.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="panels:ImageInfoViewModel"
              x:Class="Aaru.Gui.Views.Panels.ImageInfo">
     <Design.DataContext>
         <panels:ImageInfoViewModel />
diff --git a/Aaru.Gui/Views/Panels/MediaInfo.xaml b/Aaru.Gui/Views/Panels/MediaInfo.xaml
index 7d74ac658..1fdb7133b 100644
--- a/Aaru.Gui/Views/Panels/MediaInfo.xaml
+++ b/Aaru.Gui/Views/Panels/MediaInfo.xaml
@@ -40,6 +40,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="panels:MediaInfoViewModel"
              x:Class="Aaru.Gui.Views.Panels.MediaInfo">
     <Design.DataContext>
         <panels:MediaInfoViewModel />
diff --git a/Aaru.Gui/Views/Panels/Partition.xaml b/Aaru.Gui/Views/Panels/Partition.xaml
index 1a0ac4ce2..9b1d3be09 100644
--- a/Aaru.Gui/Views/Panels/Partition.xaml
+++ b/Aaru.Gui/Views/Panels/Partition.xaml
@@ -40,6 +40,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="panels:PartitionViewModel"
              x:Class="Aaru.Gui.Views.Panels.Partition">
     <Design.DataContext>
         <panels:PartitionViewModel />
diff --git a/Aaru.Gui/Views/Panels/Subdirectory.xaml b/Aaru.Gui/Views/Panels/Subdirectory.xaml
index a25016917..f4d0c0e85 100644
--- a/Aaru.Gui/Views/Panels/Subdirectory.xaml
+++ b/Aaru.Gui/Views/Panels/Subdirectory.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="panels:SubdirectoryViewModel"
              x:Class="Aaru.Gui.Views.Panels.Subdirectory">
     <Design.DataContext>
         <panels:SubdirectoryViewModel />
diff --git a/Aaru.Gui/Views/Tabs/AtaInfo.xaml b/Aaru.Gui/Views/Tabs/AtaInfo.xaml
index 13d5de1cd..9553f1da6 100644
--- a/Aaru.Gui/Views/Tabs/AtaInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/AtaInfo.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="tabs:AtaInfoViewModel"
              x:Class="Aaru.Gui.Views.Tabs.AtaInfo">
     <Design.DataContext>
         <tabs:AtaInfoViewModel />
diff --git a/Aaru.Gui/Views/Tabs/BlurayInfo.xaml b/Aaru.Gui/Views/Tabs/BlurayInfo.xaml
index 8393eb30b..366d6ee4b 100644
--- a/Aaru.Gui/Views/Tabs/BlurayInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/BlurayInfo.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="tabs:BlurayInfoViewModel"
              x:Class="Aaru.Gui.Views.Tabs.BlurayInfo">
     <Design.DataContext>
         <tabs:BlurayInfoViewModel />
diff --git a/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml b/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml
index 280678e41..f89ecc22f 100644
--- a/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="tabs:CompactDiscInfoViewModel"
              x:Class="Aaru.Gui.Views.Tabs.CompactDiscInfo">
     <Design.DataContext>
         <tabs:CompactDiscInfoViewModel />
diff --git a/Aaru.Gui/Views/Tabs/DvdInfo.xaml b/Aaru.Gui/Views/Tabs/DvdInfo.xaml
index d34f5f269..1158b4393 100644
--- a/Aaru.Gui/Views/Tabs/DvdInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/DvdInfo.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="tabs:DvdInfoViewModel"
              x:Class="Aaru.Gui.Views.Tabs.DvdInfo">
     <Design.DataContext>
         <tabs:DvdInfoViewModel />
diff --git a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
index fbe94f8ae..505cab1a3 100644
--- a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="tabs:DvdWritableInfoViewModel"
              x:Class="Aaru.Gui.Views.Tabs.DvdWritableInfo">
     <Design.DataContext>
         <tabs:DvdWritableInfoViewModel />
diff --git a/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml b/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml
index 3270fe924..3e7830d0a 100644
--- a/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="tabs:PcmciaInfoViewModel"
              x:Class="Aaru.Gui.Views.Tabs.PcmciaInfo">
     <Design.DataContext>
         <tabs:PcmciaInfoViewModel />
diff --git a/Aaru.Gui/Views/Tabs/ScsiInfo.xaml b/Aaru.Gui/Views/Tabs/ScsiInfo.xaml
index 852bc0946..ae85cef33 100644
--- a/Aaru.Gui/Views/Tabs/ScsiInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/ScsiInfo.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="tabs:ScsiInfoViewModel"
              x:Class="Aaru.Gui.Views.Tabs.ScsiInfo">
     <Design.DataContext>
         <tabs:ScsiInfoViewModel />
diff --git a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
index e6a16c565..47bf548bd 100644
--- a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml
@@ -41,6 +41,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="tabs:SdMmcInfoViewModel"
              x:Class="Aaru.Gui.Views.Tabs.SdMmcInfo">
     <Design.DataContext>
         <tabs:SdMmcInfoViewModel />
diff --git a/Aaru.Gui/Views/Tabs/XboxInfo.xaml b/Aaru.Gui/Views/Tabs/XboxInfo.xaml
index 904fe0443..8b837eedd 100644
--- a/Aaru.Gui/Views/Tabs/XboxInfo.xaml
+++ b/Aaru.Gui/Views/Tabs/XboxInfo.xaml
@@ -40,6 +40,7 @@
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
+             x:DataType="tabs:XboxInfoViewModel"
              x:Class="Aaru.Gui.Views.Tabs.XboxInfo">
     <Design.DataContext>
         <tabs:XboxInfoViewModel />
diff --git a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml
index 62088a947..0486d21e1 100644
--- a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml
+++ b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml
@@ -45,6 +45,7 @@
         Height="480"
         x:Class="Aaru.Gui.Views.Windows.DecodeMediaTags"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:DecodeMediaTagsViewModel"
         Title="{x:Static localization:UI.Title_Decode_media_tags}">
     <Design.DataContext>
         <windows:DecodeMediaTagsViewModel />
diff --git a/Aaru.Gui/Views/Windows/IbgLogView.axaml b/Aaru.Gui/Views/Windows/IbgLogView.axaml
index a48d70fd8..a08608722 100644
--- a/Aaru.Gui/Views/Windows/IbgLogView.axaml
+++ b/Aaru.Gui/Views/Windows/IbgLogView.axaml
@@ -9,6 +9,7 @@
         d:DesignWidth="800"
         d:DesignHeight="450"
         x:Class="Aaru.Gui.Views.Windows.IbgLogView"
+        x:DataType="windows:IbgLogViewModel"
         Title="{x:Static localization:UI.Title_IMGBurn_log_viewer}">
     <Design.DataContext>
         <windows:IbgLogViewModel />
diff --git a/Aaru.Gui/Views/Windows/ImageChecksum.xaml b/Aaru.Gui/Views/Windows/ImageChecksum.xaml
index da8dff608..08ef723e1 100644
--- a/Aaru.Gui/Views/Windows/ImageChecksum.xaml
+++ b/Aaru.Gui/Views/Windows/ImageChecksum.xaml
@@ -45,6 +45,7 @@
         Height="600"
         x:Class="Aaru.Gui.Views.Windows.ImageChecksum"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:ImageChecksumViewModel"
         Title="{x:Static localization:UI.Title_Checksum_image_contents}">
     <Design.DataContext>
         <windows:ImageChecksumViewModel />
diff --git a/Aaru.Gui/Views/Windows/ImageConvert.xaml b/Aaru.Gui/Views/Windows/ImageConvert.xaml
index 38c7be222..601a6629e 100644
--- a/Aaru.Gui/Views/Windows/ImageConvert.xaml
+++ b/Aaru.Gui/Views/Windows/ImageConvert.xaml
@@ -45,6 +45,7 @@
         Height="832"
         x:Class="Aaru.Gui.Views.Windows.ImageConvert"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:ImageConvertViewModel"
         Title="{x:Static localization:UI.Title_Convert_image}">
     <Design.DataContext>
         <windows:ImageConvertViewModel />
diff --git a/Aaru.Gui/Views/Windows/ImageEntropy.xaml b/Aaru.Gui/Views/Windows/ImageEntropy.xaml
index 7486f278c..6c7d74511 100644
--- a/Aaru.Gui/Views/Windows/ImageEntropy.xaml
+++ b/Aaru.Gui/Views/Windows/ImageEntropy.xaml
@@ -45,6 +45,7 @@
         Height="320"
         x:Class="Aaru.Gui.Views.Windows.ImageEntropy"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:ImageEntropyViewModel"
         Title="{x:Static localization:UI.Title_Calculating_entropy}">
     <Design.DataContext>
         <windows:ImageEntropyViewModel />
diff --git a/Aaru.Gui/Views/Windows/ImageSidecar.xaml b/Aaru.Gui/Views/Windows/ImageSidecar.xaml
index 7a74effdd..3ec61db41 100644
--- a/Aaru.Gui/Views/Windows/ImageSidecar.xaml
+++ b/Aaru.Gui/Views/Windows/ImageSidecar.xaml
@@ -46,6 +46,7 @@
         x:Class="Aaru.Gui.Views.Windows.ImageSidecar"
         Icon="/Assets/aaru-logo.png"
         CanResize="False"
+        x:DataType="windows:ImageSidecarViewModel"
         Title="Image sidecar creation">
     <Design.DataContext>
         <windows:ImageSidecarViewModel />
diff --git a/Aaru.Gui/Views/Windows/ImageVerify.xaml b/Aaru.Gui/Views/Windows/ImageVerify.xaml
index fe1aeaf13..44cf725b3 100644
--- a/Aaru.Gui/Views/Windows/ImageVerify.xaml
+++ b/Aaru.Gui/Views/Windows/ImageVerify.xaml
@@ -45,6 +45,7 @@
         Height="400"
         x:Class="Aaru.Gui.Views.Windows.ImageVerify"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:ImageVerifyViewModel"
         Title="{x:Static localization:UI.Title_Verify_image}">
     <Design.DataContext>
         <windows:ImageVerifyViewModel />
diff --git a/Aaru.Gui/Views/Windows/MainWindow.axaml b/Aaru.Gui/Views/Windows/MainWindow.axaml
index 7a93c0e35..7f4fdf143 100644
--- a/Aaru.Gui/Views/Windows/MainWindow.axaml
+++ b/Aaru.Gui/Views/Windows/MainWindow.axaml
@@ -10,6 +10,7 @@
         d:DesignHeight="450"
         x:Class="Aaru.Gui.Views.Windows.MainWindow"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:MainWindowViewModel"
         Title="{Binding Title, Mode=OneWay}">
     <Design.DataContext>
         <windows:MainWindowViewModel />
@@ -86,19 +87,19 @@
                             <StackPanel.ContextMenu>
                                 <ContextMenu
                                     DataContext="{Binding Path=DataContext, RelativeSource={RelativeSource AncestorType=Window}, Mode=OneWay}">
-                                    <MenuItem Command="{Binding CalculateEntropyCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.CalculateEntropyCommand, Mode=OneWay}"
                                               Header="{x:Static localization:UI.ButtonLabel_Calculate_entropy}" />
-                                    <MenuItem Command="{Binding VerifyImageCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.VerifyImageCommand, Mode=OneWay}"
                                               Header="{x:Static localization:UI.ButtonLabel_Verify}" />
-                                    <MenuItem Command="{Binding ChecksumImageCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.ChecksumImageCommand, Mode=OneWay}"
                                               Header="{x:Static localization:UI.ButtonLabel_Checksum}" />
-                                    <MenuItem Command="{Binding ConvertImageCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.ConvertImageCommand, Mode=OneWay}"
                                               Header="{x:Static localization:UI.ButtonLabel_Convert_to}" />
-                                    <MenuItem Command="{Binding CreateSidecarCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.CreateSidecarCommand, Mode=OneWay}"
                                               Header="{x:Static localization:UI.ButtonLabel_Create_Aaru_Metadata_sidecar}" />
-                                    <MenuItem Command="{Binding ViewImageSectorsCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.ViewImageSectorsCommand, Mode=OneWay}"
                                               Header="{x:Static localization:UI.ButtonLabel_View_sectors}" />
-                                    <MenuItem Command="{Binding DecodeImageMediaTagsCommand, Mode=OneWay}"
+                                    <MenuItem Command="{Binding $parent[Window].DataContext.DecodeImageMediaTagsCommand, Mode=OneWay}"
                                               Header="{x:Static localization:UI.ButtonLabel_Decode_media_tags}" />
                                 </ContextMenu>
                             </StackPanel.ContextMenu>
diff --git a/Aaru.Gui/Views/Windows/MediaDump.xaml b/Aaru.Gui/Views/Windows/MediaDump.xaml
index 9f873ebb8..d10ede4f2 100644
--- a/Aaru.Gui/Views/Windows/MediaDump.xaml
+++ b/Aaru.Gui/Views/Windows/MediaDump.xaml
@@ -42,6 +42,7 @@
         d:DesignHeight="450"
         x:Class="Aaru.Gui.Views.Windows.MediaDump"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:MediaDumpViewModel"
         Title="{Binding Title}">
     <Design.DataContext>
         <windows:MediaDumpViewModel />
diff --git a/Aaru.Gui/Views/Windows/MediaScan.xaml b/Aaru.Gui/Views/Windows/MediaScan.xaml
index 07bc6f39d..63104d449 100644
--- a/Aaru.Gui/Views/Windows/MediaScan.xaml
+++ b/Aaru.Gui/Views/Windows/MediaScan.xaml
@@ -42,6 +42,7 @@
         d:DesignHeight="450"
         x:Class="Aaru.Gui.Views.Windows.MediaScan"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:MediaScanViewModel"
         Title="{Binding Title}">
     <Design.DataContext>
         <windows:MediaScanViewModel />
diff --git a/Aaru.Gui/Views/Windows/SplashWindow.xaml b/Aaru.Gui/Views/Windows/SplashWindow.xaml
index a1438684b..70941710b 100644
--- a/Aaru.Gui/Views/Windows/SplashWindow.xaml
+++ b/Aaru.Gui/Views/Windows/SplashWindow.xaml
@@ -42,6 +42,7 @@
         x:Class="Aaru.Gui.Views.Windows.SplashWindow"
         Icon="/Assets/aaru-logo.png"
         Title="Aaru"
+        x:DataType="windows:SplashWindowViewModel"
         SystemDecorations="BorderOnly">
     <Design.DataContext>
         <windows:SplashWindowViewModel />
diff --git a/Aaru.Gui/Views/Windows/ViewSector.xaml b/Aaru.Gui/Views/Windows/ViewSector.xaml
index b00a49c21..44dcbfd00 100644
--- a/Aaru.Gui/Views/Windows/ViewSector.xaml
+++ b/Aaru.Gui/Views/Windows/ViewSector.xaml
@@ -45,6 +45,7 @@
         Height="480"
         x:Class="Aaru.Gui.Views.Windows.ViewSector"
         Icon="/Assets/aaru-logo.png"
+        x:DataType="windows:ViewSectorViewModel"
         Title="{x:Static localization:UI.Title_Sector_viewer}">
     <Design.DataContext>
         <windows:ViewSectorViewModel />