diff --git a/CNC Controls Camera/CNC Controls Camera/Camera.xaml b/CNC Controls Camera/CNC Controls Camera/Camera.xaml
index 02da8955..37cb78c9 100644
--- a/CNC Controls Camera/CNC Controls Camera/Camera.xaml	
+++ b/CNC Controls Camera/CNC Controls Camera/Camera.xaml	
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CNC.Controls.Camera"
         mc:Ignorable="d"
-        Title="Sender" Height="390" Width="504"
+        Title="Sender" Height="414" Width="504"
         Topmost="True"
         Closing="Window_Closing" Icon="App.ico" ShowInTaskbar="False" ResizeMode="NoResize">
     <Window.TaskbarItemInfo>
diff --git a/CNC Controls Camera/CNC Controls Camera/Camera.xaml.cs b/CNC Controls Camera/CNC Controls Camera/Camera.xaml.cs
index cb78d2b8..12d9f4b4 100644
--- a/CNC Controls Camera/CNC Controls Camera/Camera.xaml.cs	
+++ b/CNC Controls Camera/CNC Controls Camera/Camera.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * Camera.xaml.cs - part of CNC Controls Camera library
  *
- * v0.33 / 2021-05-04 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-02 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io) - parts derived from AForge example code
+Copyright (c) 2018-2022, Io Engineering (Terje Io) - parts derived from AForge example code
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -66,6 +66,7 @@ private void CNCCamera_MoveOffset(Core.CameraMoveMode Mode, double XOffset, doub
         public bool HasCamera { get { return CNCCamera.HasCamera; } }
         public CameraControl CameraControl { get { return CNCCamera; } }
         public new bool IsVisible { get { return CNCCamera.IsVisible; } }
+        public bool IsMoveEnabled { get { return CNCCamera.IsMoveEnabled; } set { CNCCamera.IsMoveEnabled = value && (CNCCamera.XOffset != 0d || CNCCamera.YOffset != 0d); } }
 
         public void Setup(UIViewModel model)
         {
@@ -89,6 +90,8 @@ public void Open()
 
             Show();
 
+            CameraControl.MoveCameraToSpindlePosition = AppConfig.Settings.Camera.InitialMoveToSpindle;
+
             if (CNCCamera.OpenVideoSource())
                 IsVisibilityChanged?.Invoke();
         }
diff --git a/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml b/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml
index 2e659303..816248d8 100644
--- a/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml	
+++ b/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml	
@@ -3,22 +3,32 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:CNC.Controls.Camera"
              mc:Ignorable="d" 
-             d:DesignHeight="360" d:DesignWidth="500"
+             d:DesignHeight="370" d:DesignWidth="500"
              Background="#FFF0F0F0" Loaded="CameraControl_Loaded">
+    <UserControl.Resources>
+        <system:String x:Uid="str_moveSpindleTo" x:Key="MoveSpindleTo">Move spindle to camera position?</system:String>
+        <system:String x:Uid="str_moveCameraTo" x:Key="MoveCameraTo">Move camera to spindle position?</system:String>
+    </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="320"/>
-            <RowDefinition Height="40"/>
+            <RowDefinition Height="30"/>
+            <RowDefinition Height="307"/>
+            <RowDefinition Height="33"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="420"/>
+            <ColumnDefinition Width="407"/>
             <ColumnDefinition Width="80"/>
         </Grid.ColumnDefinitions>
-        <Image Width="400" Height="300" HorizontalAlignment="Left" Name="frameHolder" VerticalAlignment="Top" Margin="10,10,0,0"/>
-        <Slider x:Name="sldcircle" Orientation="Vertical" HorizontalAlignment="Left" Value="{Binding Path=GuideScale, Mode=TwoWay}" Margin="28,30,0,0" VerticalAlignment="Top" Height="118" Width="30" Grid.Column="1" ValueChanged="sldcircle_ValueChanged" Maximum="100" Minimum="5" LargeChange="10" SmallChange="1"/>
-        <Button x:Uid="btn_moveOffset" x:Name="btnMove" Content="Move offset" IsEnabled="{Binding Path=IsMoveEnabled}" HorizontalAlignment="Left" Margin="10,4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Click="btnMove_Click" Height="22"/>
-        <ComboBox x:Name="cbxCamera" ItemsSource="{Binding Path=Cameras}" DisplayMemberPath="Name" SelectedValuePath="Camera" HorizontalAlignment="Left" Margin="100,4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="300" SelectionChanged="cbxCamera_SelectionChanged" Height="22"/>
+        <ComboBox x:Name="cbxCamera" ItemsSource="{Binding Cameras}" DisplayMemberPath="Name" SelectedValuePath="Camera" Width="400" SelectionChanged="cbxCamera_SelectionChanged" Height="22" Margin="5,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
+        <Image Width="400" Height="300" HorizontalAlignment="Left" Name="frameHolder" VerticalAlignment="Top" Margin="5,5,0,0" Grid.Row="1"/>
+        <Slider x:Name="sldcircle" Orientation="Vertical" HorizontalAlignment="Left" Value="{Binding Path=GuideScale, Mode=TwoWay}" Margin="28,1,0,0" VerticalAlignment="Top" Height="118" Width="30" Grid.Column="1" ValueChanged="sldcircle_ValueChanged" Maximum="100" Minimum="5" LargeChange="10" SmallChange="1" Grid.Row="1"/>
+        <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="5,4,0,0" Grid.ColumnSpan="2" Height="22" VerticalAlignment="Top">
+            <Button x:Uid="btn_moveOffset" x:Name="btnMove" Content="Move offset" IsEnabled="{Binding Path=IsMoveEnabled}" Width="75" Click="btnMove_Click" Height="22"/>
+            <CheckBox x:Uid="lbl_cameraToSpindlePosition" x:Name="chkCameraToSpindlePosition" Content="camera to spindle" Focusable="False" IsChecked="{Binding Path=MoveCameraToSpindlePosition, Mode=TwoWay}" IsEnabled="{Binding Path=IsMoveEnabled}" Margin="4,0,0,0" VerticalAlignment="Center"/>
+            <Button x:Uid="btn_useAsProbe" x:Name="btnUseAsProbe" Content="Use as probe position" IsEnabled="{Binding Path=grbl.IsProbing}" Focusable="False" Padding="4,0" Margin="46,0,0,0" Click="btnPublish_Click" Height="22"/>
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml.cs b/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml.cs
index de180354..353b23e8 100644
--- a/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml.cs	
+++ b/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * CameraControl.xaml.cs - part of CNC Controls Camera library
  *
- * v0.30 / 2021-04-08 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-02 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io) - parts derived from AForge example code
+Copyright (c) 2018-2022, Io Engineering (Terje Io) - parts derived from AForge example code
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -68,9 +68,9 @@ public partial class CameraControl : UserControl
 
         public CameraControl()
         {
-            DataContext = this;
-
             InitializeComponent();
+
+            DataContext = this;
         }
 
         private void CameraControl_Loaded(object sender, RoutedEventArgs e)
@@ -83,6 +83,12 @@ private void CameraControl_Loaded(object sender, RoutedEventArgs e)
             if (Cameras.Count > 0)
             {
                 Camera = Cameras[0];
+                if (AppConfig.Settings.Camera.SelectedCamera != string.Empty)
+                {
+                    foreach (FilterInfo camera in Cameras)
+                        if (camera.MonikerString == AppConfig.Settings.Camera.SelectedCamera)
+                            Camera = camera;
+                }
                 cbxCamera.SelectedItem = Camera;
             }
         }
@@ -123,6 +129,15 @@ private static void OnGuideScaleChanged(DependencyObject d, DependencyPropertyCh
             AppConfig.Settings.Camera.GuideScale = (int)e.NewValue;
         }
 
