diff --git a/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml b/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml
index 2124751..05818cb 100644
--- a/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml
+++ b/MapWizard.Desktop/Views/ComboColourStudio/ComboColourStudioView.axaml
@@ -175,7 +175,7 @@
                                             <controls:ModernColorPicker
                                                 SelectedColor="{Binding Colour, Converter={StaticResource AvaloniaColorToColorConverter}, Mode=TwoWay}" />
                                             <Button Classes="Basic"
-                                                    Command="{Binding #Root.DataContext.RemoveColourCommand}"
+                                                    Command="{ReflectionBinding DataContext.RemoveColourCommand, ElementName=Root}"
                                                     CommandParameter="{Binding}"
                                                     ToolTip.Tip="Remove this combo colour">
                                                 <materialIcons:MaterialIcon Kind="Close" Width="20" Height="20" />
@@ -276,9 +276,9 @@
                                                                     DragDrop.DragOver="SequenceToken_OnDragOver"
                                                                     DragDrop.Drop="SequenceToken_OnDrop">
                                                                 <controls:ComboColourDropdown
-                                                                    Options="{Binding #Root.DataContext.ColourDropdownOptions}"
+                                                                    Options="{ReflectionBinding DataContext.ColourDropdownOptions, ElementName=Root}"
                                                                     SelectedComboNumber="{Binding ComboNumber, Mode=TwoWay}"
-                                                                    RemoveTokenCommand="{Binding #Root.DataContext.RemoveColourFromPointCommand}"
+                                                                    RemoveTokenCommand="{ReflectionBinding DataContext.RemoveColourFromPointCommand, ElementName=Root}"
                                                                     RemoveTokenCommandParameter="{Binding}" />
                                                             </Border>
                                                         </DataTemplate>
@@ -291,21 +291,21 @@
                                                         Spacing="6"
                                                         HorizontalAlignment="Right">
                                                 <Button Classes="Basic"
-                                                        Command="{Binding #Root.DataContext.AddColourToPointCommand}"
+                                                        Command="{ReflectionBinding DataContext.AddColourToPointCommand, ElementName=Root}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Add combo colour to this point sequence">
                                                     <materialIcons:MaterialIcon Kind="Add" Width="16" Height="16" />
                                                 </Button>
 
                                                 <Button Classes="Basic"
-                                                        Command="{Binding #Root.DataContext.AddColourPointFromSequenceCommand}"
+                                                        Command="{ReflectionBinding DataContext.AddColourPointFromSequenceCommand, ElementName=Root}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Create a new colour point from this sequence">
                                                     <materialIcons:MaterialIcon Kind="ContentCopy" Width="16" Height="16" />
                                                 </Button>
 
                                                 <Button Classes="Basic"
-                                                        Command="{Binding #Root.DataContext.RemoveColourPointCommand}"
+                                                        Command="{ReflectionBinding DataContext.RemoveColourPointCommand, ElementName=Root}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Remove this colour point">
                                                     <materialIcons:MaterialIcon Kind="Delete" Width="18" Height="18" />
diff --git a/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml b/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml
index 59f32e2..4a98449 100644
--- a/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml
+++ b/MapWizard.Desktop/Views/MapCleaner/MapCleanerView.axaml
@@ -109,7 +109,7 @@
                                             <StackPanel Orientation="Horizontal" Spacing="6">
                                                 <TextBlock VerticalAlignment="Center" Text="{Binding}" />
                                                 <Button Classes="SnapChipClose"
-                                                        Command="{Binding DataContext.RemoveSnapCommand, ElementName=Root}"
+                                                        Command="{ReflectionBinding DataContext.RemoveSnapCommand, ElementName=Root}"
                                                         CommandParameter="{Binding}"
                                                         ToolTip.Tip="Remove snap">
                                                     <materialIcons:MaterialIcon Kind="Close" Width="14" Height="14" />
@@ -139,7 +139,7 @@
                                                            FontSize="13" />
                                                 <Separator />
                                                 <ScrollViewer MaxHeight="220">
-                                                    <ItemsControl ItemsSource="{Binding DataContext.SnapPresets, ElementName=Root}">
+                                                    <ItemsControl ItemsSource="{ReflectionBinding DataContext.SnapPresets, ElementName=Root}">
                                                         <ItemsControl.ItemsPanel>
                                                             <ItemsPanelTemplate>
                                                                 <WrapPanel />
@@ -149,7 +149,7 @@
                                                             <DataTemplate>
                                                                 <Button Classes="SnapPresetBadge Compact"
                                                                         Margin="0,0,6,6"
-                                                                        Command="{Binding DataContext.AddSnapFromFlyoutCommand, ElementName=Root}"
+                                                                        Command="{ReflectionBinding DataContext.AddSnapFromFlyoutCommand, ElementName=Root}"
                                                                         CommandParameter="{Binding}">
                                                                     <TextBlock Text="{Binding}" />
                                                                 </Button>
@@ -161,9 +161,9 @@
                                                 <StackPanel Orientation="Horizontal" Spacing="8">
                                                     <TextBox Width="170"
                                                              PlaceholderText="Custom 1/x"
-                                                             Text="{Binding DataContext.CustomSnapInput, Mode=TwoWay, ElementName=Root}" />
+                                                             Text="{ReflectionBinding DataContext.CustomSnapInput, Mode=TwoWay, ElementName=Root}" />
                                                     <Button Classes="Basic Compact"
-                                                            Command="{Binding DataContext.AddCustomSnapCommand, ElementName=Root}">
+                                                            Command="{ReflectionBinding DataContext.AddCustomSnapCommand, ElementName=Root}">
                                                         <TextBlock Text="Add" />
                                                     </Button>
                                                 </StackPanel>
diff --git a/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml b/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml
index b795738..a2d7294 100644
--- a/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml
+++ b/MapWizard.Desktop/Views/MetadataManager/MetadataManagerView.axaml
@@ -177,7 +177,7 @@
                           <controls:ModernColorPicker VerticalAlignment="Center"
                                                       SelectedColor="{Binding Colour, Converter={StaticResource AvaloniaColorToColorConverter}, Mode=TwoWay}" />
                           <Button Classes="Basic" 
-                                  Command="{Binding #Root.DataContext.RemoveColourCommand}"
+                                  Command="{ReflectionBinding DataContext.RemoveColourCommand, ElementName=Root}"
                                   CommandParameter="{Binding}" 
                                   ToolTip.Tip="Remove this colour">
                             <materialIcons:MaterialIcon Kind="Close" Width="24" Height="24" />