diff --git a/Aaru.Gui/Views/Windows/MetadataEditor.axaml b/Aaru.Gui/Views/Windows/MetadataEditor.axaml
index c4aeb6d1f..24f2d0209 100644
--- a/Aaru.Gui/Views/Windows/MetadataEditor.axaml
+++ b/Aaru.Gui/Views/Windows/MetadataEditor.axaml
@@ -235,8 +235,8 @@
+ Command="{Binding $parent[Window].DataContext.RemoveDeveloperCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
@@ -252,10 +252,10 @@
-
@@ -264,8 +264,8 @@
+ Command="{Binding $parent[Window].DataContext.RemovePublisherCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
@@ -281,10 +281,10 @@
-
@@ -293,8 +293,8 @@
+ Command="{Binding $parent[Window].DataContext.RemoveAuthorCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
@@ -310,10 +310,10 @@
-
@@ -322,8 +322,8 @@
+ Command="{Binding $parent[Window].DataContext.RemovePerformerCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
@@ -346,10 +346,10 @@
-
@@ -358,8 +358,8 @@
+ Command="{Binding $parent[Window].DataContext.RemoveKeywordCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
@@ -375,10 +375,10 @@
-
@@ -387,8 +387,8 @@
+ Command="{Binding $parent[Window].DataContext.RemoveCategoryCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
@@ -404,10 +404,10 @@
-
@@ -416,8 +416,8 @@
+ Command="{Binding $parent[Window].DataContext.RemoveSubcategoryCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
@@ -433,10 +433,10 @@
-
@@ -445,8 +445,8 @@
+ Command="{Binding $parent[Window].DataContext.RemoveSystemCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
@@ -471,13 +471,13 @@
+ Command="{Binding AddLanguageCommand, Mode=OneWay}"
+ CommandParameter="{Binding #languageCombo.SelectedItem, Mode=OneWay}" />
-
@@ -486,8 +486,8 @@
+ Command="{Binding $parent[Window].DataContext.RemoveLanguageCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
@@ -506,13 +506,13 @@
+ Command="{Binding AddArchitectureCommand, Mode=OneWay}"
+ CommandParameter="{Binding #archCombo.SelectedItem, Mode=OneWay}" />
-
@@ -521,8 +521,8 @@
+ Command="{Binding $parent[Window].DataContext.RemoveArchitectureCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
@@ -539,10 +539,10 @@
-
@@ -557,12 +557,12 @@
+ Command="{Binding $parent[Window].DataContext.RemoveRequiredOperatingSystemCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
-
@@ -580,10 +580,10 @@
-
@@ -596,18 +596,18 @@
+ Command="{Binding $parent[Window].DataContext.RemoveBarcodeCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
+ ItemsSource="{Binding $parent[Window].DataContext.AvailableBarcodeTypes, Mode=OneWay}"
+ SelectedItem="{Binding Type, Mode=TwoWay}" />
-
@@ -628,10 +628,10 @@
-
@@ -645,28 +645,28 @@
+ Command="{Binding $parent[Window].DataContext.RemoveMagazineCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
-
+
-
+
-
+
-
+
@@ -683,10 +683,10 @@
-
@@ -700,24 +700,24 @@
+ Command="{Binding $parent[Window].DataContext.RemoveBookCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
-
+
-
+
-
+
-
+
@@ -732,10 +732,10 @@
-
@@ -749,20 +749,20 @@
+ Command="{Binding $parent[Window].DataContext.RemoveUserManualCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
-
+
-
+
@@ -786,10 +786,10 @@
-
@@ -803,26 +803,26 @@
+ Command="{Binding $parent[Window].DataContext.RemoveOpticalDiscCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
-
+
-
+
-
+
-
+
@@ -839,10 +839,10 @@
-
@@ -856,26 +856,26 @@
+ Command="{Binding $parent[Window].DataContext.RemoveBlockMediaCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
-
+
-
+
-
+
-
+
@@ -892,10 +892,10 @@
-
@@ -909,26 +909,26 @@
+ Command="{Binding $parent[Window].DataContext.RemoveLinearMediaCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
-
+
-
+
-
+
-
+
@@ -945,10 +945,10 @@
-
@@ -962,26 +962,26 @@
+ Command="{Binding $parent[Window].DataContext.RemoveAudioMediaCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
-
+
-
+
-
+
-
+
@@ -1005,10 +1005,10 @@
-
@@ -1022,20 +1022,20 @@
+ Command="{Binding $parent[Window].DataContext.RemovePciCardCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
-
+
-
+
@@ -1052,10 +1052,10 @@
-
@@ -1069,16 +1069,16 @@
+ Command="{Binding $parent[Window].DataContext.RemoveAdvertisementCommand, Mode=OneWay}"
+ CommandParameter="{Binding Mode=OneWay}" />
-
+
-
+