diff --git a/HLab.Avalonia b/HLab.Avalonia
index 87e7ebd2..2663b14d 160000
--- a/HLab.Avalonia
+++ b/HLab.Avalonia
@@ -1 +1 @@
-Subproject commit 87e7ebd2caf3d62ea066175990d03b319b59213b
+Subproject commit 2663b14d2d6dafe9945cf6f5179d6758636ed373
diff --git a/HLab.Core b/HLab.Core
index d3beb380..d01dffad 160000
--- a/HLab.Core
+++ b/HLab.Core
@@ -1 +1 @@
-Subproject commit d3beb3802f287e47365ab90427836d33d97b2505
+Subproject commit d01dffadad9d755834308b1c7943b5dc1e32b4a5
diff --git a/HLab.Sys/HLab.Sys.Argyll/HLab.Sys.Argyll.csproj b/HLab.Sys/HLab.Sys.Argyll/HLab.Sys.Argyll.csproj
index 6ceab527..1476f94c 100644
--- a/HLab.Sys/HLab.Sys.Argyll/HLab.Sys.Argyll.csproj
+++ b/HLab.Sys/HLab.Sys.Argyll/HLab.Sys.Argyll.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Avalonia" Version="11.0.10" />
-	  <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
+	  <PackageReference Include="Avalonia" Version="11.1.0-beta1" />
+	  <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0-beta1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/HLab.Sys/HLab.Sys.Windows.MonitorVcp.Avalonia/HLab.Sys.Windows.MonitorVcp.Avalonia.csproj b/HLab.Sys/HLab.Sys.Windows.MonitorVcp.Avalonia/HLab.Sys.Windows.MonitorVcp.Avalonia.csproj
index 7d6099a0..46ad057a 100644
--- a/HLab.Sys/HLab.Sys.Windows.MonitorVcp.Avalonia/HLab.Sys.Windows.MonitorVcp.Avalonia.csproj
+++ b/HLab.Sys/HLab.Sys.Windows.MonitorVcp.Avalonia/HLab.Sys.Windows.MonitorVcp.Avalonia.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.10" />
+    <PackageReference Include="Avalonia" Version="11.1.0-beta1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/HLab.Sys/HLab.Sys.Windows.Monitors/HLab.Sys.Windows.Monitors.csproj b/HLab.Sys/HLab.Sys.Windows.Monitors/HLab.Sys.Windows.Monitors.csproj
index 0e5396fc..4e334be1 100644
--- a/HLab.Sys/HLab.Sys.Windows.Monitors/HLab.Sys.Windows.Monitors.csproj
+++ b/HLab.Sys/HLab.Sys.Windows.Monitors/HLab.Sys.Windows.Monitors.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
-    <PackageReference Include="System.Management" Version="8.0.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0-beta1" />
+    <PackageReference Include="System.Management" Version="9.0.0-preview.2.24128.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LittleBigMouse.Core/LittleBigMouse.DisplayLayout/LittleBigMouse.DisplayLayout.csproj b/LittleBigMouse.Core/LittleBigMouse.DisplayLayout/LittleBigMouse.DisplayLayout.csproj
index 66dcc98c..7e6e32f8 100644
--- a/LittleBigMouse.Core/LittleBigMouse.DisplayLayout/LittleBigMouse.DisplayLayout.csproj
+++ b/LittleBigMouse.Core/LittleBigMouse.DisplayLayout/LittleBigMouse.DisplayLayout.csproj
@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0-beta1" />
     <PackageReference Include="H.Pipes" Version="2.0.59" />
     <PackageReference Include="MessageBox.Avalonia" Version="3.1.5.1" />
     <PackageReference Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
-    <PackageReference Include="System.Management" Version="8.0.0" />
+    <PackageReference Include="System.Management" Version="9.0.0-preview.2.24128.5" />
     <PackageReference Include="TaskScheduler" Version="2.10.1" />
   </ItemGroup>
 
diff --git a/LittleBigMouse.Core/LittleBigMouse.Zones/LittleBigMouse.Zoning.csproj b/LittleBigMouse.Core/LittleBigMouse.Zones/LittleBigMouse.Zoning.csproj
index 0f3cb854..736ef33d 100644
--- a/LittleBigMouse.Core/LittleBigMouse.Zones/LittleBigMouse.Zoning.csproj
+++ b/LittleBigMouse.Core/LittleBigMouse.Zones/LittleBigMouse.Zoning.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.10" />
+    <PackageReference Include="Avalonia" Version="11.1.0-beta1" />
     <PackageReference Include="Avalonia.MatrixExtensions" Version="3.0.0-preview6" />
     <PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
   </ItemGroup>