+        public static readonly DependencyProperty MoveCameraToSpindlePositionProperty = DependencyProperty.Register(nameof(MoveCameraToSpindlePosition), typeof(bool), typeof(CameraControl), new PropertyMetadata(false));
+        public bool MoveCameraToSpindlePosition
+        {
+            get { return (bool)GetValue(MoveCameraToSpindlePositionProperty); }
+            set { SetValue(MoveCameraToSpindlePositionProperty, value); }
+        }
+
+        public GrblViewModel grbl {  get { return Grbl.GrblViewModel;  } }
+
         public double XOffset
         {
             get { return _xOffset; }
@@ -139,11 +154,13 @@ public double YOffset
         public FilterInfoCollection Cameras { get; private set; } = new FilterInfoCollection(FilterCategory.VideoInputDevice);
         public FilterInfo Camera { get; private set; }
 
-        public bool OpenVideoSource()
+        public bool OpenVideoSource(FilterInfo camera)
         {
-            if (Camera != null)
+            CloseCurrentVideoSource();
+
+            if (camera != null)
             {
-                videoSource = new VideoCaptureDevice(Camera.MonikerString);
+                videoSource = new VideoCaptureDevice(camera.MonikerString);
                 videoSource.Start();
                 videoSource.NewFrame += videoSource_NewFrame;
             }
@@ -151,6 +168,11 @@ public bool OpenVideoSource()
             return videoSource != null && videoSource.IsRunning;
         }
 
+        public bool OpenVideoSource()
+        {
+            return IsCameraOpen || OpenVideoSource(Camera);
+        }
+
         public void CloseCurrentVideoSource()
         {
             if (videoSource != null)
@@ -158,8 +180,8 @@ public void CloseCurrentVideoSource()
                 videoSource.NewFrame -= videoSource_NewFrame;
                 videoSource.SignalToStop();
 
-                // wait ~ 3 seconds
-                for (int i = 0; i < 30; i++)
+                // wait ~5 seconds
+                for (int i = 0; i < 50; i++)
                 {
                     if (!videoSource.IsRunning)
                         break;
@@ -225,15 +247,36 @@ private void sldcircle_ValueChanged(object sender, RoutedPropertyChangedEventArg
 
         private void btnMove_Click(object sender, RoutedEventArgs e)
         {
-            MoveOffset?.Invoke(Mode, XOffset, YOffset);
+            if (!AppConfig.Settings.Camera.ConfirmMove || MessageBox.Show(UIUtils.TryFindParent<Window>(this), (string)FindResource(MoveCameraToSpindlePosition ? "MoveCameraTo" : "MoveSpindleTo"), "ioSender", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+            {
+                if (MoveCameraToSpindlePosition)
+                {
+                    MoveCameraToSpindlePosition = false;
+                    MoveOffset?.Invoke(Mode, -XOffset, -YOffset);
+                }
+                else
+                    MoveOffset?.Invoke(Mode, XOffset, YOffset);
+            }
+        }
+
+        private void btnPublish_Click(object sender, RoutedEventArgs e)
+        {
+            Position pos = new Position(Grbl.GrblViewModel.MachinePosition);
+
+            pos.X += XOffset;
+            pos.Y += YOffset;
+
+            Grbl.GrblViewModel.CameraProbed(pos);
         }
 
         private void cbxCamera_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if(((ComboBox)sender).IsDropDownOpen)
+            if(((ComboBox)sender).IsDropDownOpen && e.AddedItems.Count == 1)
             {
                 CloseCurrentVideoSource();
-                OpenVideoSource();
+                OpenVideoSource(e.AddedItems[0] as FilterInfo);
+                AppConfig.Settings.Camera.SelectedCamera = (e.AddedItems[0] as FilterInfo).MonikerString;
+                AppConfig.Settings.Save();
             }
         }
     }
diff --git a/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml b/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml
index fa754c4f..2f6bdcef 100644
--- a/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml	
+++ b/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml	
@@ -6,9 +6,11 @@
              xmlns:local="clr-namespace:CNC.Controls.Camera"
              xmlns:Controls="clr-namespace:CNC.Controls;assembly=CNC.Controls.WPF" x:Class="CNC.Controls.Camera.ConfigControl"
              mc:Ignorable="d" 
-             d:DesignHeight="140" d:DesignWidth="250">
+             d:DesignHeight="160" d:DesignWidth="250">
     <GroupBox x:Uid="grp_camera" x:Name="grpCamera" Header="Camera" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
-        <StackPanel HorizontalAlignment="Left" Height="115" Margin="0,3,0,0" VerticalAlignment="Top" Width="235">
+        <StackPanel HorizontalAlignment="Left" Height="Auto" Margin="0,3,0,0" VerticalAlignment="Top" Width="235">
+            <CheckBox x:Uid="chk_moveToSpindle" Content="Inital move to spindle" IsChecked="{Binding Path=Camera.InitialMoveToSpindle, Mode=TwoWay}" Margin="90,0,0,0"/>
+            <CheckBox x:Uid="chk_confirmMove" Content="Confirm move" IsChecked="{Binding Path=Camera.ConfirmMove, Mode=TwoWay}" Margin="90,0,0,0"/>
             <Controls:NumericField x:Uid="fld_xOffset" x:Name="xOffset" Label="X offset:" ColonAt="90" Value="{Binding Path=Camera.XOffset, Mode=TwoWay}"/>
             <Controls:NumericField x:Uid="fld_yOffset" x:Name="yOffset" Label="Y offset:" ColonAt="90" Value="{Binding Path=Camera.YOffset, Mode=TwoWay}"/>
             <Grid Height="29">
diff --git a/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs b/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs
index 83bc8102..d8f25de2 100644
--- a/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs	
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.35.0")]
-[assembly: AssemblyFileVersion("2.0.35.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]
diff --git a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml
index cfb73b1d..9239393d 100644
--- a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml	
@@ -17,6 +17,7 @@
         <system:String x:Uid="str_centerFinderClearance" x:Key="Clearance">Probing XY clearance too large for workpiece {0} size.</system:String>
         <system:String x:Uid="str_centerFinderFailed" x:Key="ProbingFailed">Probing failed</system:String>
         <system:String x:Uid="str_centerFinderCompleted" x:Key="ProbingCompleted">Probing completed: X distance {0}, Y distance {1}.</system:String>
+        <system:String x:Uid="str_positionsRequired" x:Key="PositionsRequired">{0} probe positions are required.</system:String>
         <Controls:MultiLineConverter x:Key="ErrorMessageConverter" />
         <Controls:LogicalNotConverter x:Key="IsNotRunningConverter" />
         <Controls:BoolToVisibleConverter x:Key="ToVisibleConverter" />
@@ -88,6 +89,7 @@
         <StackPanel Margin="5,0,0,5" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="Auto" Width="Auto">
             <Button x:Uid="btn_start" Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
             <Button x:Uid="btn_stop" Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
+            <Button x:Uid="btn_useCamera" Content="Use camera positions" IsEnabled="{Binding Path=CanApplyTransform}" Margin="2,0" Padding="4,0" Click="camera_Click"/>
         </StackPanel>
         <CheckBox x:Uid="lbl_preview" Content="Preview" Margin="365,10,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
         <GroupBox x:Uid="grp_preview" Header="Preview" Margin="365,30,0,0" Visibility="{Binding Path=PreviewEnable, Converter={StaticResource ToVisibleConverter}}" VerticalAlignment="Top">
diff --git a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs
index 00920b82..28841e0b 100644
--- a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * CenterFinderControl.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-12-01 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -74,9 +74,53 @@ public CenterFinderControl()
 
         public ProbingType ProbingType { get { return ProbingType.CenterFinder; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
-            (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+            var probing = DataContext as ProbingViewModel;
+
+            if (activate)
+            {
+                probing.Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+                probing.PropertyChanged += Probing_PropertyChanged;
+            } else
+                probing.PropertyChanged -= Probing_PropertyChanged;
+        }
+
+        private void Probing_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(ProbingViewModel.CameraPositions))
+            {
+                var probing = DataContext as ProbingViewModel;
+                bool ok = probing.CameraPositions <= 1 || !probing.Positions[probing.CameraPositions - 1].Equals(probing.Positions[probing.CameraPositions - 2]);
+
+                if(ok) switch (probing.CameraPositions)
+                {
+                    case 2:
+                        if(mode == FindMode.Y)
+                            ok = probing.Positions[1].X == probing.Positions[0].X && probing.Positions[1].Y > probing.Positions[0].Y;
+                        else
+                            ok = probing.Positions[1].X > probing.Positions[0].X && probing.Positions[1].Y == probing.Positions[0].Y;
+                        break;
+
+                    case 3:
+                        ok = !probing.Positions[2].Equals(probing.Positions[0]) && probing.Positions[2].X != probing.Positions[1].X;
+                        break;
+
+                    case 4:
+                        ok = !probing.Positions[3].Equals(probing.Positions[0]) &&
+                                !probing.Positions[3].Equals(probing.Positions[1]) &&
+                                probing.Positions[3].X == probing.Positions[2].X &&
+                                probing.Positions[3].Y > probing.Positions[2].Y;
+                        break;
+                }
+
+                if (!ok)
+                {
+                    MessageBox.Show(LibStrings.FindResource("IllegalPosition"), "ioSender", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                    probing.RemoveLastPosition();
+                } else
+                    probing.CanApplyTransform = probing.CameraPositions == (mode == FindMode.XY ? 4 : 2);
+            }
         }
 
         private bool CreateProgram(bool preview)
@@ -378,6 +422,25 @@ private void start_Click(object sender, RoutedEventArgs e)
             Start((DataContext as ProbingViewModel).PreviewEnable);
         }
 
+        private void camera_Click(object sender, RoutedEventArgs e)
+        {
+            var probing = DataContext as ProbingViewModel;
+
+            if (probing.ProbeCenter == Center.None)
+            {
+                MessageBox.Show((string)FindResource("SelectType"), "Center finder", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                return;
+            }
+
+            if (probing.Positions.Count == (mode == FindMode.XY ? 4 : 2))
+            {
+                probing.IsSuccess = true;
+                OnCompleted();
+                probing.Positions.Clear();
+                probing.CanApplyTransform = probing.PreviewEnable = false;
+            }
+        }
+
         private void stop_Click(object sender, RoutedEventArgs e)
         {
             Stop();
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs
index 3c6d4fee..86f54656 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * EdgeFinderControl.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-12-01 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -78,9 +78,10 @@ public EdgeFinderControl()
 
         public ProbingType ProbingType { get { return ProbingType.EdgeFinderExternal; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
-            (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+            if(activate)
+                (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
         }
 
         public void Start(bool preview = false)
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs
index 3c87de65..d1edbc60 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * EdgeFinderIntControl.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-11-01 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -65,9 +65,10 @@ public EdgeFinderIntControl()
 
         public ProbingType ProbingType { get { return ProbingType.EdgeFinderInternal; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
-            (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+            if (activate)
+                (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
         }
 
         public void Start(bool preview = false)
diff --git a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs
index 216ef65a..b30888e7 100644
--- a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * HeightMapControl.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-11-29 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-09 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -61,9 +61,10 @@ public HeightMapControl()
 
         public ProbingType ProbingType { get { return ProbingType.HeightMap; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
-            (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+            if(activate)
+                (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
         }
 
         public void Start(bool preview = false)
@@ -189,8 +190,12 @@ private void OnCompleted()
                 probing.HeightMap.MapPoints = mapPoints.Points;
                 probing.HeightMap.HasHeightMap = true;
 
-                probing.Program.End(ok ? string.Format((string)FindResource("ProbingCompleted"), z_min.ToInvariantString(probing.Grbl.Format), z_max.ToInvariantString(probing.Grbl.Format)) : (string)FindResource("ProbingFailed"));
+                if(ok)
+                    probing.Program.End(string.Format((string)FindResource("ProbingCompleted"), z_min.ToInvariantString(probing.Grbl.Format), z_max.ToInvariantString(probing.Grbl.Format)));
             }
+
+            if(!ok)
+                probing.Program.End((string)FindResource("ProbingFailed"));
         }
 
         public void Load (string fileName)
diff --git a/CNC Controls Probing/CNC Controls Probing/IProbeTab.cs b/CNC Controls Probing/CNC Controls Probing/IProbeTab.cs
index 5b718081..f10c5e1a 100644
--- a/CNC Controls Probing/CNC Controls Probing/IProbeTab.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/IProbeTab.cs	
@@ -1,13 +1,13 @@
 /*
  * IProbeTab.cs - part of CNC Probing library
  *
- * v0.27 / 2020-09-18 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -53,7 +53,7 @@ public enum ProbingType
     public interface IProbeTab
     {
         ProbingType ProbingType { get; }
-        void Activate();
+        void Activate(bool activate);
         void Start(bool preview = false);
         void Stop();
     }
diff --git a/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml b/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml
index b6d0c15e..56f77f0e 100644
--- a/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml	
@@ -14,4 +14,5 @@
     <system:String x:Uid="str_probingRadiusArcs" x:Key="HasRadiusArcs">GCode contains arcs in XZ or YZ plane (G18/19), can't apply transform. Use 'Arcs to Lines' if you really need this.</system:String>
     <system:String x:Uid="str_probingDistanceError" x:Key="ErrorProbingDistance">Probing distance must be larger than XY Clearance + ½ Probe/tool diameter.</system:String>
     <system:String x:Uid="str_probingLatchDistanceError" x:Key="ErrorLatchDistance">Latch distance must be less than Probing distance.</system:String>
+    <system:String x:Uid="str_probingIllegalPosition" x:Key="IllegalPosition">Illegal probe position, try again.</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml
index 825aed60..4807c6f7 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml	
@@ -14,6 +14,7 @@
         <system:String x:Uid="str_runMacro" x:Key="RunMacro">Run {0} macro?</system:String>
         <system:String x:Uid="str_jogActive" x:Key="JogActive">Keyboard jogging active</system:String>
         <system:String x:Uid="str_jogDisabled" x:Key="JogDisabled">Keyboard jogging disabled</system:String>
+        <system:String x:Uid="str_cameraPosition" x:Key="CameraPosition">Camera position {0}, X: {1}, Y: {2}</system:String>
         <Controls:EnumValueToBooleanConverter x:Key="EnumToEnabledConverter" />
         <Controls:LogicalNotConverter x:Key="IsNotRunningConverter" />
         <Controls:MultiLineConverter x:Key="ErrorMessageConverter" />
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs
index 9b07d128..1bfed08f 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * ProbingView.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-12-25 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -83,6 +83,28 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
                 keyboard.AddHandler(Key.C, ModifierKeys.Alt, ProbeConnectedToggle, this);
 
                 DataContext = model = new ProbingViewModel(DataContext as GrblViewModel, profiles);
+
+                grbl.OnCameraProbe += addCameraPosition;
+            }
+        }
+
+        private void addCameraPosition(Position position)
+        {
+            if (grbl.IsProbing)
+            {
+                if(model.CameraPositions == 0)
+                {
+                    model.PreviewText = string.Empty;
+                    model.PreviewEnable = true;
+                }
+
+                model.Positions.Add(position);
+                var positions = model.CameraPositions = model.Positions.Count;
+
+                if(positions == model.CameraPositions) // model.CameraPositions may have been changed elsewhere!
+                    model.PreviewText += (model.PreviewText == string.Empty ? string.Empty : "\n") + string.Format((string)FindResource("CameraPosition"), model.CameraPositions, position.X.ToInvariantString(), position.Y.ToInvariantString());
+
+                Jog.Focus();
             }
         }
 
@@ -212,7 +234,7 @@ private void showProbeProperties()
 
         public void Activate(bool activate, ViewType chgMode)
         {
-            if (activate)
+            if ((grbl.IsProbing = activate))
             {
                 if (model.CoordinateSystems.Count == 0)
                 {
@@ -258,7 +280,7 @@ public void Activate(bool activate, ViewType chgMode)
 
                 Probing.Command = GrblInfo.ReportProbeResult ? "G38.3" : "G38.2";
 
-                getView(tab.SelectedItem as TabItem)?.Activate();
+                getView(tab.SelectedItem as TabItem)?.Activate(true);
 
                 model.Grbl.PropertyChanged += Grbl_PropertyChanged;
 
@@ -271,6 +293,7 @@ public void Activate(bool activate, ViewType chgMode)
             else
             {
                 model.Grbl.PropertyChanged -= Grbl_PropertyChanged;
+                getView(tab.SelectedItem as TabItem)?.Activate(false);
 
                 if (!model.Grbl.IsGCLock)
                 {
@@ -368,7 +391,7 @@ private void Jog_FocusedChanged(object sender, RoutedEventArgs e)
             var btn = sender as Button;
             if (grbl.Keyboard.IsJogging)
                 grbl.Keyboard.JogCancel();
-            jogEnabled = btn.IsFocused && grbl.Keyboard.CanJog;
+            jogEnabled = btn.IsFocused && grbl.Keyboard.CanJog2;
             btn.Content = (string)FindResource(jogEnabled ? "JogActive" : "JogDisabled");
         }
 
@@ -376,9 +399,10 @@ private void tab_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (Equals(e.OriginalSource, sender))
             {
-                var view = getView(((sender as TabControl).SelectedItem as TabItem));
-                if (view != null)
+                if (e.AddedItems.Count == 1)
                 {
+                    var view = getView(e.AddedItems[0] as TabItem);
+                    model.Positions.Clear();
                     model.ProbingType = view.ProbingType;
                     model.Message = string.Empty;
                     model.PreviewEnable = false;
@@ -386,7 +410,10 @@ private void tab_SelectionChanged(object sender, SelectionChangedEventArgs e)
                     if (GrblInfo.IsGrblHAL)
                         Comms.com.WriteByte(GrblConstants.CMD_STATUS_REPORT_ALL);
 
-                    view.Activate();
+                    if(e.RemovedItems.Count == 1)
+                        getView(e.RemovedItems[0] as TabItem).Activate(false);
+
+                    view.Activate(true);
                 }
                 e.Handled = true;
             }
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs
index be331ba7..5ac78a18 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs	
@@ -1,13 +1,13 @@
 /*
  * ProbingViewModel.cs - part of CNC Probing library
  *
- * v0.36 / 2021-11-29 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -358,6 +358,7 @@ public ProbingType ProbingType
         public string SlowProbe { get { return string.Format(Probing.Command + "F{0}", LatchFeedRate.ToInvariantString()); } }
         public string Instructions { get { return _instructions; } set { _instructions = value; OnPropertyChanged(); } }
         public string Position { get { return _position; } set { if (_position != value) { _position = value; OnPropertyChanged(); }  } }
+        public int CameraPositions { get { return _positions.Count;} set { OnPropertyChanged(); } }
 
         public int Passes { get { return _passes; } set { _passes = value; OnPropertyChanged(); } }
         public int CoordinateSystem { get { return _coordinateSystem; } set { _coordinateSystem = value; OnPropertyChanged(); } }
@@ -492,7 +493,14 @@ public bool PreviewEnable
                     _enablePreview = value;
                     OnPropertyChanged();
                     if (!_enablePreview)
+                    {
                         PreviewText = string.Empty;
+                        if(CameraPositions > 0)
+                        {
+                            CameraPositions = 0;
+                            Positions.Clear();
+                        }
+                    }
                 }
             }
         }
diff --git a/CNC Controls Probing/CNC Controls Probing/Program.cs b/CNC Controls Probing/CNC Controls Probing/Program.cs
index 4d325a13..6b13c257 100644
--- a/CNC Controls Probing/CNC Controls Probing/Program.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/Program.cs	
@@ -374,6 +374,7 @@ public bool Execute(bool go)
                 string response;
 
                 step = 0;
+                probing.CameraPositions = 0;
                 probing.Positions.Clear();
                 probing.Machine.Clear();
 
diff --git a/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs b/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs
index 02d5125f..9f5478c4 100644
--- a/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs	
@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]
diff --git a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml
index 464f46cc..3d896884 100644
--- a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml	
@@ -66,9 +66,6 @@
                 <GroupBox x:Uid="grp_workpiece" Header="Workpiece" Visibility="Collapsed">
                     <Controls:NumericField x:Uid="fld_distance" Label="Distance" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" Margin="0,5,85,0" VerticalAlignment="Top"/>
                 </GroupBox>
-                <GroupBox x:Uid="grp_camera" Header="Camera">
-                    <Button x:Uid="btn_addPosition" Content="Add _position" IsEnabled="{Binding Path=Grbl.IsCameraVisible}" Margin="2,0" Width="75" Height="23" Focusable="False" Click="addPosition_Click"/>
-                </GroupBox>
                 <GroupBox x:Uid="grp_RotationCenter" Header="Rotation center" HorizontalAlignment="Left" Margin="5,0" ToolTip="Click to select rotation center relative to job, if not selected X0,Y0 is used.">
                     <StackPanel Orientation="Horizontal">
                         <Controls:OriginControl Value="{Binding Path=Origin, Mode=TwoWay}" IsEnabled="{Binding Path=Grbl.IsFileLoaded}" Margin="5,5,0,0"/>
diff --git a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs
index bed66db5..a9eaef56 100644
--- a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * RotationControl.xaml.cs - part of CNC Probing library
  *
- * v0.36 / 2021-11-01 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2021, Io Engineering (Terje Io)
+Copyright (c) 2021-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -59,14 +59,28 @@ public RotationControl()
 
         public ProbingType ProbingType { get { return ProbingType.Rotation; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
             var probing = DataContext as ProbingViewModel;
 
-            if(probing.ProbeEdge == Edge.A || probing.ProbeEdge == Edge.B || probing.ProbeEdge == Edge.C || probing.ProbeEdge == Edge.D)
-                probing.ProbeEdge = Edge.None;
+            if (activate) {
+                if (probing.ProbeEdge == Edge.A || probing.ProbeEdge == Edge.B || probing.ProbeEdge == Edge.C || probing.ProbeEdge == Edge.D)
+                    probing.ProbeEdge = Edge.None;
 
-            probing.Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+                probing.Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+                probing.PropertyChanged += Probing_PropertyChanged;
+            } else
+                probing.PropertyChanged -= Probing_PropertyChanged;
+        }
+
+        private void Probing_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if(e.PropertyName == nameof(ProbingViewModel.CameraPositions))
+            {
+                var probing = DataContext as ProbingViewModel;
+
+                probing.CanApplyTransform = probing.CameraPositions == 2;
+            }
         }
 
         public void Start(bool preview = false)
@@ -167,7 +181,6 @@ private void addpos ()
             probing.Positions.Add(new Position(probing.Grbl.MachinePosition));
         }
 
-
         private void OnCompleted()
         {
             bool ok;
@@ -223,22 +236,6 @@ private void use00_Click(object sender, RoutedEventArgs e)
             (DataContext as ProbingViewModel).Origin = OriginControl.Origin.None;
         }
 
-        private void addPosition_Click(object sender, RoutedEventArgs e)
-        {
-            var probing = DataContext as ProbingViewModel;
-
-            probing.Positions.Add(new Position(probing.Grbl.MachinePosition));
-
-            if(!(probing.CanApplyTransform = probing.Positions.Count == 2))
-            {
-                if (probing.Positions.Count > 2)
-                {
-                    probing.Positions.RemoveAt(0);
-                    probing.Positions.RemoveAt(0);
-                }
-            }
-        }
-
         private void apply_Click(object sender, RoutedEventArgs e)
         {
             using (new UIUtils.WaitCursor())
diff --git a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs
index 257981d0..69d02064 100644
--- a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * ToolLengthControl.cs - part of CNC Probing library
  *
- * v0.36 / 2021-12-01 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -57,12 +57,15 @@ public ToolLengthControl()
         }
         public ProbingType ProbingType { get { return ProbingType.ToolLength; } }
 
-        public void Activate()
+        public void Activate(bool activate)
         {
-            var probing = DataContext as ProbingViewModel;
-            probing.Instructions = string.Empty;
-            if (!probing.Grbl.IsParserStateLive)
-                probing.Grbl.ExecuteCommand(probing.Grbl.IsGrblHAL ? GrblConstants.CMD_GETPARSERSTATE : GrblConstants.CMD_GETNGCPARAMETERS);
+            if (activate)
+            {
+                var probing = DataContext as ProbingViewModel;
+                probing.Instructions = string.Empty;
+                if (!probing.Grbl.IsParserStateLive)
+                    probing.Grbl.ExecuteCommand(probing.Grbl.IsGrblHAL ? GrblConstants.CMD_GETPARSERSTATE : GrblConstants.CMD_GETNGCPARAMETERS);
+            }
         }
 
         public void Start(bool preview = false)
diff --git a/CNC Controls/CNC Controls/AppConfig.cs b/CNC Controls/CNC Controls/AppConfig.cs
index 5c1bb6af..4a04eb7a 100644
--- a/CNC Controls/CNC Controls/AppConfig.cs	
+++ b/CNC Controls/CNC Controls/AppConfig.cs	
@@ -1,7 +1,7 @@
 /*
  * AppConfig.cs - part of CNC Controls library
  *
- * v0.36 / 2022-01-23 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-02 / Io Engineering (Terje Io)
  *
  */
 
@@ -44,10 +44,10 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 using System.Collections.ObjectModel;
 using System.Windows.Media;
 using System.Threading;
+using System.Windows.Media.Media3D;
 using CNC.Core;
 using CNC.GCode;
 using static CNC.GCode.GCodeParser;
-using System.Windows.Media.Media3D;
 
 namespace CNC.Controls
 {
@@ -104,19 +104,24 @@ public class ProbeConfig : ViewModelBase
     [Serializable]
     public class CameraConfig : ViewModelBase
     {
+        private string _camera = string.Empty;
         private double _xoffset = 0d, _yoffset = 0d;
         private int _guideScale = 10;
+        private bool _moveToSpindle = false, _confirmMove = false;
         private CameraMoveMode _moveMode = CameraMoveMode.BothAxes;
 
         [XmlIgnore]
-        internal bool IsDirty { get; private set; } = false;
+        internal bool IsDirty { get; set; } = false;
 
         [XmlIgnore]
         public CameraMoveMode[] MoveModes { get { return (CameraMoveMode[])Enum.GetValues(typeof(CameraMoveMode)); } }
 
+        public string SelectedCamera { get { return _camera; } set { _camera = value; IsDirty = true; OnPropertyChanged(); } }
         public double XOffset { get { return _xoffset; } set { _xoffset = value; OnPropertyChanged(); } }
         public double YOffset { get { return _yoffset; } set { _yoffset = value; OnPropertyChanged(); } }
         public int GuideScale { get { return _guideScale; } set { _guideScale = value; IsDirty = true; OnPropertyChanged(); } }
+        public bool InitialMoveToSpindle { get { return _moveToSpindle; } set { _moveToSpindle = value; IsDirty = true; OnPropertyChanged(); } }
+        public bool ConfirmMove { get { return _confirmMove; } set { _confirmMove = value; IsDirty = true; OnPropertyChanged(); } }
         public CameraMoveMode MoveMode { get { return _moveMode; } set { _moveMode = value; OnPropertyChanged(); } }
     }
 
@@ -315,6 +320,7 @@ public bool Save(string filename)
 
         public bool Save()
         {
+            Camera.IsDirty = false;
             return configfile != null && Save(configfile);
         }
 
diff --git a/CNC Controls/CNC Controls/AppConfigView.xaml b/CNC Controls/CNC Controls/AppConfigView.xaml
index d76be373..b07b4a45 100644
--- a/CNC Controls/CNC Controls/AppConfigView.xaml	
+++ b/CNC Controls/CNC Controls/AppConfigView.xaml	
@@ -11,7 +11,10 @@
         <system:String x:Uid="msg_restart" x:Key="RestartMessage">A restart is required after changing settings!</system:String>
     </UserControl.Resources>
     <DockPanel>
-        <Button x:Uid="btn_saveSettings" x:Name="btnSave" DockPanel.Dock="Bottom" Content="Save settings" Margin="10,0,0,5" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="5,0" Click="btnSave_Click"/>
+        <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+            <Button x:Uid="btn_saveSettings" x:Name="btnSave" Content="Save settings" Margin="5" Padding="5,0" Click="btnSave_Click"/>
+            <Button x:Uid="btn_saveKeyMap" x:Name="btnSaveKeyMap" Content="Save keymappings" Margin="5" Padding="5,0" Click="btnSaveKeyMap_Click"/>
+        </StackPanel>
         <ItemsControl x:Name="xx" DockPanel.Dock="Top">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
diff --git a/CNC Controls/CNC Controls/AppConfigView.xaml.cs b/CNC Controls/CNC Controls/AppConfigView.xaml.cs
index f4f5d37c..b312d1fa 100644
--- a/CNC Controls/CNC Controls/AppConfigView.xaml.cs	
+++ b/CNC Controls/CNC Controls/AppConfigView.xaml.cs	
@@ -1,12 +1,12 @@
 /*
  * AppConfigView.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.36 / 2021-12-25 / Io Engineering (Terje Io)
+ * v0.37 / 2021-02-27 / Io Engineering (Terje Io)
  *
  */
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -100,7 +100,15 @@ public void Setup(UIViewModel model, AppConfig profile)
 
         private void btnSave_Click(object sender, RoutedEventArgs e)
         {
-            AppConfig.Settings.Save();
+            if(AppConfig.Settings.Save())
+                Grbl.GrblViewModel.Message = LibStrings.FindResource("SettingsSaved");
+        }
+
+        private void btnSaveKeyMap_Click(object sender, RoutedEventArgs e)
+        {
+            string filename = CNC.Core.Resources.Path + string.Format("KeyMap{0}.xml", (int)AppConfig.Settings.Jog.Mode);
+            if(Grbl.GrblViewModel.Keyboard.SaveMappings(filename))
+                Grbl.GrblViewModel.Message = string.Format(LibStrings.FindResource("KeymappingsSaved"), filename);
         }
     }
 }
diff --git a/CNC Controls/CNC Controls/CNC Controls.csproj b/CNC Controls/CNC Controls/CNC Controls.csproj
index b611145a..8c3cd0e9 100644
--- a/CNC Controls/CNC Controls/CNC Controls.csproj	
+++ b/CNC Controls/CNC Controls/CNC Controls.csproj	
@@ -68,9 +68,15 @@
     <Compile Include="ConsoleWindow.xaml.cs">
       <DependentUpon>ConsoleWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ErrorsAndAlarms.xaml.cs">
+      <DependentUpon>ErrorsAndAlarms.xaml</DependentUpon>
+    </Compile>
     <Compile Include="FileActionControl.xaml.cs">
       <DependentUpon>FileActionControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="GCodeWrapDialog.xaml.cs">
+      <DependentUpon>GCodeWrapDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="GCodeCompress.cs" />
     <Compile Include="GCodeListControl.xaml.cs">
       <DependentUpon>GCodeListControl.xaml</DependentUpon>
@@ -79,6 +85,7 @@
     <Compile Include="GCodeRotateDialog.xaml.cs">
       <DependentUpon>GCodeRotateDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="GCodeWrap.cs" />
     <Compile Include="GotoBaseControl.xaml.cs">
       <DependentUpon>GotoBaseControl.xaml</DependentUpon>
     </Compile>
@@ -88,6 +95,9 @@
     <Compile Include="GotoFlyoutControl.xaml.cs">
       <DependentUpon>GotoFlyoutControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="GrblAlarmList.xaml.cs">
+      <DependentUpon>GrblAlarmList.xaml</DependentUpon>
+    </Compile>
     <Compile Include="GrblConfigView.xaml.cs">
       <DependentUpon>GrblConfigView.xaml</DependentUpon>
     </Compile>
@@ -113,6 +123,9 @@
     <Compile Include="FeedControl.xaml.cs">
       <DependentUpon>FeedControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="GrblErrorList.xaml.cs">
+      <DependentUpon>GrblErrorList.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ICamera.cs" />
     <Compile Include="ICNCView.cs" />
     <Compile Include="IGCodeConverter.cs" />
@@ -226,6 +239,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ErrorsAndAlarms.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="GCodeWrapDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="GotoBaseControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -234,6 +255,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="GrblAlarmList.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="GrblErrorList.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="JogBaseControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/CNC Controls/CNC Controls/DROControl.xaml.cs b/CNC Controls/CNC Controls/DROControl.xaml.cs
index ebd44209..da8acec2 100644
--- a/CNC Controls/CNC Controls/DROControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/DROControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * DROControl.xaml.cs - part of CNC Controls library
  *
- * v0.36 / 2021-12-25 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2020, Io Engineering (Terje Io)
+Copyright (c) 2018-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -47,7 +47,6 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 
 namespace CNC.Controls
 {
-
     public partial class DROControl : UserControl
     {
         private double orgpos;
@@ -90,16 +89,16 @@ private void DRO_Loaded(object sender, RoutedEventArgs e)
 
                 keyboardMappingsOk = true;
 
-                keyboard.AddHandler(Key.X, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
-                keyboard.AddHandler(Key.Y, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
-                keyboard.AddHandler(Key.Z, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
+                keyboard.AddHandler(Key.X, ModifierKeys.Control | ModifierKeys.Shift, ZeroX);
+                keyboard.AddHandler(Key.Y, ModifierKeys.Control | ModifierKeys.Shift, ZeroY);
+                keyboard.AddHandler(Key.Z, ModifierKeys.Control | ModifierKeys.Shift, ZeroZ);
                 if (GrblInfo.AxisFlags.HasFlag(AxisFlags.A))
-                    keyboard.AddHandler(Key.A, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
+                    keyboard.AddHandler(Key.A, ModifierKeys.Control | ModifierKeys.Shift, ZeroA);
                 if (GrblInfo.AxisFlags.HasFlag(AxisFlags.B))
-                    keyboard.AddHandler(Key.B, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
+                    keyboard.AddHandler(Key.B, ModifierKeys.Control | ModifierKeys.Shift, ZeroB);
                 if (GrblInfo.AxisFlags.HasFlag(AxisFlags.C))
-                    keyboard.AddHandler(Key.C, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
-                keyboard.AddHandler(Key.D0, ModifierKeys.Control | ModifierKeys.Shift, zeroAxes);
+                    keyboard.AddHandler(Key.C, ModifierKeys.Control | ModifierKeys.Shift, ZeroC);
+                keyboard.AddHandler(Key.D0, ModifierKeys.Control | ModifierKeys.Shift, ZeroAxes);
             }
         }
 
@@ -163,9 +162,47 @@ void btnZeroAll_Click(object sender, EventArgs e)
             AxisPositionChanged("ALL", 0.0d);
         }
 
-        private bool zeroAxes(Key key)
+        private bool ZeroAxes(Key key)
+        {
+            AxisPositionChanged("ALL", 0d);
+
+            return true;
+        }
+
+        private bool ZeroX(Key key)
         {
-            AxisPositionChanged(key == Key.D0 ? "ALL" : key.ToString(), 0d);
+            AxisPositionChanged("X", 0d);
+
+            return true;
+        }
+
+        private bool ZeroY(Key key)
+        {
+            AxisPositionChanged("Y", 0d);
+
+            return true;
+        }
+        private bool ZeroZ(Key key)
+        {
+            AxisPositionChanged("Z", 0d);
+
+            return true;
+        }
+        private bool ZeroA(Key key)
+        {
+            AxisPositionChanged("A", 0d);
+
+            return true;
+        }
+        private bool ZeroB(Key key)
+        {
+            AxisPositionChanged("B", 0d);
+
+            return true;
+        }
+        private bool ZeroC(Key key)
+        {
+            AxisPositionChanged("C", 0d);
 
             return true;
         }
@@ -184,5 +221,3 @@ void AxisPositionChanged(string axis, double position)
         }
     }
 }
-
-
diff --git a/CNC Controls/CNC Controls/GCode.cs b/CNC Controls/CNC Controls/GCode.cs
index eb2e9586..a3d380ed 100644
--- a/CNC Controls/CNC Controls/GCode.cs	
+++ b/CNC Controls/CNC Controls/GCode.cs	
@@ -1,13 +1,13 @@
 /*
  * GCode.cs - part of CNC Controls library for Grbl
  *
- * v0.36 / 2021-12-14 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io)
+Copyright (c) 2018-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -151,6 +151,11 @@ public bool AddTransformer(Type converter, string name, ObservableCollection<Men
             return ok;
         }
 
+        public bool HasTransformer(Type converter)
+        {
+            return Transformers.Where(x => x.Type == converter).FirstOrDefault().Type == converter;
+        }
+
         private void TransformMenu_Click(object sender, RoutedEventArgs e)
         {
             Transform((int)(sender as MenuItem).Tag);
@@ -279,7 +284,6 @@ public void Save()
                         {
                             foreach (DataRow line in Program.Data.Rows)
                                 stream.WriteLine((string)line["Data"]);
-
                         }
                     }
                 }
diff --git a/CNC Controls/CNC Controls/ICamera.cs b/CNC Controls/CNC Controls/ICamera.cs
index ab9a09af..34ac89ab 100644
--- a/CNC Controls/CNC Controls/ICamera.cs	
+++ b/CNC Controls/CNC Controls/ICamera.cs	
@@ -1,12 +1,12 @@
 /*
  * ICamera.cs - part of CNC Controls library for Grbl
  *
- * v0.33 / 2021-05-04 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -50,6 +50,7 @@ public interface ICamera
 
         bool HasCamera { get; }
         bool IsVisible { get; }
+        bool IsMoveEnabled { get; set; }
 
         void Open();
         void Close();
diff --git a/CNC Controls/CNC Controls/JobControl.xaml.cs b/CNC Controls/CNC Controls/JobControl.xaml.cs
index 1f2602a0..dfc97e47 100644
--- a/CNC Controls/CNC Controls/JobControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/JobControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * JobControl.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.36 / 2021-12-27 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io)
+Copyright (c) 2018-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -169,10 +169,10 @@ private void JobControl_Loaded(object sender, RoutedEventArgs e)
                     keyboard.AddHandler(Key.F11, ModifierKeys.None, FnKeyHandler);
                     keyboard.AddHandler(Key.F12, ModifierKeys.None, FnKeyHandler);
 
-                    keyboard.AddHandler(Key.OemMinus, ModifierKeys.Control, feedRateDown);
-                    keyboard.AddHandler(Key.OemPlus, ModifierKeys.Control, feedRateUp);
-                    keyboard.AddHandler(Key.OemMinus, ModifierKeys.Shift | ModifierKeys.Control, feedRateDownFine);
-                    keyboard.AddHandler(Key.OemPlus, ModifierKeys.Shift | ModifierKeys.Control, feedRateUpFine);
+                    keyboard.AddHandler(Key.OemMinus, ModifierKeys.Control, FeedRateDown);
+                    keyboard.AddHandler(Key.OemPlus, ModifierKeys.Control, FeedRateUp);
+                    keyboard.AddHandler(Key.OemMinus, ModifierKeys.Shift | ModifierKeys.Control, FeedRateDownFine);
+                    keyboard.AddHandler(Key.OemPlus, ModifierKeys.Shift | ModifierKeys.Control, FeedRateUpFine);
                 }
 
                 GCodeParser.IgnoreM6 = AppConfig.Settings.Base.IgnoreM6;
@@ -316,25 +316,25 @@ public void EnablePolling(bool enable)
 
         #region Keyboard shortcut handlers
 
-        private bool feedRateUpFine(Key key)
+        private bool FeedRateUpFine(Key key)
         {
             Comms.com.WriteByte((byte)GrblConstants.CMD_FEED_OVR_FINE_PLUS);
             return true;
         }
 
-        private bool feedRateDownFine(Key key)
+        private bool FeedRateDownFine(Key key)
         {
             Comms.com.WriteByte((byte)GrblConstants.CMD_FEED_OVR_FINE_MINUS);
             return true;
         }
 
-        private bool feedRateUp(Key key)
+        private bool FeedRateUp(Key key)
         {
             Comms.com.WriteByte((byte)GrblConstants.CMD_FEED_OVR_COARSE_PLUS);
             return true;
         }
 
-        private bool feedRateDown(Key key)
+        private bool FeedRateDown(Key key)
         {
             Comms.com.WriteByte((byte)GrblConstants.CMD_FEED_OVR_COARSE_MINUS);
             return true;
@@ -486,7 +486,29 @@ public void CycleStart()
 
         public void SendRTCommand(string command)
         {
-            Comms.com.WriteByte((byte)command[0]);
+            var b = Convert.ToInt32(command[0]);
+
+            if(b > 255) switch(b)
+            { 
+                case 8222:
+                    b = GrblConstants.CMD_SAFETY_DOOR;
+                    break;
+
+                case 8225:
+                    b = GrblConstants.CMD_STATUS_REPORT_ALL;
+                    break;
+
+                case 710:
+                    b = GrblConstants.CMD_OPTIONAL_STOP_TOGGLE;
+                    break;
+
+                case 8240:
+                    b = GrblConstants.CMD_SINGLE_BLOCK_TOGGLE;
+                    break;
+            }
+
+            if(b <= 255)
+                Comms.com.WriteByte((byte)b);
         }
 
         private void SendCommand(string command)
diff --git a/CNC Controls/CNC Controls/JogBaseControl.xaml.cs b/CNC Controls/CNC Controls/JogBaseControl.xaml.cs
index 200799bf..05658609 100644
--- a/CNC Controls/CNC Controls/JogBaseControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/JogBaseControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * JogBaseControl.xaml.cs - part of CNC Controls library
  *
- * v0.36 / 2022-01-10 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
@@ -59,7 +59,6 @@ public partial class JogBaseControl : UserControl
         private KeypressHandler keyboard;
         private static bool keyboardMappingsOk = false;
 
-
         private const Key xplus = Key.J, xminus = Key.H, yplus = Key.K, yminus = Key.L, zplus = Key.I, zminus = Key.M, aplus = Key.U, aminus = Key.N;
 
         public JogBaseControl()
@@ -118,203 +117,256 @@ private void JogControl_Loaded(object sender, RoutedEventArgs e)
 
                     if (AppConfig.Settings.Jog.Mode == JogConfig.JogMode.UI)
                     {
-                        keyboard.AddHandler(Key.PageUp, ModifierKeys.None, cursorKeyJog, false);
-                        keyboard.AddHandler(Key.PageDown, ModifierKeys.None, cursorKeyJog, false);
-                        keyboard.AddHandler(Key.Left, ModifierKeys.None, cursorKeyJog, false);
-                        keyboard.AddHandler(Key.Up, ModifierKeys.None, cursorKeyJog, false);
-                        keyboard.AddHandler(Key.Right, ModifierKeys.None, cursorKeyJog, false);
-                        keyboard.AddHandler(Key.Down, ModifierKeys.None, cursorKeyJog, false);
+                        keyboard.AddHandler(Key.PageUp, ModifierKeys.None, CursorJogZplus, false);
+                        keyboard.AddHandler(Key.PageDown, ModifierKeys.None, CursorJogZminus, false);
+                        keyboard.AddHandler(Key.Left, ModifierKeys.None, CursorJogXminus, false);
+                        keyboard.AddHandler(Key.Up, ModifierKeys.None, CursorJogYplus, false);
+                        keyboard.AddHandler(Key.Right, ModifierKeys.None, CursorJogXplus, false);
+                        keyboard.AddHandler(Key.Down, ModifierKeys.None, CursorJogYminus, false);
                     }
 
-                    keyboard.AddHandler(xplus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                    keyboard.AddHandler(xminus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                    keyboard.AddHandler(yplus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                    keyboard.AddHandler(yminus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                    keyboard.AddHandler(zplus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                    keyboard.AddHandler(zminus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
+                    keyboard.AddHandler(xplus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogXplus, false);
+                    keyboard.AddHandler(xminus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogXminus, false);
+                    keyboard.AddHandler(yplus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogYplus, false);
+                    keyboard.AddHandler(yminus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogYminus, false);
+                    keyboard.AddHandler(zplus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogZplus, false);
+                    keyboard.AddHandler(zminus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogZminus, false);
                     if(GrblInfo.AxisFlags.HasFlag(AxisFlags.A)) {
-                        keyboard.AddHandler(aplus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
-                        keyboard.AddHandler(aminus, ModifierKeys.Control | ModifierKeys.Shift, normalKeyJog, false);
+                        keyboard.AddHandler(aplus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogAplus, false);
+                        keyboard.AddHandler(aminus, ModifierKeys.Control | ModifierKeys.Shift, KeyJogAminus, false);
                     }
 
                     if (AppConfig.Settings.Jog.Mode != JogConfig.JogMode.Keypad)
                     {
-                        keyboard.AddHandler(Key.End, ModifierKeys.None, endJog, false);
-
-                        keyboard.AddHandler(Key.NumPad0, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad1, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad2, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad3, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad4, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad5, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad6, ModifierKeys.Control, adjustJog);
-                        keyboard.AddHandler(Key.NumPad7, ModifierKeys.Control, adjustJog);
-
-                        keyboard.AddHandler(Key.NumPad2, ModifierKeys.None, adjustJog2);
-                        keyboard.AddHandler(Key.NumPad4, ModifierKeys.None, adjustJog2);
-                        keyboard.AddHandler(Key.NumPad6, ModifierKeys.None, adjustJog2);
-                        keyboard.AddHandler(Key.NumPad8, ModifierKeys.None, adjustJog2);
+                        keyboard.AddHandler(Key.End, ModifierKeys.None, EndJog, false);
+
+                        keyboard.AddHandler(Key.NumPad0, ModifierKeys.Control, JogStep0);
+                        keyboard.AddHandler(Key.NumPad1, ModifierKeys.Control, JogStep1);
+                        keyboard.AddHandler(Key.NumPad2, ModifierKeys.Control, JogStep2);
+                        keyboard.AddHandler(Key.NumPad3, ModifierKeys.Control, JogStep3);
+                        keyboard.AddHandler(Key.NumPad4, ModifierKeys.Control, JogFeed0);
+                        keyboard.AddHandler(Key.NumPad5, ModifierKeys.Control, JogFeed1);
+                        keyboard.AddHandler(Key.NumPad6, ModifierKeys.Control, JogFeed2);
+                        keyboard.AddHandler(Key.NumPad7, ModifierKeys.Control, JogFeed3);
+
+                        keyboard.AddHandler(Key.NumPad2, ModifierKeys.None, FeedDec);
+                        keyboard.AddHandler(Key.NumPad4, ModifierKeys.None, StepDec);
+                        keyboard.AddHandler(Key.NumPad6, ModifierKeys.None, StepInc);
+                        keyboard.AddHandler(Key.NumPad8, ModifierKeys.None, FeedInc);
                     }
                 }
             }
         }
 
-        private void distance_Click(object sender, RoutedEventArgs e)
+        private bool KeyJogXplus(Key key)
         {
-            distance = int.Parse((string)(sender as RadioButton).Tag);
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "Z+" : "X+");
+
+            return true;
         }
 
-        private void feedrate_Click(object sender, RoutedEventArgs e)
+        private bool KeyJogXminus(Key key)
         {
-            feedrate = int.Parse((string)(sender as RadioButton).Tag);
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "Z-" : "X-");
+
+            return true;
         }
 
-        private bool endJog(Key key)
+        private bool KeyJogYplus(Key key)
         {
-            if(!keyboard.IsRepeating && keyboard.IsJogging)
-                JogCommand("stop");
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "X-" : "Y+");
 
-            return keyboard.IsJogging;
+            return true;
         }
 
-        private bool adjustJog(Key key)
+        private bool KeyJogYminus(Key key)
         {
-            switch (key)
-            {
-                case Key.NumPad0:
-                    JogData.StepSize = JogViewModel.JogStep.Step0;
-                    return true;
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "X+" : "Y-");
 
-                case Key.NumPad1:
-                    JogData.StepSize = JogViewModel.JogStep.Step1;
-                    return true;
+            return true;
+        }
 
-                case Key.NumPad2:
-                    JogData.StepSize = JogViewModel.JogStep.Step2;
-                    return true;
+        private bool KeyJogZplus(Key key)
+        {
+            if (keyboard.CanJog2 && !keyboard.IsRepeating && !GrblInfo.LatheModeEnabled)
+                JogCommand("Z+");
 
-                case Key.NumPad3:
-                    JogData.StepSize = JogViewModel.JogStep.Step3;
-                    return true;
+            return true;
+        }
 
-                case Key.NumPad4:
-                    JogData.Feed = JogViewModel.JogFeed.Feed0;
-                    return true;
+        private bool KeyJogZminus(Key key)
+        {
+            if (keyboard.CanJog2 && !keyboard.IsRepeating && !GrblInfo.LatheModeEnabled)
+                JogCommand("Z-");
 
-                case Key.NumPad5:
-                    JogData.Feed = JogViewModel.JogFeed.Feed1;
-                    return true;
+            return true;
+        }
 
-                case Key.NumPad6:
-                    JogData.Feed = JogViewModel.JogFeed.Feed2;
-                    return true;
+        private bool KeyJogAplus(Key key)
+        {
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand("A+");
 
-                case Key.NumPad7:
-                    JogData.Feed = JogViewModel.JogFeed.Feed3;
-                    return true;
-            }
+            return true;
+        }
+
+        private bool KeyJogAminus(Key key)
+        {
+            if (keyboard.CanJog2 && !keyboard.IsRepeating)
+                JogCommand("A-");
 
             return true;
         }
 
-        private bool adjustJog2(Key key)
+        private bool CursorJogXplus(Key key)
         {
-            switch (key)
-            {
-                case Key.NumPad2:
-                    JogData.FeedDec();
-                    return true;
+            if (keyboard.CanJog && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "Z+" : "X+");
+
+            return true;
+        }
 
-                case Key.NumPad4:
-                    JogData.StepDec();
-                    return true;
+        private bool CursorJogXminus(Key key)
+        {
+            if (keyboard.CanJog && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "Z-" : "X-");
 
-                case Key.NumPad6:
-                    JogData.StepInc();
-                    return true;
+            return true;
+        }
 
-                case Key.NumPad8:
-                    JogData.FeedInc();
-                    return true;
-            }
+        private bool CursorJogYplus(Key key)
+        {
+            if (keyboard.CanJog && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "X-" : "Y+");
 
             return true;
         }
 
-        private bool normalKeyJog(Key key)
+        private bool CursorJogYminus(Key key)
         {
-            if (keyboard.CanJog2 && !keyboard.IsRepeating) switch (key)
-            {
-                case zplus:
-                    if (!GrblInfo.LatheModeEnabled)
-                        JogCommand("Z+");
-                    break;
+            if (keyboard.CanJog && !keyboard.IsRepeating)
+                JogCommand(GrblInfo.LatheModeEnabled ? "X+" : "Y-");
 
-                case zminus:
-                    if (!GrblInfo.LatheModeEnabled)
-                        JogCommand("Z-");
-                    break;
+            return true;
+        }
 
-                case xminus:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "Z-" : "X-");
-                    break;
+        private bool CursorJogZplus(Key key)
+        {
+            if (keyboard.CanJog && !keyboard.IsRepeating && !GrblInfo.LatheModeEnabled)
+                JogCommand("Z+");
 
-                case yplus:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "X-" : "Y+");
-                    break;
+            return true;
+        }
 
-                case xplus:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "Z+" : "X+");
-                    break;
+        private bool CursorJogZminus(Key key)
+        {
+            if (keyboard.CanJog && !keyboard.IsRepeating && !GrblInfo.LatheModeEnabled)
+                JogCommand("Z-");
 
-                case yminus:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "X+" : "Y-");
-                    break;
+            return true;
+        }
 
-                case aplus:
-                    JogCommand("A+");
-                    break;
+        private void distance_Click(object sender, RoutedEventArgs e)
+        {
+            distance = int.Parse((string)(sender as RadioButton).Tag);
+        }
 
-                case aminus:
-                    JogCommand("A-");
-                    break;
-            }
+        private void feedrate_Click(object sender, RoutedEventArgs e)
+        {
+            feedrate = int.Parse((string)(sender as RadioButton).Tag);
+        }
+
+        private bool EndJog(Key key)
+        {
+            if(!keyboard.IsRepeating && keyboard.IsJogging)
+                JogCommand("stop");
+
+            return keyboard.IsJogging;
+        }
+
+        private bool JogStep0(Key key)
+        {
+            JogData.StepSize = JogViewModel.JogStep.Step0;
 
             return true;
         }
 
-        private bool cursorKeyJog(Key key)
+        private bool JogStep1(Key key)
         {
-            if(keyboard.CanJog && !keyboard.IsRepeating) switch (key)
-            {
-                case Key.PageUp:
-                    if (!GrblInfo.LatheModeEnabled)
-                        JogCommand("Z+");
-                    break;
+            JogData.StepSize = JogViewModel.JogStep.Step1;
 
-                case Key.PageDown:
-                    if (!GrblInfo.LatheModeEnabled)
-                        JogCommand("Z-");
-                    break;
+            return true;
+        }
 
-                case Key.Left:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "Z-" : "X-");
-                    break;
+        private bool JogStep2(Key key)
+        {
+            JogData.StepSize = JogViewModel.JogStep.Step2;
 
-                case Key.Up:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "X-" : "Y+");
-                    break;
+            return true;
+        }
 
-                case Key.Right:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "Z+" : "X+");
-                    break;
+        private bool JogStep3(Key key)
+        {
+            JogData.StepSize = JogViewModel.JogStep.Step3;
 
-                case Key.Down:
-                    JogCommand(GrblInfo.LatheModeEnabled ? "X+" : "Y-");
-                    break;
-            }
+            return true;
+        }
+
+        private bool JogFeed0(Key key)
+        {
+            JogData.Feed = JogViewModel.JogFeed.Feed0;
+
+            return true;
+        }
 
-            return keyboard.CanJog;
+        private bool JogFeed1(Key key)
+        {
+            JogData.Feed = JogViewModel.JogFeed.Feed1;
+
+            return true;
+        }
+        private bool JogFeed2(Key key)
+        {
+            JogData.Feed = JogViewModel.JogFeed.Feed2;
+
+            return true;
+        }
+        private bool JogFeed3(Key key)
+        {
+            JogData.Feed = JogViewModel.JogFeed.Feed3;
+
+            return true;
+        }
+
+        private bool FeedDec(Key key)
+        {
+            JogData.FeedDec();
+
+            return true;
+        }
+        private bool FeedInc(Key key)
+        {
+            JogData.FeedInc();
+
+            return true;
+        }
+
+        private bool StepDec(Key key)
+        {
+            JogData.StepDec();
+
+            return true;
+        }
+
+        private bool StepInc(Key key)
+        {
+            JogData.StepInc();
+
+            return true;
         }
 
         private void JogCommand(string cmd)
diff --git a/CNC Controls/CNC Controls/LibStrings.xaml b/CNC Controls/CNC Controls/LibStrings.xaml
index 23c66eeb..6eb3bd3b 100644
--- a/CNC Controls/CNC Controls/LibStrings.xaml	
+++ b/CNC Controls/CNC Controls/LibStrings.xaml	
@@ -36,4 +36,6 @@
     <system:String x:Uid="str_grblStateAlarm" x:Key="StateAlarm">ALARM</system:String>
     <system:String x:Uid="str_grblStateDoor" x:Key="StateDoor">DOOR</system:String>
     <system:String x:Uid="str_grblStateSleep" x:Key="StateSleep">SLEEP</system:String>
+    <system:String x:Uid="str_settingsSaved" x:Key="SettingsSaved">Settings saved.</system:String>
+    <system:String x:Uid="str_keymappingsSaved" x:Key="KeymappingsSaved">Keymappings saved to {0}</system:String>
 </ResourceDictionary>
diff --git a/CNC Controls/CNC Controls/OutlineBaseControl.xaml b/CNC Controls/CNC Controls/OutlineBaseControl.xaml
index 564100e0..2d65a4f3 100644
--- a/CNC Controls/CNC Controls/OutlineBaseControl.xaml	
+++ b/CNC Controls/CNC Controls/OutlineBaseControl.xaml	
@@ -6,23 +6,23 @@
              xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:CNC.Controls"
              mc:Ignorable="d" Loaded="OutlineControl_Loaded"
-             d:DesignHeight="130" d:DesignWidth="250">
+             d:DesignHeight="100" d:DesignWidth="250">
     <UserControl.Resources>
         <ResourceDictionary>
             <local:LogicalNotConverter x:Key="LogicalNotConverter" />
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid Height="130" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource LogicalNotConverter}}">
+    <Grid Height="100" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource LogicalNotConverter}}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="180"/>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-        <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="5,15,4,0" Width="Auto" VerticalAlignment="Top" Grid.ColumnSpan="2">
+        <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="5,0,4,0" Width="Auto" VerticalAlignment="Top" Grid.ColumnSpan="2">
             <Run x:Uid="txt_line1" Text="Execute moves to outline X and Y program limits."/>
             <LineBreak/>
             <Run x:Uid="txt_line2" Text="Ensure tool tip is clear of any obstructions!" Foreground="Red" FontWeight="Bold"/>
         </TextBlock>
-        <local:NumericField x:Uid="lbl_feedrate" Label="Feed rate:" Value="{Binding Path=FeedRate, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}}" Unit="{Binding Path=FeedrateUnit, Mode=OneWay}" Format="###0" HorizontalAlignment="Left" Margin="5,95,0,0" VerticalAlignment="Top"/>
-        <Button x:Uid="btn_go" Content="Go" IsEnabled="{Binding Path=IsFileLoaded}" Grid.Column="1" Width="50" Height="25" HorizontalAlignment="Right" Margin="0,95,8,0" VerticalAlignment="Top" Click="button_Go" />
+        <local:NumericField x:Uid="lbl_feedrate" Label="Feed rate:" Value="{Binding Path=FeedRate, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}}" Unit="{Binding Path=FeedrateUnit, Mode=OneWay}" Format="###0" HorizontalAlignment="Left" Margin="5,70,0,0" VerticalAlignment="Top"/>
+        <Button x:Uid="btn_go" Content="Go" IsEnabled="{Binding Path=IsFileLoaded}" Grid.Column="1" Width="50" Height="25" HorizontalAlignment="Right" Margin="0,70,8,0" VerticalAlignment="Top" Click="button_Go" />
     </Grid>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/OutlineControl.xaml b/CNC Controls/CNC Controls/OutlineControl.xaml
index fc8968bb..f946a3af 100644
--- a/CNC Controls/CNC Controls/OutlineControl.xaml	
+++ b/CNC Controls/CNC Controls/OutlineControl.xaml	
@@ -5,8 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:CNC.Controls"
              mc:Ignorable="d" 
-             d:DesignHeight="150" d:DesignWidth="250">
-    <GroupBox x:Uid="grp_outline" x:Name="grpOutline" Header="Outline" HorizontalAlignment="Left" VerticalAlignment="Top" Width="250" Height="150">
+             d:DesignHeight="125" d:DesignWidth="250">
+    <GroupBox x:Uid="grp_outline" x:Name="grpOutline" Header="Outline" HorizontalAlignment="Left" VerticalAlignment="Top" Width="250" Height="125">
         <local:OutlineBaseControl/>
     </GroupBox>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/OutlineFlyout.xaml b/CNC Controls/CNC Controls/OutlineFlyout.xaml
index 24455154..cc824b29 100644
--- a/CNC Controls/CNC Controls/OutlineFlyout.xaml	
+++ b/CNC Controls/CNC Controls/OutlineFlyout.xaml	
@@ -6,7 +6,7 @@
              xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:CNC.Controls"
              mc:Ignorable="d" 
-             d:DesignHeight="130" d:DesignWidth="300" MaxWidth="300"
+             d:DesignHeight="120" d:DesignWidth="300" MaxWidth="300"
              Loaded="OutlineFlyout_Loaded">
     <UserControl.Resources>
         <system:String x:Uid="str_outlineFlyout" x:Key="MenuLabel">_Outline</system:String>
@@ -24,8 +24,8 @@
         </Style>
     </UserControl.Resources>
     <Border BorderBrush="DarkGray" BorderThickness="1" CornerRadius="3" Background="#FFE5E5EA">
-        <Grid Height="130">
-            <local:OutlineBaseControl/>
+        <Grid Height="120">
+            <local:OutlineBaseControl Margin="0,15,0,0"/>
             <Button Content="×" Focusable="False" Style="{StaticResource SmallXButtonStyle}" VerticalContentAlignment="Top" HorizontalAlignment="Left" Margin="285,0,0,0" VerticalAlignment="Top" Width="14" Height="18" Click="btn_Close"/>
         </Grid>
     </Border>
diff --git a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs b/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs
index 1c63df48..504cd8c3 100644
--- a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs	
+++ b/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs	
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]
diff --git a/CNC Core/CNC Core/GCodeParser.cs b/CNC Core/CNC Core/GCodeParser.cs
index 70125e8a..d871208c 100644
--- a/CNC Core/CNC Core/GCodeParser.cs	
+++ b/CNC Core/CNC Core/GCodeParser.cs	
@@ -1,13 +1,13 @@
 /*
  * GCodeParser.cs - part of CNC Controls library
  *
- * v0.36 / 2021-11-17 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-22 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -917,7 +917,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
             if (modalGroups.HasFlag(ModalGroups.G5))
             {
                 FeedRateMode = (FeedRateMode)(cmdFeedrateMode - 93);
-                Tokens.Add(new GCodeToken(cmdFeedrateMode, gcValues.N));
+                Tokens.Add(new GCFeedRateMode(cmdFeedrateMode, gcValues.N));
             }
 
             //
@@ -1620,6 +1620,7 @@ public static void Save(string filePath, List<GCodeToken> objToSerialize)
                         typeof(GCCannedDrill),
                         typeof(GCPlane),
                         typeof(GCDistanceMode),
+                        typeof(GCFeedRateMode),
                         typeof(GCIJKMode),
                         typeof(GCUnits),
                         typeof(GCLatheMode),
@@ -2841,6 +2842,11 @@ public GCFeedrate(Commands command, uint lnr, double feedrate) : base(command, l
             Feedrate = feedrate;
         }
 
+        public GCFeedrate(uint lnr, double feedrate) : base(Commands.Feedrate, lnr)
+        {
+            Feedrate = feedrate;
+        }
+
         public double Feedrate { get; set; }
 
         public new string ToString()
@@ -2938,9 +2944,29 @@ public GCDistanceMode(Commands command, uint lnr) : base(command, lnr)
         {
         }
 
+        public GCDistanceMode(uint lnr, DistanceMode distanceMode) : base(distanceMode == DistanceMode.Absolute ? Commands.G90 : Commands.G91, lnr)
+        {
+        }
+
         public DistanceMode DistanceMode { get { return Command == Commands.G90 ? DistanceMode.Absolute : DistanceMode.Incremental; } }
     }
 
+    public class GCFeedRateMode : GCodeToken
+    {
+        public GCFeedRateMode()
+        { }
+
+        public GCFeedRateMode(Commands command, uint lnr) : base(command, lnr)
+        {
+        }
+
+        public GCFeedRateMode(uint lnr, FeedRateMode feedRateMode) : base(feedRateMode == FeedRateMode.UnitsPerMin ? Commands.G94 : (feedRateMode == FeedRateMode.InverseTime ? Commands.G93 : Commands.G95), lnr)
+        {
+        }
+
+        public FeedRateMode FeedRateMode { get { return Command == Commands.G94 ? FeedRateMode.UnitsPerMin : (Command == Commands.G93 ? FeedRateMode.InverseTime : FeedRateMode.UnitsPerRev); } }
+    }
+
     public class GCIJKMode : GCodeToken
     {
         public GCIJKMode()
diff --git a/CNC Core/CNC Core/Grbl.cs b/CNC Core/CNC Core/Grbl.cs
index e9d5df4b..2b835cce 100644
--- a/CNC Core/CNC Core/Grbl.cs	
+++ b/CNC Core/CNC Core/Grbl.cs	
@@ -1,7 +1,7 @@
 /*
  * Grbl.cs - part of CNC Controls library
  *
- * v0.36 / 2022-01-20 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-10 / Io Engineering (Terje Io)
  *
  */
 
@@ -652,19 +652,31 @@ private void Values_PropertyChanged(object sender, PropertyChangedEventArgs e)
             OnPropertyChanged(e.PropertyName);
         }
 
-        public void Parse(string values)
+        public bool Parse(string values)
         {
-            bool changed = false;
-            double[] position = dbl.ParseList(values); 
-            for (var i = 0; i < position.Length; i++) {
-                if (double.IsNaN(Values[i]) ? !double.IsNaN(position[i]) : Values[i] != position[i])
+            bool changed = false, ok = false;
+
+            try
+            {
+                double[] position = dbl.ParseList(values);
+
+                for (var i = 0; i < position.Length; i++)
                 {
-                    Values[i] = position[i];
-                    changed = true;
+                    if (double.IsNaN(Values[i]) ? !double.IsNaN(position[i]) : Values[i] != position[i])
+                    {
+                        Values[i] = position[i];
+                        changed = true;
+                    }
                 }
+
+                if (changed)
+                    OnPropertyChanged("Position");
+
+                ok = true;
             }
-            if(changed)
-                OnPropertyChanged("Position");
+            catch { }
+
+            return ok;
         }
 
         public string ToString(AxisFlags axisflags, int precision = 3)
@@ -1304,9 +1316,9 @@ public static string Tool
             return value;
         }
 
-        public static void Process(string data)
+        public static bool Process(string data)
         {
-            if (data.StartsWith("[GC:"))
+            if (data.StartsWith("[GC:")) try
             {
                 state.Clear();
                 string[] s = data.Substring(4).TrimEnd(']').Split(' ');
@@ -1522,7 +1534,10 @@ public static void Process(string data)
                         }
                     }
                 }
+                return true;
             }
+            catch { }
+            return false;
         }
     }
 
@@ -1744,7 +1759,9 @@ private static void process(string data)
 
     public class GrblErrors
     {
-        private static Dictionary<string, string> messages = new Dictionary<string, string>();
+        private static Dictionary<int, string> messages = new Dictionary<int, string>();
+
+        public static Dictionary<int, string> List { get { return messages; } }
 
         public static bool Get()
         {
@@ -1794,14 +1811,17 @@ public static bool Get(GrblViewModel model)
 
                         while (line != null)
                         {
+                            int key;
                             string[] columns = line.Split(',');
 
-                            if (columns.Length == 3)
+                            columns[0].Replace("\"", "");
+
+                            if (columns.Length == 3 && int.TryParse(columns[0], out key))
                             {
-                                if (!noload && messages.TryGetValue(columns[0], out msg))
-                                    messages.Remove(columns[0]);
+                                if (!noload && messages.TryGetValue(key, out msg))
+                                    messages.Remove(key);
 
-                                 messages.Add(columns[0], columns[2]);
+                                messages.Add(key, columns[1] + ": " + columns[2]);
                             }
 
                             line = file.ReadLine();
@@ -1823,10 +1843,16 @@ private static void Process(string data)
             if (data.StartsWith("[ERRORCODE:"))
             {
                 var details = data.Substring(11).TrimEnd(']').Split('|');
-                if(details.Length == 3)
-                    messages.Add(details[0], details[2] == string.Empty ? details[1] : details[2]);
-                else
-                    messages.Add(details[0], details[1]);
+                try
+                {
+                    if (details.Length == 3)
+                        messages.Add(int.Parse(details[0]), details[2] == string.Empty ? details[1] : details[2]);
+                    else
+                        messages.Add(int.Parse(details[0]), details[1]);
+                }
+                catch
+                {
+                }
             }
         }
 
@@ -1835,26 +1861,34 @@ static GrblErrors()
 
         }
 
-        public static string GetMessage(string key)
+        public static string GetMessage(string code)
         {
             string message = null;
 
-            if (messages != null)
-                messages.TryGetValue(key, out message);
+            try
+            {
+                if (messages != null)
+                    messages.TryGetValue(int.Parse(code), out message);
+            }
+            catch
+            {
+            }
 
-            return message == null ? string.Format("error:{0}", key) : message;
+            return message == null ? string.Format("error:{0}", code) : message;
         }
     }
 
     public class GrblAlarms
     {
-        private static Dictionary<string, string> messages = new Dictionary<string, string>();
+        private static Dictionary<int, string> messages = new Dictionary<int, string>();
 
         public static bool Get()
         {
             return Grbl.GrblViewModel != null && Get(Grbl.GrblViewModel);
         }
 
+        public static Dictionary<int, string> List { get { return messages; } }
+
         public static bool Get(GrblViewModel model)
         {
             bool? res = null;
@@ -1898,14 +1932,17 @@ public static bool Get(GrblViewModel model)
 
                         while (line != null)
                         {
+                            int key;
                             string[] columns = line.Split(',');
 
-                            if (columns.Length == 3)
+                            columns[0].Replace("\"", "");
+
+                            if (columns.Length == 3 && int.TryParse(columns[0], out key))
                             {
-                                if (!noload && messages.TryGetValue(columns[0], out msg))
-                                    messages.Remove(columns[0]);
+                                if (!noload && messages.TryGetValue(key, out msg))
+                                    messages.Remove(key);
 
-                                messages.Add(columns[0], columns[1] + ": " + columns[2]);
+                                messages.Add(key, columns[1] + ": " + columns[2]);
                             }
 
                             line = file.ReadLine();
@@ -1927,21 +1964,33 @@ private static void Process(string data)
             if (data.StartsWith("[ALARMCODE:"))
             {
                 var details = data.Substring(11).TrimEnd(']').Split('|');
-                if(details.Length == 3)
-                    messages.Add(details[0], details[1] == string.Empty ? details[2] : details[1] + ": " + details[2]);
-                else
-                    messages.Add(details[0], details[1]);
+                try
+                {
+                    if (details.Length == 3)
+                        messages.Add(int.Parse(details[0]), details[1] == string.Empty ? details[2] : details[1] + ": " + details[2]);
+                    else
+                        messages.Add(int.Parse(details[0]), details[1]);
+                }
+                catch
+                {
+                }
             }
         }
 
-        public static string GetMessage(string key)
+        public static string GetMessage(string code)
         {
             string message = "";
 
-            if (messages != null)
-                messages.TryGetValue(key, out message);
+            try
+            {
+                if (messages != null)
+                    messages.TryGetValue(int.Parse(code), out message);
+            }
+            catch
+            {
+            }
 
-            return message == "" ? string.Format("Alarm {0}", key) : message;
+            return message == "" ? string.Format("Alarm {0}", code) : message;
         }
     }
 
diff --git a/CNC Core/CNC Core/GrblViewModel.cs b/CNC Core/CNC Core/GrblViewModel.cs
index 51e12b6b..4732613f 100644
--- a/CNC Core/CNC Core/GrblViewModel.cs	
+++ b/CNC Core/CNC Core/GrblViewModel.cs	
@@ -1,13 +1,13 @@
 /*
  * GrblViewModel.cs - part of CNC Controls library
  *
- * v0.36 / 2021-12-19 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-02 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -54,7 +54,7 @@ public class GrblViewModel : MeasureViewModel
         private string[] _rtState = new string[3];
         private bool has_wco = false, suspend = false, _hasFans = false;
         private bool _flood, _mist, _fan0, _toolChange, _reset, _isMPos, _isJobRunning, _isProbeSuccess, _pgmEnd, _isParserStateLive, _isTloRefSet;
-        private bool _canReset, _isCameraVisible = false, _responseLogVerbose = false;
+        private bool _canReset, _isCameraVisible = false, _responseLogVerbose = false, _isProbing = false;
         private bool? _mpg;
         private int _pwm, _line, _scrollpos, _blocks = 0, _executingBlock = 0, _auxinValue = -2;
         private double _feedrate = 0d;
@@ -79,6 +79,7 @@ public class GrblViewModel : MeasureViewModel
         public Action<string> OnGrblReset;
         public Action<string> OnRealtimeStatusProcessed;
         public Action<string> OnWCOUpdated;
+        public Action<Position> OnCameraProbe;
 
         public delegate void GrblResetHandler();
 
@@ -219,6 +220,11 @@ public void Clear()
 
         public ICommand MDICommand { get; private set; }
 
+        public void CameraProbed(Position position)
+        {
+            OnCameraProbe?.Invoke(position);
+        }
+
         private bool ApplyCommand(string command)
         {
             bool ok;
@@ -274,11 +280,12 @@ public void ExecuteMacro(string macro)
                 {
                     try
                     {
+                        commands[i] = commands[i].Replace("\r", "");
                         parser.ParseBlock(ref commands[i], false);
                     }
                     catch (Exception e)
                     {
-                        if (!(ok = System.Windows.MessageBox.Show(string.Format(LibStrings.FindResource("LoadError").Replace("\\n", "\r"), LineNumber, commands[i]), e.Message, System.Windows.MessageBoxButton.YesNo) == System.Windows.MessageBoxResult.Yes))
+                        if (!(ok = System.Windows.MessageBox.Show(string.Format(LibStrings.FindResource("LoadError").Replace("\\n", "\r"), e.Message, i + 1, commands[i]), "ioSender", System.Windows.MessageBoxButton.YesNo) == System.Windows.MessageBoxResult.Yes))
                             break;
                     }
                 }
@@ -353,6 +360,7 @@ private set
         public bool IsG92Active { get { return GrblParserState.IsActive("G92") != null; } }
         public bool IsToolOffsetActive { get { return IsGrblHAL ? GrblParserState.IsActive("G49") == null : !(double.IsNaN(ToolOffset.Z) || ToolOffset.Z == 0d); } }
         public bool IsJobRunning { get { return _isJobRunning; } set { if (_isJobRunning != value) { _isJobRunning = value; OnPropertyChanged(); } } }
+        public bool IsProbing { get { return _isProbing; } set { _isProbing = value; OnPropertyChanged(); } }
         public bool ProgramEnd { get { return _pgmEnd; } set { _pgmEnd = value; if(_pgmEnd) OnPropertyChanged(); } }
         public int GrblError { get { return _grblState.Error; } set { _grblState.Error = value; OnPropertyChanged(); } }
         public StreamingState StreamingState { get { return _streamingState; } set { if (_streamingState != value) { _streamingState = value; OnPropertyChanged(); } } }
@@ -704,25 +712,23 @@ public void SetGrblError(int error)
             Message = error == 0 ? string.Empty : GrblErrors.GetMessage(error.ToString());
         }
 
-        public bool ParseGCStatus(string data)
+        public void ParseGCStatus(string data)
         {
-            GrblParserState.Process(data);
-            if (GrblParserState.IsLoaded)
+            if (GrblParserState.Process(data) && GrblParserState.IsLoaded)
                 ParserState = data.Substring(4).TrimEnd(']');
-
-            return GrblParserState.IsLoaded;
         }
 
         public bool ParseProbeStatus(string data)
         {
             string[] values = data.TrimEnd(']').Split(':');
-            if (values.Length == 3)
+            if (values.Length == 3 && ProbePosition.Parse(values[1]))
             {
-                ProbePosition.Parse(values[1]);
                 IsProbeSuccess = values[2] == "1";
                 for (int i = 0; i < GrblInfo.NumAxes; i++)
                     GrblWorkParameters.ProbePosition.Values[i] = ProbePosition.Values[i];
             }
+            else
+                IsProbeSuccess = false;
 
             return IsProbeSuccess && values.Length == 3;
         }
@@ -730,9 +736,8 @@ public bool ParseProbeStatus(string data)
         public void ParseHomedStatus(string data)
         {
             string[] values = data.TrimEnd(']').Split(':');
-            if (values.Length == 3)
+            if (values.Length == 3 && HomePosition.Parse(values[1]))
             {
-                HomePosition.Parse(values[1]);
                 AxisHomed.Value = (AxisFlags)int.Parse(values[2]);
                 for (int i = 0; i < GrblInfo.NumAxes; i++)
                 {
diff --git a/CNC Core/CNC Core/KeypressHandler.cs b/CNC Core/CNC Core/KeypressHandler.cs
index aac8442b..ac045e4b 100644
--- a/CNC Core/CNC Core/KeypressHandler.cs	
+++ b/CNC Core/CNC Core/KeypressHandler.cs	
@@ -1,7 +1,7 @@
 /*
  * KeypressHandler.xaml.cs - part of CNC Controls library
  *
- * v0.36 / 2022-01-10 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
@@ -37,12 +37,14 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 
 */
 
-using CNC.GCode;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Xml.Serialization;
+using CNC.GCode;
 
 namespace CNC.Core
 {
@@ -56,13 +58,21 @@ public enum JogMode
             None // must be last!
         }
 
+        [XmlType(TypeName = "KeyMapping")]
         public class KeypressHandlerFn
         {
-            public Key key;
-            public ModifierKeys modifiers;
-            public bool onUp;
+            [XmlIgnore]
+            internal string method, dummy;
+
+            public Key Key;
+            public ModifierKeys Modifiers;
+            public bool OnUp;
+            [XmlIgnore]
             public UserControl context;
+            [XmlIgnore]
             public Func<Key, bool> Call;
+            public string Context { get { return context == null ? "null" : context.Name; } set { dummy = value; } }
+            public string Method { get { return Call.Method.ReflectedType.Name + "." +  Call.Method.Name; } set { method = value; } }
         }
 
         private int N_AXIS = 3;
@@ -74,11 +84,11 @@ public class KeypressHandlerFn
 
         public void AddHandler(Key key, ModifierKeys modifiers, Func<Key, bool> handler, UserControl context = null, bool onUp = true)
         {
-            handlers.Add(new KeypressHandlerFn(){key = key, modifiers = modifiers, Call = handler, context = context, onUp = onUp });
+            handlers.Add(new KeypressHandlerFn(){Key = key, Modifiers = modifiers, Call = handler, context = context, OnUp = onUp });
         }
         public void AddHandler(Key key, ModifierKeys modifiers, Func<Key, bool> handler, bool onUp)
         {
-            handlers.Add(new KeypressHandlerFn() { key = key, modifiers = modifiers, Call = handler, context = null, onUp = onUp });
+            handlers.Add(new KeypressHandlerFn() { Key = key, Modifiers = modifiers, Call = handler, context = null, OnUp = onUp });
         }
 
         public KeypressHandler(GrblViewModel model)
@@ -98,6 +108,67 @@ public KeypressHandler(GrblViewModel model)
         public bool CanJog { get { return allowJog && (grbl.GrblState.State == GrblStates.Idle || grbl.GrblState.State == GrblStates.Tool || grbl.GrblState.State == GrblStates.Jog); } }
         public bool IsJogging { get { return jogMode != JogMode.None || grbl.GrblState.State == GrblStates.Jog; } }
 
+        public bool SaveMappings (string filename)
+        {
+            if (handlers.Count == 0)
+                return false;
+
+            bool ok = false;
+
+            XmlSerializer xs = new XmlSerializer(typeof(List<KeypressHandlerFn>), new XmlRootAttribute("KeyMappings"));
+
+            try
+            {
+                FileStream fsout = new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.None);
+                using (fsout)
+                {
+                    var keymappings = handlers.Where(x => x.Method != "JobControl.FnKeyHandler").ToList();
+                    xs.Serialize(fsout, keymappings);
+                    ok = true;
+                }
+            }
+            catch
+            {
+            }
+
+            return ok;
+        }
+
+        public bool LoadMappings(string filename)
+        {
+            if (handlers.Count == 0)
+                return false;
+
+            bool ok = false;
+            List<KeypressHandlerFn> keymappings = new List<KeypressHandlerFn>();
+            XmlSerializer xs = new XmlSerializer(typeof(List<KeypressHandlerFn>), new XmlRootAttribute("KeyMappings"));
+
+            try
+            {
+                StreamReader reader = new StreamReader(filename);
+                keymappings = (List<KeypressHandlerFn>)xs.Deserialize(reader);
+                reader.Close();
+
+                foreach(var keymap in keymappings)
+                {
+                    var map = handlers.Where(x => x.Method == keymap.method).FirstOrDefault();
+                    if(map != null)
+                    {
+                        map.Key = keymap.Key;
+                        map.Modifiers = keymap.Modifiers;
+                    }
+                }
+
+                ok = true;
+            }
+            catch
+            {
+                System.Windows.MessageBox.Show("keymap file is corrupt!", "ioSender", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
+            }
+
+            return ok;
+        }
+
         public bool ProcessKeypress(KeyEventArgs e, bool allowJog, UserControl context = null)
         {
             bool isJogging = IsJogging, jogkeyPressed = false;
@@ -350,24 +421,24 @@ public bool ProcessKeypress(KeyEventArgs e, bool allowJog, UserControl context =
 
             if (Keyboard.Modifiers == ModifierKeys.Alt)
             {
-                var handler = handlers.Where(k => k.modifiers == Keyboard.Modifiers && k.key == e.SystemKey && k.onUp == e.IsUp && k.context == context).FirstOrDefault();
+                var handler = handlers.Where(k => k.Modifiers == Keyboard.Modifiers && k.Key == e.SystemKey && k.OnUp == e.IsUp && k.context == context).FirstOrDefault();
                 if (handler != null)
                     return handler.Call(e.SystemKey);
                 else
                 {
-                    handler = handlers.Where(k => k.modifiers == Keyboard.Modifiers && k.key == e.SystemKey && k.onUp == e.IsUp && k.context == null).FirstOrDefault();
+                    handler = handlers.Where(k => k.Modifiers == Keyboard.Modifiers && k.Key == e.SystemKey && k.OnUp == e.IsUp && k.context == null).FirstOrDefault();
                     if (handler != null)
                         return handler.Call(e.SystemKey);
                 }
             }
             else if (Keyboard.Modifiers == ModifierKeys.None || Keyboard.Modifiers == ModifierKeys.Control || Keyboard.Modifiers == (ModifierKeys.Control | ModifierKeys.Shift))
             {
-                var handler = handlers.Where(k => k.modifiers == Keyboard.Modifiers && k.key == e.Key && k.onUp == e.IsUp && k.context == context).FirstOrDefault();
+                var handler = handlers.Where(k => k.Modifiers == Keyboard.Modifiers && k.Key == e.Key && k.OnUp == e.IsUp && k.context == context).FirstOrDefault();
                 if (handler != null)
                     return handler.Call(e.Key);
                 else
                 {
-                    handler = handlers.Where(k => k.modifiers == Keyboard.Modifiers && k.key == e.Key && k.onUp == e.IsUp && k.context == null).FirstOrDefault();
+                    handler = handlers.Where(k => k.Modifiers == Keyboard.Modifiers && k.Key == e.Key && k.OnUp == e.IsUp && k.context == null).FirstOrDefault();
                     if (handler != null)
                         return handler.Call(e.Key);
                 }
diff --git a/CNC Core/CNC Core/Properties/AssemblyInfo.cs b/CNC Core/CNC Core/Properties/AssemblyInfo.cs
index 7afb30b6..04b40356 100644
--- a/CNC Core/CNC Core/Properties/AssemblyInfo.cs	
+++ b/CNC Core/CNC Core/Properties/AssemblyInfo.cs	
@@ -35,5 +35,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]
diff --git a/Locale/de-DE/csv/CNC.Controls.Camera.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.Camera.resources.de-DE.csv
index e5a527f2..4dd8823b 100644
--- a/Locale/de-DE/csv/CNC.Controls.Camera.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.Camera.resources.de-DE.csv
@@ -1,6 +1,12 @@
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Aktuelle Position ermitteln
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Offset verschieben
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use as probe position
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_confirmMove:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm move
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_moveToSpindle:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Inital move to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,X offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Y offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Kamera
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,camera to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Offset Bewegung:
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveCameraTo:System.String.$Content,None,True,True,,Move camera to spindle position?
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveSpindleTo:System.String.$Content,None,True,True,,Move spindle to camera position?
diff --git a/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
index f212fb5d..91e3a78d 100644
--- a/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
@@ -22,6 +22,7 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_useX0Y0:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Nutze X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Antast Tiefe:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Z-Versatz von der aktuellen Position, an der die Antastung erfolgen soll"
@@ -108,6 +109,7 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.C
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Löschen
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Setze Koordinatensystem:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Antastung XY-Abstand zu groß für Werkstückgröße {0}.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,"Antasten abgeschlossen: X Abstand {0}, Y Abstand {1}."
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,Antasten fehlgeschlagen
@@ -131,12 +133,14 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,"Es wird eine schnelle Bewegung nach X0Y0 durchgeführt, bevor mit der Antastung der Höhenkarte begonnen wird.\\nSicherstellen, dass die anfängliche Z-Position frei von Hindernissen ist, die während der Antastung entstehen können."
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Tastatur-Jogging aktiv
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Tastatur-Jogging deaktiviert
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Antasten…
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Antast Weg muss größer sein als XY Abstand + ½ Taster/Werkzeug Durchmesser.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen mit Alarm, löschen in GRBL Tab."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,Antasten abgebrochen/fehlgeschlagen.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapMinSize:System.String.$Content,None,True,True,,Höhenkarte muss mindestens 4 Punkte haben.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapNarrow:System.String.$Content,None,True,True,,Höhenkarte kann nicht unendlich klein sein.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,"Illegal probe position, try again."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,Rückzugsweg muss kleiner sein als Antast Weg.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen, konnte die aktuelle Maschinenposition nicht ermitteln."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen, Tastspitze nicht angeschlossen."
diff --git a/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
index 4f273156..d92273d3 100644
--- a/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
@@ -3,6 +3,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Abbruch
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Abbruch
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Abbruch
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Löschen
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Alles Löschen
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Alles Löschen
@@ -25,6 +26,7 @@ CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Control
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Neu Laden
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Einstellungen von Steuerung neu laden
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset
@@ -33,6 +35,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Window
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zurücksetzen
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Speichern Sie die geänderten Einstellungen in der Steuerung.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Speichern
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Einstellungen speichern
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Senden
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Einstellen
@@ -55,6 +58,7 @@ CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.W
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Verbindung zum Sender
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,Winkel
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Winkel:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diameter:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Distanz Schnellvorschub:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Vorschub Schnell:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
@@ -93,8 +97,12 @@ CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windo
 CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Jogging
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,UI jogging
 CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Arbeitsparameter
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Block
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Daten
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Name
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Offset
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingId:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Id
@@ -178,6 +186,8 @@ CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Wi
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Werkzeug:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Ausführliche Informationen
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X Achse:
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X Achse:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y Achse:
@@ -215,6 +225,7 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.Stri
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,UNBEKANNT
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"Datei: {0}\\n!,?,~ und SPACE im Dateinamen nicht unterstützt, bitte umbenennen."
 CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_Jog
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,Keymappings saved to {0}
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_Macros
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,str_mposFlyout:System.String.$Content,None,True,True,,M_Pos
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Tür noch geöffnet, beenden?"
@@ -241,6 +252,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Schade...\\nWeiter laden?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,Datei enthält keine Einstellungen.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Einstellungen aus Datei wiederherstellen
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Zeitüberschreitung beim Setzen von {0}, weiter?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,Alle Einstellungen werden in {0} im Programmverzeichnis gespeichert.
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,Stop
@@ -256,7 +268,10 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,Ungültige Eingabe: Der minimal zulässige Wert ist {0}.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Ungültige Eingabe: keine IP4-Adresse..
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Ungültige Eingabe: Der zulässige Bereich ist {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Alarm codes
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Error codes
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Netzwerk
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Seriell
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,X und Y Programmgrenzen abfahren
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,"Sicherstellen, dass die Werkzeugspitze frei von Hindernissen ist!"
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,Controller error and alarm codes
diff --git a/Locale/de-DE/csv/ioSender.resources.de-DE.csv b/Locale/de-DE/csv/ioSender.resources.de-DE.csv
index 9e0252e1..1b76b1f0 100644
--- a/Locale/de-DE/csv/ioSender.resources.de-DE.csv
+++ b/Locale/de-DE/csv/ioSender.resources.de-DE.csv
@@ -1,7 +1,9 @@
 ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Distanz für Tastatur Schrittweite (mit &lt;Strg&gt; Taste).
 ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Über
+ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,A _brief tour
 ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Kamera
 ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Schließen
+ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Error and alarm codes
 ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Exit
 ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Datei
 ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Hilfe
@@ -11,12 +13,25 @@ ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Contro
 ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Speichern
 ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Verändern
 ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Verwendungshinweise
+ioSender.g.en-US.resources:mainwindow.baml,mnu_videoTutorials:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Video tutorials
 ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
 ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,Schrittweite: {0}
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,Kreisbogen zu Linien
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuCompress:System.String.$Content,None,True,True,,Komprimieren (experimentell)
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuDragKnife:System.String.$Content,None,True,True,,Schleppmesserbewegungen hinzufügen
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,Drehen
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Door is open, close door and continue?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Door state cannot be cleared with &lt;Reset&gt;
+ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,E-Stop active! - clear before continuing...
+ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,"E-Stop still active, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"Homing cycle required, &lt;Home&gt; to continue"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,"Controller is in {0} state and cannot respond, try a soft reset?"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,"Controller is not able to communicate due to alarm {0}, attempting a soft reset."
+ioSender.g.en-US.resources:jobview.baml,str_msgNoResponse:System.String.$Content,None,True,True,,Controller is not responding!
+ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,Waiting for controller ({0})...
 ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,Laufzeit: {0}
 ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D Ansicht
 ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D Ansicht
diff --git a/Locale/de-DE/translation.txt b/Locale/de-DE/translation.txt
index ea3d4c2e..b674c276 100644
Binary files a/Locale/de-DE/translation.txt and b/Locale/de-DE/translation.txt differ
diff --git a/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv
index 744dcbe8..6f454a33 100644
--- a/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv
@@ -1,6 +1,12 @@
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get current position
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Move offset
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use as probe position
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_confirmMove:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm move
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_moveToSpindle:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Inital move to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,X offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Y offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Camera
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,camera to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Offset motion:
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveCameraTo:System.String.$Content,None,True,True,,Move camera to spindle position?
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveSpindleTo:System.String.$Content,None,True,True,,Move spindle to camera position?
diff --git a/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
index 07f81978..991e7fdc 100644
--- a/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
@@ -22,6 +22,7 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_useX0Y0:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Use X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Depth:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Z offset from current position where probing will take place
@@ -108,6 +109,7 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.C
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set coordinate system:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Probing XY clearance too large for workpiece {0} size.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,"Probing completed: X distance {0}, Y distance {1}."
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,Probing failed
@@ -131,12 +133,14 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,A rapid motion to X0Y0 will be performed before probing the height map starts.\\nEnsure the initial Z-position is clear of any obstacles that might be encountered during probing.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Keyboard jogging active
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Keyboard jogging disabled
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Probing...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Probing distance must be larger than XY Clearance + ½ Probe/tool diameter.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Probing failed with alarm, clear in Grbl tab."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,Probing cancelled/failed.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapMinSize:System.String.$Content,None,True,True,,Height map must have at least 4 points.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapNarrow:System.String.$Content,None,True,True,,Height map can&apos;t be infinitely narrow.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,"Illegal probe position, try again."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,Latch distance must be less than Probing distance.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Probing failed, could not establish current machine position."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Probing failed, probe is not connected."
diff --git a/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
index 89209982..616ab352 100644
--- a/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
@@ -3,6 +3,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
@@ -25,6 +26,7 @@ CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Control
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reload settings from controller.
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset
@@ -33,6 +35,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Window
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Rewind
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save settings
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Send
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set
@@ -55,6 +58,7 @@ CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.W
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Sender connection
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,degrees
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Angle:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diameter:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Fast distance:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Fast feedrate:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
@@ -93,8 +97,12 @@ CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windo
 CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Jogging
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,UI jogging
 CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Work Parameters
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Block
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Data
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Name
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Offset
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingId:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Id
@@ -178,6 +186,8 @@ CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Wi
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verbose
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
@@ -215,6 +225,7 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.Stri
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,UNKNOWN
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"File: {0}\\n!,?,~ and SPACE is not supported in filenames, please rename."
 CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_Jog
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,Keymappings saved to {0}
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_Macros
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,str_mposFlyout:System.String.$Content,None,True,True,,M_Pos
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
@@ -241,6 +252,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Bummer...\\nContinue loading?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,The file does not contain any settings.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Restore settings from file
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Timed out while setting {0}, continue?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,All settings written to {0} in the sender folder.
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,Stop
@@ -256,7 +268,10 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,Invalid input: minimum allowed value is {0}.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Invalid input: not an IP4 address..
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Invalid input: allowed range is {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Alarm codes
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Error codes
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Network
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Serial
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,Execute moves to outline X and Y program limits.
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,Ensure tool tip is clear of any obstructions!
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,Controller error and alarm codes
diff --git a/Locale/en-US/csv/ioSender.resources.en-US.csv b/Locale/en-US/csv/ioSender.resources.en-US.csv
index 9a5f228c..15f9f650 100644
--- a/Locale/en-US/csv/ioSender.resources.en-US.csv
+++ b/Locale/en-US/csv/ioSender.resources.en-US.csv
@@ -1,7 +1,9 @@
 ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Distance for keyboard step jog (with &lt;CTRL&gt; modifier).
 ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_About
+ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,A _brief tour
 ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Camera
 ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Close
+ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Error and alarm codes
 ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Exit
 ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_File
 ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Help
@@ -11,12 +13,25 @@ ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Contro
 ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Save
 ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Transform
 ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Usage _tips
+ioSender.g.en-US.resources:mainwindow.baml,mnu_videoTutorials:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Video tutorials
 ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
 ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,Jog step: {0}
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,Arcs to lines
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuCompress:System.String.$Content,None,True,True,,Compress (experimental)
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuDragKnife:System.String.$Content,None,True,True,,Add drag knife moves
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,Rotate
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Door is open, close door and continue?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Door state cannot be cleared with &lt;Reset&gt;
+ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,E-Stop active! - clear before continuing...
+ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,"E-Stop still active, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"Homing cycle required, &lt;Home&gt; to continue"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,"Controller is in {0} state and cannot respond, try a soft reset?"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,"Controller is not able to communicate due to alarm {0}, attempting a soft reset."
+ioSender.g.en-US.resources:jobview.baml,str_msgNoResponse:System.String.$Content,None,True,True,,Controller is not responding!
+ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,Waiting for controller ({0})...
 ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,Run time: {0}
 ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D View
 ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D View
diff --git a/Locale/en-US/translation.txt b/Locale/en-US/translation.txt
index 99a94933..6d085807 100644
Binary files a/Locale/en-US/translation.txt and b/Locale/en-US/translation.txt differ
diff --git a/Locale/ru-RU/csv/CNC.Controls.Camera.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.Camera.resources.ru-RU.csv
index 373982ed..5ae8b2f1 100644
--- a/Locale/ru-RU/csv/CNC.Controls.Camera.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.Camera.resources.ru-RU.csv
@@ -1,6 +1,12 @@
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Текушая позиция
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Переместить на смещение
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use as probe position
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_confirmMove:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm move
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_moveToSpindle:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Inital move to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,Смещение X:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Смещение Y:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Камера
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,camera to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Смещение перемещений:
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveCameraTo:System.String.$Content,None,True,True,,Move camera to spindle position?
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveSpindleTo:System.String.$Content,None,True,True,,Move spindle to camera position?
diff --git a/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
index 9ad0904d..5f8dd647 100644
--- a/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
@@ -22,6 +22,7 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_useX0Y0:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Использ. X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Глубина:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Смещение места измерения по Z от текущей позиции.
@@ -108,6 +109,7 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.C
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Удалить
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Обновить
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Система координат:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Зазор измерения XY слишком велик для детали размера {0}.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,"Измерение завершено: размер X  {0}, разменр Y {1}."
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,Ошибка озмерения
@@ -131,12 +133,14 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,"Быстрое перемнщение в X0Y0 перед началом измерения карты высот.\\nУбедитесть, что позиция по Z установлена в положение, свободнгое от препятствий."
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Перемещение клавиатурой активно
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Перемещение клавиатурой отключено
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Измерение...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Дистанция измерения должна быть более зазора XY + ½ диаметра щупа.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Авария при измерении, сбросьте на закладке Grbl."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,Измерение прервано/ошибка.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapMinSize:System.String.$Content,None,True,True,,Карта высот должна содержать минимум 4 точки.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapNarrow:System.String.$Content,None,True,True,,Карта высот не может быть бесконечно узкой.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,"Illegal probe position, try again."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,Дистанция фиксации должна быть меньше дистанции измерения.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Ошибка озмерения, текущяя позиция не известна."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Ошибка озмерения, датчик не подключен."
diff --git a/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
index 50b2f001..203fa5a5 100644
--- a/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
@@ -3,6 +3,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отмена
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отмена
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отмена
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистить
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистить все
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистить все
@@ -25,6 +26,7 @@ CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Control
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Перечитать
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Перечитать настройки из контроллера.
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сброс
@@ -33,6 +35,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Window
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,В начало
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Применить изменения в контроллер.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сохранить
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сохранить настройки
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отправить
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Уст.
@@ -55,6 +58,7 @@ CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.W
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Подключение контроллера
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,градусы
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Угол:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diameter:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Расстояние Быстро:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача Быстро:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
@@ -93,8 +97,12 @@ CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windo
 CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Jogging
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Экранный пульт
 CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Параметры Обработки
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Блокировать
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Данные
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Имя
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Смещение
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingId:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Id
@@ -178,6 +186,8 @@ CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Wi
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Инструмент:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Подробный
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Web порт
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось X:
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось X:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось Y:
@@ -215,6 +225,7 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.Stri
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,НЕОПРЕД.
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"Файл: {0}\\n!,?,~ и ПРОБЕЛ не поддерживаются в имени файла, пожалуйста переименуйте."
 CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_Пульт
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,Keymappings saved to {0}
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_Макрос
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,str_mposFlyout:System.String.$Content,None,True,True,,Маш._координаты
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,Дверь не закрыта. Выйти?
@@ -241,6 +252,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Ошибка...\\nПродолжить загрузку?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,Файл не содержит параметров настройки.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Восстановить настройки из файла
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Превышено время при установке {0}, продолжить?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,Все установки записаны в {0} в папке программы.
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,Стоп
@@ -256,7 +268,10 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,Ошибка ввода: min. значение {0}.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Ошибка ввода: неверный формат IP4 адреса..
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Ошибка ввода: Разрешенный диапазон {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Alarm codes
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Error codes
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Сеть
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Последовательный порт
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,Объехать по контуру обработки в плоскости X-Y.
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,"Убедитесь, что на пути инструмента нет препятствий!"
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,Controller error and alarm codes
diff --git a/Locale/ru-RU/csv/ioSender.resources.ru-RU.csv b/Locale/ru-RU/csv/ioSender.resources.ru-RU.csv
index 624bd65a..e9e50e55 100644
--- a/Locale/ru-RU/csv/ioSender.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/ioSender.resources.ru-RU.csv
@@ -1,7 +1,9 @@
 ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Расстояние для пошагового перемещения клавиатурой (+&lt;CTRL&gt;).
 ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_О програме
+ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,A _brief tour
 ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Камера
 ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Закрыть
+ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Error and alarm codes
 ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Выход
 ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Файл
 ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Справка
@@ -11,12 +13,25 @@ ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Contro
 ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Сохранить
 ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Преобразовать
 ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Заметки по использованию
+ioSender.g.en-US.resources:mainwindow.baml,mnu_videoTutorials:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Video tutorials
 ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
 ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,Шаг перемешений : {0}
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,Дуги в отрезки
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuCompress:System.String.$Content,None,True,True,,Сжать (экспериментальная)
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuDragKnife:System.String.$Content,None,True,True,,Добавить перемещение флюгерного ножа
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,Поворот
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Door is open, close door and continue?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Door state cannot be cleared with &lt;Reset&gt;
+ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,E-Stop active! - clear before continuing...
+ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,"E-Stop still active, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"Homing cycle required, &lt;Home&gt; to continue"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,"Controller is in {0} state and cannot respond, try a soft reset?"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,"Controller is not able to communicate due to alarm {0}, attempting a soft reset."
+ioSender.g.en-US.resources:jobview.baml,str_msgNoResponse:System.String.$Content,None,True,True,,Controller is not responding!
+ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,Waiting for controller ({0})...
 ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,Времы выполнения: {0}
 ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D Вид
 ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D Вид
diff --git a/Locale/ru-RU/translation.txt b/Locale/ru-RU/translation.txt
index 450ae68b..e2d41f69 100644
Binary files a/Locale/ru-RU/translation.txt and b/Locale/ru-RU/translation.txt differ
diff --git a/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
index 219ab446..b227161a 100644
--- a/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
@@ -1,6 +1,12 @@
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get current position
 CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Move offset
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use as probe position
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_confirmMove:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm move
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_moveToSpindle:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Inital move to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,X offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Y offset:
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,相机
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,camera to spindle
 CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Offset motion:
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveCameraTo:System.String.$Content,None,True,True,,Move camera to spindle position?
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveSpindleTo:System.String.$Content,None,True,True,,Move spindle to camera position?
diff --git a/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
index 0990c636..ef9b46cf 100644
--- a/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
@@ -22,6 +22,7 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_useX0Y0:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Use X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Depth:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Z offset from current position where probing will take place
@@ -108,6 +109,7 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.C
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set coordinate system:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Camera position {0}, X: {1}, Y: {2}"
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Probing XY clearance too large for workpiece {0} size.
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,"Probing completed: X distance {0}, Y distance {1}."
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,Probing failed
@@ -131,12 +133,14 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,A rapid motion to X0Y0 will be performed before probing the height map starts.\\nEnsure the initial Z-position is clear of any obstacles that might be encountered during probing.
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Keyboard jogging active
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Keyboard jogging disabled
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Probing...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Probing distance must be larger than XY Clearance + ½ Probe/tool diameter.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Probing failed with alarm, clear in Grbl tab."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,Probing cancelled/failed.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapMinSize:System.String.$Content,None,True,True,,Height map must have at least 4 points.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapNarrow:System.String.$Content,None,True,True,,Height map can&apos;t be infinitely narrow.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,"Illegal probe position, try again."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,Latch distance must be less than Probing distance.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Probing failed, could not establish current machine position."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Probing failed, probe is not connected."
diff --git a/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
index 982e5453..291db419 100644
--- a/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
@@ -3,6 +3,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
@@ -25,6 +26,7 @@ CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Control
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reload settings from controller.
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,复位
@@ -33,6 +35,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Window
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Rewind
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save settings
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Send
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set
@@ -55,6 +58,7 @@ CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.W
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Sender connection
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,degrees
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,角度:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diameter:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Fast distance:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Fast feedrate:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
@@ -93,8 +97,12 @@ CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windo
 CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Jogging
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,UI jogging
 CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Work Parameters
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,块
 CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Data
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Code
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Message
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,名称
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,偏移
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingId:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Id
@@ -178,6 +186,8 @@ CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Wi
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verbose
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
@@ -215,6 +225,7 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.Stri
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,UNKNOWN
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"File: {0}\\n!,?,~ and SPACE is not supported in filenames, please rename."
 CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_Jog
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,Keymappings saved to {0}
 CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_Macros
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,str_mposFlyout:System.String.$Content,None,True,True,,M_Pos
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
@@ -241,6 +252,7 @@ CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Bummer...\\nContinue loading?
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,The file does not contain any settings.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Restore settings from file
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Settings saved.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Timed out while setting {0}, continue?"
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,All settings written to {0} in the sender folder.
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,Stop
@@ -256,7 +268,10 @@ CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,Invalid input: minimum allowed value is {0}.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Invalid input: not an IP4 address..
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Invalid input: allowed range is {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Alarm codes
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Error codes
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Network
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Serial
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,Execute moves to outline X and Y program limits.
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,Ensure tool tip is clear of any obstructions!
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,Controller error and alarm codes
diff --git a/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv b/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
index 2ce385b1..8277855d 100644
--- a/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
@@ -1,7 +1,9 @@
 ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Distance for keyboard step jog (with &lt;CTRL&gt; modifier).
 ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_About
+ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,A _brief tour
 ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Camera
 ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Close
+ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Error and alarm codes
 ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Exit
 ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_File
 ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Help
@@ -11,12 +13,25 @@ ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Contro
 ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Save
 ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Transform
 ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Usage _tips
+ioSender.g.en-US.resources:mainwindow.baml,mnu_videoTutorials:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Video tutorials
 ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
 ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,Jog step: {0}
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,Arcs to lines
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuCompress:System.String.$Content,None,True,True,,Compress (experimental)
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuDragKnife:System.String.$Content,None,True,True,,Add drag knife moves
 ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,Rotate
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Door is still open, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Door is open, close door and continue?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Door state cannot be cleared with &lt;Reset&gt;
+ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,E-Stop active! - clear before continuing...
+ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,"E-Stop still active, exit?"
+ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"Homing cycle required, &lt;Home&gt; to continue"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,"Controller is in {0} state and cannot respond, try a soft reset?"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,"Controller is not able to communicate due to alarm {0}, attempting a soft reset."
+ioSender.g.en-US.resources:jobview.baml,str_msgNoResponse:System.String.$Content,None,True,True,,Controller is not responding!
+ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,"Controller soft reset failed, exiting."
+ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,Waiting for controller ({0})...
 ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,Run time: {0}
 ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D View
 ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D View
diff --git a/Locale/zh-CN/translation.txt b/Locale/zh-CN/translation.txt
index d2c667d1..04493d17 100644
Binary files a/Locale/zh-CN/translation.txt and b/Locale/zh-CN/translation.txt differ
diff --git a/changelog.md b/changelog.md
index 570adde5..6ee906ba 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,7 +2,21 @@
 
 Executable for development builds available for download [here](http://www.io-engineering.com/downloads/) if you want to participate in testing.
 
-2022-01-27:
+2022-03-11: [Release 2.0.35](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.37).
+
+* Added list of controller alarm and error codes to _Help_ menu.
+* Added link to tutorial videos to  _Help_ menu. By @S2000Stefan
+* Added link to guided tour blog post to  _Help_ menu. By @phil-barret
+* Improved camera handling, can now be used for center probing. New camera settings options added to _App: Settings_ tab.
+* Fixed bugs in height map probing causing intermittent application hang.
+* Added mapping of G-code to rotary axis to _File > Transform_ menu. Experimental.
+* Modified _Grbl_ tab layout in XL version to always show _Outline_ box.
+* Added support for custom keyboard shorcut mappings, current mappings can be exported from the _App: Settings_ tab.
+* General "hardening" of code.
+
+---
+
+2022-01-27: [Release 2.0.35](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.36).
 
 * Fixed nasty bug where crazy motions could happen if a probing sequence was stopped before completion.
 * Improved support for legacy Grbl controllers.
diff --git a/ioSender XL/ioSender XL/App.xaml.cs b/ioSender XL/ioSender XL/App.xaml.cs
index 33cc74ac..0cf3cb80 100644
--- a/ioSender XL/ioSender XL/App.xaml.cs	
+++ b/ioSender XL/ioSender XL/App.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * App.xaml.cs - part of Grbl Code Sender
  *
- * v0.36 / 2021-11-19 / Io Engineering (Terje Io)
+ * v0.37 / 2021-02-20 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -97,6 +97,7 @@ private void DispatcherOnUnhandledException(object sender, DispatcherUnhandledEx
             args.Handled = true;
 
             MessageBox.Show("Unhandled exception occured: " + (args.Exception as Exception).Message, "DispatcherException");
+            Environment.Exit(-1);
         }
 
         private void TaskSchedulerOnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs args)
diff --git a/ioSender XL/ioSender XL/JobView.xaml b/ioSender XL/ioSender XL/JobView.xaml
index 738e346b..c4b088da 100644
--- a/ioSender XL/ioSender XL/JobView.xaml	
+++ b/ioSender XL/ioSender XL/JobView.xaml	
@@ -55,13 +55,13 @@
             </Grid.RowDefinitions>
             <cnccontrols:JogControl x:Name="jogControl" Grid.Row="0" Grid.ColumnSpan="2" Margin="5,0,0,0" MinWidth="510" Width="510"/>
             <StackPanel Grid.Row="1" Margin="5,0,0,0" Width="250" VerticalAlignment="Stretch">
-                <cnccontrols:CoolantControl HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="coolantControl"/>
-                <cnccontrols:SpindleControl x:Name="spindleControl" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 <cnccontrols:OutlineControl x:Name="outlineControl"/>
+                <cnccontrols:SpindleControl x:Name="spindleControl"/>
+                <cnccontrols:CoolantControl x:Name="coolantControl"/>
             </StackPanel>
             <StackPanel Grid.Row="1" Grid.Column="1" Margin="0,0,0,5" Width="250" VerticalAlignment="Stretch">
-                <cnccontrols:WorkParametersControl x:Name="workParametersControl" HorizontalAlignment="Left" VerticalAlignment="Top" IsToolChanging="{Binding IsToolChanging}"/>
-                <cnccontrols:FeedControl x:Name="feedControl" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                <cnccontrols:WorkParametersControl x:Name="workParametersControl" IsToolChanging="{Binding IsToolChanging}"/>
+                <cnccontrols:FeedControl x:Name="feedControl"/>
                 <cnccontrols:GotoControl x:Name="gotoControl"/>
             </StackPanel>
         </Grid>
diff --git a/ioSender XL/ioSender XL/JobView.xaml.cs b/ioSender XL/ioSender XL/JobView.xaml.cs
index 9023aa70..d32f98fe 100644
--- a/ioSender XL/ioSender XL/JobView.xaml.cs	
+++ b/ioSender XL/ioSender XL/JobView.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * JobView.xaml.cs - part of Grbl Code Sender
  *
- * v0.36 / 2022-01-20 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,7 +56,7 @@ namespace GCode_Sender
     public partial class JobView : UserControl, ICNCView
     {
         private bool? initOK = null;
-        private bool sdStream = false;
+        private bool isBooted = false;
         private GrblViewModel model;
         private IInputElement focusedControl = null;
         private Controller Controller = null;
@@ -87,7 +87,7 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                 case nameof(GrblViewModel.GrblState):
                     if (!Controller.ResetPending)
                     {
-                        if (initOK == false && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
+                        if (isBooted && initOK == false && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
                             Dispatcher.BeginInvoke(new System.Action(() => InitSystem()), DispatcherPriority.ApplicationIdle);
                     }
                     break;
@@ -155,8 +155,8 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                     }
                     else if (!string.IsNullOrEmpty(filename) && AppConfig.Settings.GCodeViewer.IsEnabled)
                     {
-                        MainWindow.GCodeViewer.Open(GCode.File.Tokens);
-                        MainWindow.EnableView(true, ViewType.GCodeViewer);
+//                        MainWindow.GCodeViewer.Open(GCode.File.Tokens);
+//                        MainWindow.EnableView(true, ViewType.GCodeViewer);
                         GCodeSender.EnablePolling(false);
                         gcodeRenderer.Open(GCode.File.Tokens);
                         GCodeSender.EnablePolling(true);
@@ -189,6 +189,8 @@ public void Activate(bool activate, ViewType chgMode)
                     switch (Controller.Restart())
                     {
                         case Controller.RestartResult.Ok:
+                            if (!isBooted)
+                                Dispatcher.BeginInvoke(new System.Action(() => OnBooted()), DispatcherPriority.ApplicationIdle);
                             initOK = InitSystem();
                             break;
 
@@ -207,27 +209,42 @@ public void Activate(bool activate, ViewType chgMode)
                 if (initOK == null)
                     initOK = false;
 
-                #if ADD_CAMERA
+#if ADD_CAMERA
                 if (MainWindow.UIViewModel.Camera != null)
                 {
                     MainWindow.UIViewModel.Camera.MoveOffset += Camera_MoveOffset;
                     MainWindow.UIViewModel.Camera.IsVisibilityChanged += Camera_Opened;
+                    MainWindow.UIViewModel.Camera.IsMoveEnabled = true;
                 }
-                #endif
+#endif
                 //if (viewer == null)
                 //    viewer = new Viewer();
 
                 if(GCode.File.IsLoaded)
                     MainWindow.ui.WindowTitle = ((GrblViewModel)DataContext).FileName;
 
+                model.Keyboard.JogStepDistance = AppConfig.Settings.Jog.LinkStepJogToUI ? AppConfig.Settings.JogUiMetric.Distance0 : AppConfig.Settings.Jog.StepDistance;
+                model.Keyboard.JogDistances[(int)KeypressHandler.JogMode.Slow] = AppConfig.Settings.Jog.SlowDistance;
+                model.Keyboard.JogDistances[(int)KeypressHandler.JogMode.Fast] = AppConfig.Settings.Jog.FastDistance;
+                model.Keyboard.JogFeedrates[(int)KeypressHandler.JogMode.Step] = AppConfig.Settings.Jog.StepFeedrate;
+                model.Keyboard.JogFeedrates[(int)KeypressHandler.JogMode.Slow] = AppConfig.Settings.Jog.SlowFeedrate;
+                model.Keyboard.JogFeedrates[(int)KeypressHandler.JogMode.Fast] = AppConfig.Settings.Jog.FastFeedrate;
+
+                model.Keyboard.IsJoggingEnabled = AppConfig.Settings.Jog.Mode != JogConfig.JogMode.UI;
+
+                if (!GrblInfo.IsGrblHAL)
+                    model.Keyboard.IsContinuousJoggingEnabled = AppConfig.Settings.Jog.KeyboardEnable;
             }
             else if(ViewType != ViewType.Shutdown)
             {
                 DRO.IsFocusable = false;
-                #if ADD_CAMERA
+#if ADD_CAMERA
                 if (MainWindow.UIViewModel.Camera != null)
+                {
                     MainWindow.UIViewModel.Camera.MoveOffset -= Camera_MoveOffset;
-                #endif
+                    MainWindow.UIViewModel.Camera.IsMoveEnabled = false;
+                }
+#endif
                 focusedControl = focusedControl = AppConfig.Settings.Base.KeepMdiFocus &&
                                   Keyboard.FocusedElement is TextBox &&
                                    (Keyboard.FocusedElement as TextBox).Tag is string &&
@@ -273,7 +290,7 @@ private void showProgramLimits()
                 height = limitsControl.ActualHeight;
 
             limitsControl.Visibility = (dp.ActualHeight - t1.ActualHeight - t2.ActualHeight + limitsControl.ActualHeight) > height ? Visibility.Visible : Visibility.Collapsed;
-            outlineControl.Visibility = rhGrid.ActualHeight > 625 ? Visibility.Visible : Visibility.Collapsed;
+            coolantControl.Visibility = rhGrid.ActualHeight > 600 ? Visibility.Visible : Visibility.Collapsed;
             gotoControl.Visibility = rhGrid.ActualHeight > 575 ? Visibility.Visible : Visibility.Collapsed;
         }
 
@@ -308,6 +325,19 @@ void Camera_MoveOffset(CameraMoveMode Mode, double XOffset, double YOffset)
             Comms.com.WriteString("G90\r"); // reset to previous or G80 to cancel motion mode?   
         }
 #endif
+
+        private void OnBooted()
+        {
+            isBooted = true;
+            string filename = CNC.Core.Resources.Path + string.Format("KeyMap{0}.xml", (int)AppConfig.Settings.Jog.Mode);
+
+            if (System.IO.File.Exists(filename))
+                model.Keyboard.LoadMappings(filename);
+
+            if (GrblInfo.NumAxes > 3)
+                GCode.File.AddTransformer(typeof(GCodeWrapViewModel), "Wrap to rotary (WIP)", MainWindow.UIViewModel.TransformMenuItems);
+        }
+
         private bool InitSystem()
         {
             initOK = true;
diff --git a/ioSender XL/ioSender XL/MainWindow.xaml b/ioSender XL/ioSender XL/MainWindow.xaml
index 77831608..a373b05c 100644
--- a/ioSender XL/ioSender XL/MainWindow.xaml	
+++ b/ioSender XL/ioSender XL/MainWindow.xaml	
@@ -45,6 +45,9 @@
             <MenuItem x:Uid="mnu_help" x:Name="menuHelp" Header="_Help">
                 <MenuItem x:Uid="mnu_wiki" Header="_Wiki" Click="aboutWikiItem_Click"/>
                 <MenuItem x:Uid="mnu_usageTips" Header="Usage _tips" Click="tipsWikiItem_Click"/>
+                <MenuItem x:Uid="mnu_briefTour" Header="A _brief tour" Click="briefTour_Click"/>
+                <MenuItem x:Uid="mnu_videoTutorials" Header="_Video tutorials" Click="videoTutorials_Click"/>
+                <MenuItem x:Uid="mnu_errorsAndAlarms" Header="_Error and alarm codes" Click="errorAndAlarms_Click"/>
                 <MenuItem x:Uid="mnu_about" Header="_About" Click="aboutMenuItem_Click"/>
             </MenuItem>
         </Menu>
@@ -118,9 +121,11 @@
             <TabItem x:Uid="tab_grbl" x:Name="tabGrbl" Header="Grbl" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <local:JobView x:Name="Grbl"/>
             </TabItem>
+            <!---
             <TabItem x:Uid="tab_3DView" x:Name="tabViewer" Header="3D View">
                 <cncviewer:Viewer x:Name="viewer"/>
             </TabItem>
+            -->
             <TabItem x:Uid="tab_probing" x:Name="tabProbing" Header="Probing">
                 <cncprobingcontrols:ProbingView x:Name="probingView"/>
             </TabItem>
diff --git a/ioSender XL/ioSender XL/MainWindow.xaml.cs b/ioSender XL/ioSender XL/MainWindow.xaml.cs
index 0158e48e..6ae6fc67 100644
--- a/ioSender XL/ioSender XL/MainWindow.xaml.cs	
+++ b/ioSender XL/ioSender XL/MainWindow.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.36 / 2022-01-27 / Io Engineering (Terje Io)
+ * v0.37 / 2022-03-11 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.36";
+        private const string version = "2.0.37";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
@@ -70,7 +70,7 @@ public MainWindow()
             InitializeComponent();
 
             ui = this;
-            GCodeViewer = viewer;
+//            GCodeViewer = viewer;
             Title = string.Format(Title, version);
 
             int res;
@@ -242,6 +242,21 @@ void tipsWikiItem_Click(object sender, EventArgs e)
             System.Diagnostics.Process.Start("https://github.com/terjeio/ioSender/wiki/Usage-tips");
         }
 
+        void briefTour_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://www.grbl.org/single-post/one-sender-to-rule-them-all");
+        }
+
+        void videoTutorials_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://youtube.com/playlist?list=PLnSV6o2cRxM5mQQe4ec5cS2J8jBsEciY3");
+        }
+
+        void errorAndAlarms_Click(object sender, EventArgs e)
+        {
+            new ErrorsAndAlarms(BaseWindowTitle) { Owner = Application.Current.MainWindow }.Show();
+        }
+
         void aboutMenuItem_Click(object sender, EventArgs e)
         {
             About about = new About(BaseWindowTitle) { Owner = Application.Current.MainWindow };
@@ -261,7 +276,6 @@ private void Base_PropertyChanged(object sender, System.ComponentModel.PropertyC
             }
         }
 
-
         private void Pipe_FileTransfer(string filename)
         {
             if(!JobRunning)
diff --git a/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs b/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs
index 1cfb6cf4..cd858f2f 100644
--- a/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs	
+++ b/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs	
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]
diff --git a/ioSender/ioSender/App.xaml.cs b/ioSender/ioSender/App.xaml.cs
index 33cc74ac..c7cbed10 100644
--- a/ioSender/ioSender/App.xaml.cs
+++ b/ioSender/ioSender/App.xaml.cs
@@ -1,13 +1,13 @@
 /*
  * App.xaml.cs - part of Grbl Code Sender
  *
- * v0.36 / 2021-11-19 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-20 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -97,6 +97,7 @@ private void DispatcherOnUnhandledException(object sender, DispatcherUnhandledEx
             args.Handled = true;
 
             MessageBox.Show("Unhandled exception occured: " + (args.Exception as Exception).Message, "DispatcherException");
+            Environment.Exit(-1);
         }
 
         private void TaskSchedulerOnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs args)
diff --git a/ioSender/ioSender/JobView.xaml.cs b/ioSender/ioSender/JobView.xaml.cs
index 98454c86..ce9ae16f 100644
--- a/ioSender/ioSender/JobView.xaml.cs
+++ b/ioSender/ioSender/JobView.xaml.cs
@@ -1,7 +1,7 @@
 /*
  * JobView.xaml.cs - part of Grbl Code Sender
  *
- * v0.36 / 2022-01-20 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,7 +56,7 @@ namespace GCode_Sender
     public partial class JobView : UserControl, ICNCView
     {
         private bool? initOK = null;
-        private bool sdStream = false;
+        private bool isBooted = false;
         private GrblViewModel model;
         private IInputElement focusedControl = null;
         private Controller Controller = null;
@@ -83,12 +83,14 @@ private void View_DataContextChanged(object sender, DependencyPropertyChangedEve
         private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (sender is GrblViewModel) switch (e.PropertyName)
-                {
+            {
                 case nameof(GrblViewModel.GrblState):
                     if (!Controller.ResetPending)
                     {
-                        if (initOK == false && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
-                            Dispatcher.BeginInvoke(new System.Action(() => InitSystem()), DispatcherPriority.ApplicationIdle);
+                            if (initOK == false && isBooted && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
+                            {
+                                Dispatcher.BeginInvoke(new System.Action(() => InitSystem()), DispatcherPriority.ApplicationIdle);
+                            }
                     }
                     break;
 
@@ -155,8 +157,8 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                     }
                     else if (!string.IsNullOrEmpty(filename) && AppConfig.Settings.GCodeViewer.IsEnabled)
                     {
-                        MainWindow.GCodeViewer.Open(GCode.File.Tokens);
-                        MainWindow.EnableView(true, ViewType.GCodeViewer);
+                        //MainWindow.GCodeViewer.Open(GCode.File.Tokens);
+                        //MainWindow.EnableView(true, ViewType.GCodeViewer);
                         GCodeSender.EnablePolling(false);
                         gcodeRenderer.Open(GCode.File.Tokens);
                         GCodeSender.EnablePolling(true);
@@ -190,6 +192,8 @@ public void Activate(bool activate, ViewType chgMode)
                     switch (Controller.Restart())
                     {
                         case Controller.RestartResult.Ok:
+                            if(!isBooted)
+                                Dispatcher.BeginInvoke(new System.Action(() => OnBooted()), DispatcherPriority.ApplicationIdle);
                             initOK = InitSystem();
                             break;
 
@@ -205,13 +209,14 @@ public void Activate(bool activate, ViewType chgMode)
                     model.Message = Controller.Message;
                 }
 
-                #if ADD_CAMERA
+#if ADD_CAMERA
                 if (MainWindow.UIViewModel.Camera != null)
                 {
                     MainWindow.UIViewModel.Camera.MoveOffset += Camera_MoveOffset;
                     MainWindow.UIViewModel.Camera.IsVisibilityChanged += Camera_Opened;
+                    MainWindow.UIViewModel.Camera.IsMoveEnabled = true;
                 }
-                #endif
+#endif
                 //if (viewer == null)
                 //    viewer = new Viewer();
 
@@ -233,10 +238,12 @@ public void Activate(bool activate, ViewType chgMode)
             else if(ViewType != ViewType.Shutdown)
             {
                 DRO.IsFocusable = false;
-                #if ADD_CAMERA
-                if (MainWindow.UIViewModel.Camera != null)
-                    MainWindow.UIViewModel.Camera.MoveOffset -= Camera_MoveOffset;
-                #endif
+#if ADD_CAMERA
+                if (MainWindow.UIViewModel.Camera != null) {
+                    MainWindow.UIViewModel.Camera.MoveOffset-= Camera_MoveOffset;
+                    MainWindow.UIViewModel.Camera.IsMoveEnabled = false;
+                }
+#endif
                 focusedControl = AppConfig.Settings.Base.KeepMdiFocus &&
                                   Keyboard.FocusedElement is TextBox &&
                                    (Keyboard.FocusedElement as TextBox).Tag is string &&
@@ -315,6 +322,19 @@ void Camera_MoveOffset(CameraMoveMode Mode, double XOffset, double YOffset)
             Comms.com.WriteString("G90\r"); // reset to previous or G80 to cancel motion mode?   
         }
 #endif
+
+        private void OnBooted()
+        {
+            isBooted = true;
+            string filename = CNC.Core.Resources.Path + string.Format("KeyMap{0}.xml", (int)AppConfig.Settings.Jog.Mode);
+
+            if (System.IO.File.Exists(filename))
+                model.Keyboard.LoadMappings(filename);
+
+            if (GrblInfo.NumAxes > 3)
+                GCode.File.AddTransformer(typeof(GCodeWrapViewModel), "Wrap to rotary (WIP)", MainWindow.UIViewModel.TransformMenuItems);
+        }
+
         bool InitSystem()
         {
             initOK = true;
diff --git a/ioSender/ioSender/MainWindow.xaml b/ioSender/ioSender/MainWindow.xaml
index 897d1944..cd71c5dd 100644
--- a/ioSender/ioSender/MainWindow.xaml
+++ b/ioSender/ioSender/MainWindow.xaml
@@ -45,6 +45,9 @@
             <MenuItem x:Uid="mnu_help" x:Name="menuHelp" Header="_Help">
                 <MenuItem x:Uid="mnu_wiki" Header="_Wiki" Click="aboutWikiItem_Click"/>
                 <MenuItem x:Uid="mnu_usageTips" Header="Usage _tips" Click="tipsWikiItem_Click"/>
+                <MenuItem x:Uid="mnu_briefTour" Header="A _brief tour" Click="briefTour_Click"/>
+                <MenuItem x:Uid="mnu_videoTutorials" Header="_Video tutorials" Click="videoTutorials_Click"/>
+                <MenuItem x:Uid="mnu_errorsAndAlarms" Header="_Error and alarm codes" Click="errorAndAlarms_Click"/>
                 <MenuItem x:Uid="mnu_about" Header="_About" Click="aboutMenuItem_Click"/>
             </MenuItem>
         </Menu>
@@ -119,9 +122,11 @@
             <TabItem x:Uid="tab_grbl" x:Name="tabGrbl" Header="Grbl" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <local:JobView x:Name="Grbl"/>
             </TabItem>
+            <!---
             <TabItem x:Uid="tab_3DView" x:Name="tabViewer" Header="3D View">
                 <cncviewer:Viewer x:Name="viewer"/>
             </TabItem>
+            -->
             <TabItem x:Uid="tab_probing" x:Name="tabProbing" Header="Probing">
                 <cncprobingcontrols:ProbingView x:Name="probingView"/>
             </TabItem>
diff --git a/ioSender/ioSender/MainWindow.xaml.cs b/ioSender/ioSender/MainWindow.xaml.cs
index c417a820..0291e277 100644
--- a/ioSender/ioSender/MainWindow.xaml.cs
+++ b/ioSender/ioSender/MainWindow.xaml.cs
@@ -1,13 +1,13 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.36 / 2021-12-25 / Io Engineering (Terje Io)
+ * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.36";
+        private const string version = "2.0.37";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
@@ -70,7 +70,7 @@ public MainWindow()
             InitializeComponent();
 
             ui = this;
-            GCodeViewer = viewer;
+//            GCodeViewer = viewer;
             Title = string.Format(Title, version);
 
             int res;
@@ -244,6 +244,21 @@ void tipsWikiItem_Click(object sender, EventArgs e)
             System.Diagnostics.Process.Start("https://github.com/terjeio/ioSender/wiki/Usage-tips");
         }
 
+        void briefTour_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://www.grbl.org/single-post/one-sender-to-rule-them-all");
+        }
+
+        void videoTutorials_Click(object sender, EventArgs e)
+        {
+            System.Diagnostics.Process.Start("https://youtube.com/playlist?list=PLnSV6o2cRxM5mQQe4ec5cS2J8jBsEciY3");
+        }
+
+        void errorAndAlarms_Click(object sender, EventArgs e)
+        {
+            new ErrorsAndAlarms(BaseWindowTitle) { Owner = Application.Current.MainWindow }.Show();
+        }
+
         void aboutMenuItem_Click(object sender, EventArgs e)
         {
             About about = new About(BaseWindowTitle) { Owner = Application.Current.MainWindow };
@@ -263,7 +278,6 @@ private void Base_PropertyChanged(object sender, System.ComponentModel.PropertyC
             }
         }
 
-
         private void Pipe_FileTransfer(string filename)
         {
             if(!JobRunning)
diff --git a/ioSender/ioSender/Properties/AssemblyInfo.cs b/ioSender/ioSender/Properties/AssemblyInfo.cs
index 1cfb6cf4..cd858f2f 100644
--- a/ioSender/ioSender/Properties/AssemblyInfo.cs
+++ b/ioSender/ioSender/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
+[assembly: AssemblyVersion("2.0.37.0")]
+[assembly: AssemblyFileVersion("2.0.37.0")]