diff --git a/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Layout.Avalonia/LittleBigMouse.Plugin.Layout.Avalonia.csproj b/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Layout.Avalonia/LittleBigMouse.Plugin.Layout.Avalonia.csproj
index 51c12d9c..0d7cd579 100644
--- a/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Layout.Avalonia/LittleBigMouse.Plugin.Layout.Avalonia.csproj
+++ b/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Layout.Avalonia/LittleBigMouse.Plugin.Layout.Avalonia.csproj
@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
+    <PackageReference Include="Avalonia" Version="11.1.0-beta1" />
+    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.1.0-beta1" />
   </ItemGroup>
 
 	<ItemGroup>
diff --git a/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Vcp.Avalonia/LittleBigMouse.Plugin.Vcp.Avalonia.csproj b/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Vcp.Avalonia/LittleBigMouse.Plugin.Vcp.Avalonia.csproj
index a7263257..2b5c69a5 100644
--- a/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Vcp.Avalonia/LittleBigMouse.Plugin.Vcp.Avalonia.csproj
+++ b/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Vcp.Avalonia/LittleBigMouse.Plugin.Vcp.Avalonia.csproj
@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Avalonia" Version="11.0.10" />
-	  <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
+	  <PackageReference Include="Avalonia" Version="11.1.0-beta1" />
+	  <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.1.0-beta1" />
 	  <PackageReference Include="ScottPlot.Avalonia" Version="5.0.23" />
   </ItemGroup>
 
diff --git a/LittleBigMouse.Plugins/LittleBigMouse.Plugins.Avalonia/LittleBigMouse.Plugins.Avalonia.csproj b/LittleBigMouse.Plugins/LittleBigMouse.Plugins.Avalonia/LittleBigMouse.Plugins.Avalonia.csproj
index ac8266c0..a45b01d1 100644
--- a/LittleBigMouse.Plugins/LittleBigMouse.Plugins.Avalonia/LittleBigMouse.Plugins.Avalonia.csproj
+++ b/LittleBigMouse.Plugins/LittleBigMouse.Plugins.Avalonia/LittleBigMouse.Plugins.Avalonia.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0-beta1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Controls/LocationControlView.axaml b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Controls/LocationControlView.axaml
index a22d2d9c..fdfb442f 100644
--- a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Controls/LocationControlView.axaml
+++ b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Controls/LocationControlView.axaml
@@ -76,24 +76,24 @@
 				<NumericUpDown 
                     Minimum="{Binding Model.MinimalMaxTravelDistance, FallbackValue=0}" 
                     Increment="10" 
-                    Value="{Binding Model.MaxTravelDistance, FallbackValue=200.0}"
+                    Value="{Binding Model.MaxTravelDistance, FallbackValue='200,1'}"
                     ClipValueToMinMax="True"
                     />
 			</StackPanel>
 			<StackPanel Classes="Options">
 				<CheckBox
 					Content="Horizontal Loop"
-
 					IsEnabled="{Binding Path=Model.LoopAllowed, FallbackValue=false}"
 					IsChecked="{Binding Path=Model.LoopX, FallbackValue=false, Mode=TwoWay}"
 					ToolTip.Tip="Allow the cursor to return horizontally by crossing from the opposite side."
-                        />
+                />
+				
 				<CheckBox
 					Content="Vertical Loop"
 					IsEnabled="{Binding Path=Model.LoopAllowed, FallbackValue=false}"
 					IsChecked="{Binding Path=Model.LoopY, FallbackValue=false, Mode=TwoWay}"
 					ToolTip.Tip="Allow the cursor to return horizontally by crossing from the opposite side."
-                        />
+                />
 			</StackPanel>
 
 			<StackPanel  Classes="Options">
diff --git a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/LittleBigMouse.Ui.Avalonia.csproj b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/LittleBigMouse.Ui.Avalonia.csproj
index 6683058e..f57cde4a 100644
--- a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/LittleBigMouse.Ui.Avalonia.csproj
+++ b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/LittleBigMouse.Ui.Avalonia.csproj
@@ -50,12 +50,12 @@
 
   <ItemGroup>
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
+    <PackageReference Include="Avalonia" Version="11.1.0-beta1" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.1.0-beta1" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0-beta1" />
+    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.1.0-beta1" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0-beta1" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.0-beta1" />
     <PackageReference Include="Grace" Version="8.0.0-RC837" />
     <PackageReference Include="Live.Avalonia" Version="1.4.1" />
     <PackageReference Include="MessageBox.Avalonia" Version="3.1.5.1" />