diff --git a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml
index d658e3b..d5a68c2 100644
--- a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml	
@@ -13,6 +13,7 @@
         <system:String x:Uid="str_heightMapInstructions" x:Key="Instructions">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.</system:String>
         <system:String x:Uid="str_heightMapFailed" x:Key="ProbingFailed">Probing failed</system:String>
         <system:String x:Uid="str_heightMapCompleted" x:Key="ProbingCompleted">Probing completed: Z min: {0}, Z max: {1}.</system:String>
+        <system:String x:Uid="str_heightMapPointOf" x:Key="ProbingPointOf">Probing point {0} of {1}...</system:String>
         <Controls:LogicalNotConverter x:Key="IsNotRunningConverter" />
     </UserControl.Resources>
         <Grid>
diff --git a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs
index c5bb828..001865b 100644
--- a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * HeightMapControl.xaml.cs - part of CNC Probing library
  *
- * v0.42 / 2023-03-22 / Io Engineering (Terje Io)
+ * v0.44 / 2023-10-01 / Io Engineering (Terje Io)
  *
  */
 
@@ -110,10 +110,15 @@ public void Start(bool preview = false)
             probing.HeightMap.GridSizeX = probing.HeightMap.Map.GridX;
             probing.HeightMap.GridSizeY = probing.HeightMap.Map.GridY;
 
+            int point = 0, points = probing.HeightMap.Map.SizeX * probing.HeightMap.Map.SizeX;
+            string pointOf = ((string)FindResource("ProbingPointOf"));
+
             for (x = 0; x < probing.HeightMap.Map.SizeX; x++)
             {
                 for (y = 0; y < probing.HeightMap.Map.SizeY; y++)
                 {
+                    probing.Program.AddMessage(string.Format(pointOf, ++point, points));
+
                     if (probing.HeightMap.AddPause && (x > 0 || y > 0))
                         probing.Program.AddPause();
                     probing.Program.AddProbingAction(AxisFlags.Z, true);
@@ -184,7 +189,7 @@ private void OnCompleted()
 //                double z = probing.HeightMap.Map.InterpolateZ(0d, 0d);
 
                 if (probing.HeightMap.SetToolOffset &&
-                    (ok = (probing.Positions[0].X == origin.X && probing.Positions[0].Y == origin.Y) || probing.Program.ProbeZ(0d, 0d)))
+                    (ok = /* (probing.Positions[0].X == origin.X && probing.Positions[0].Y == origin.Y) || */ probing.Program.ProbeZ(0d, 0d)))
                 {
                     probing.HeightMap.Map.ZOffset = Z0 - probing.Positions[0].Z; // vs Z above, add check for allowed delta?
 
diff --git a/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml b/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml
index d9f1926..cf8be12 100644
--- a/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml	
@@ -17,4 +17,5 @@
     <system:String x:Uid="str_probingIllegalPosition" x:Key="IllegalPosition">Illegal probe position, try again.</system:String>
     <system:String x:Uid="str_probingNoVerifyContinue" x:Key="NoVerifyContinue">Probe connection was not verified, continue anyway?</system:String>
     <system:String x:Uid="str_probingVerifyStart" x:Key="VerifyStart">Press [Start] again to start probing.</system:String>
+    <system:String x:Uid="str_probingProbingAtX0Y0" x:Key="ProbingAtX0Y0">Probing @X0Y0...</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs
index 8093195..3f21248 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * ProbingView.xaml.cs - part of CNC Probing library
  *
- * v0.43 / 2023-07-25 / Io Engineering (Terje Io)
+ * v0.44 / 2023-08-26 / Io Engineering (Terje Io)
  *
  */
 
@@ -324,18 +324,18 @@ public void Setup(UIViewModel model, AppConfig profile)
 
         private void mnu_Click(object sender, RoutedEventArgs e)
         {
-            switch ((string)((MenuItem)sender).Header)
+            switch ((string)((MenuItem)sender).Name)
             {
-                case "Add":
+                case "mnuAdd":
                     cbxProfile.SelectedValue = profiles.Add(cbxProfile.Text, model);                
                     break;
 
-                case "Update":
+                case "mnuUpdate":
                     if(model.Profile != null)
                         profiles.Update(model.Profile.Id, cbxProfile.Text, model);
                     break;
 
-                case "Delete":
+                case "mnuDelete":
                     if (model.Profile != null && profiles.Delete(model.Profile.Id))
                         cbxProfile.SelectedValue = profiles.Profiles[0].Id;
                     break;
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs
index 736dbc0..1b47d7b 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs	
@@ -1,7 +1,7 @@
 /*
  * ProbingViewModel.cs - part of CNC Probing library
  *
- * v0.43 / 2023-06-30 / Io Engineering (Terje Io)
+ * v0.44 / 2023-10-01 / Io Engineering (Terje Io)
  *
  */
 
@@ -171,9 +171,6 @@ public bool WaitForResponse(string command)
         {
             bool? res = null;
 
-            if (Grbl.ResponseLogVerbose)
-                Grbl.ResponseLog.Add(command);
-
             var t = new Thread(() =>
             {
                 res = WaitFor.AckResponse<string>(
diff --git a/CNC Controls Probing/CNC Controls Probing/Program.cs b/CNC Controls Probing/CNC Controls Probing/Program.cs
index f1ea971..ef25805 100644
--- a/CNC Controls Probing/CNC Controls Probing/Program.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/Program.cs	
@@ -1,7 +1,7 @@
 /*
  * Program.cs - part of CNC Probing library
  *
- * v0.42 / 2023-03-22 / Io Engineering (Terje Io)
+ * v0.44 / 2023-10-01 / Io Engineering (Terje Io)
  *
  */
 
@@ -308,6 +308,11 @@ public void AddProbingAction(AxisFlags axis, bool negative)
             }
         }
 
+        public void AddMessage(string msg)
+        {
+            _program.Add("#" + msg);
+        }
+
         public void AddSimulatedProbe(int p)
         {
             probing.IsSuccess = true;
@@ -415,8 +420,7 @@ public bool Execute(bool go)
 
                         if (response == "ok")
                         {
-                            step++;
-                            if (step < _program.Count)
+                            if (++step < _program.Count)
                             {
                                 int i;
                                 //if ((i = _program[step].IndexOf('$')) > 0)
@@ -426,6 +430,13 @@ public bool Execute(bool go)
                                 //    double val = _positions[_positions.Count - 1].Values[i] + dbl.Parse(_program[step].Substring(i, 3));
                                 //    _program[step] = _program[step] + val.ToInvariantString();
                                 //}
+                                if (_program[step].StartsWith("#"))
+                                {
+                                    Grbl.Message = _program[step].Substring(1);
+                                    if (++step == _program.Count)
+                                        break;
+                                }
+
                                 if (_program[step].StartsWith("!"))
                                 {
                                     isProbing = false;
@@ -475,6 +486,7 @@ public bool ProbeZ(double x, double y)
                 return false;
 
             probing.Program.AddRapid(string.Format("G90X{0}Y{0}", x.ToInvariantString(probing.Grbl.Format), y.ToInvariantString(probing.Grbl.Format)));
+            probing.Program.AddMessage(LibStrings.FindResource("ProbingAtX0Y0"));
             probing.Program.Add(string.Format("G91F{0}", probing.ProbeFeedRate.ToInvariantString()));
             probing.Program.AddProbingAction(AxisFlags.Z, true);
 
diff --git a/CNC Controls/CNC Controls/AppConfig.cs b/CNC Controls/CNC Controls/AppConfig.cs
index 1ec067b..063bd64 100644
--- a/CNC Controls/CNC Controls/AppConfig.cs	
+++ b/CNC Controls/CNC Controls/AppConfig.cs	
@@ -711,7 +711,7 @@ public RestartResult Restart ()
                                         {
                                             if (MessageBox.Show(LibStrings.FindResource("MsgEStopExit"), "ioSender", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
                                                 return RestartResult.Close;
-                                        };
+                                        }
                                     }
                                     else
                                         AttemptReset();
@@ -725,6 +725,17 @@ public RestartResult Restart ()
                                     else
                                         Message = LibStrings.FindResource("MsgHome");
                                     break;
+
+                                case 17: // Motor fault
+                                        if (!(GrblInfo.IsGrblHAL && model.Signals.Value.HasFlag(Signals.MotorFault)))
+                                        {
+                                            AttemptReset();
+                                            if (!GrblInfo.IsLoaded)
+                                                model.ExecuteCommand(GrblConstants.CMD_UNLOCK);
+                                        }
+                                    break;
+
+
                             }
                             break;
 
diff --git a/CNC Controls/CNC Controls/GCodeListControl.xaml b/CNC Controls/CNC Controls/GCodeListControl.xaml
index 6528ee7..2d16b7d 100644
--- a/CNC Controls/CNC Controls/GCodeListControl.xaml	
+++ b/CNC Controls/CNC Controls/GCodeListControl.xaml	
@@ -8,11 +8,19 @@
              d:DesignHeight="335" d:DesignWidth="400"
              Loaded="UserControl_Loaded">
     <DataGrid x:Name="grdGCode" Grid.Row="0" ItemsSource="{Binding}" AllowDrop="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" AutoGenerateColumns="False"
-                   CanUserSortColumns="false" CanUserResizeRows="False" IsReadOnly="true" DragEnter="grdGCode_Drag" DragOver="grdGCode_Drag" DragLeave="grdGCode_Drag" Drop="grdGCode_Drop">
+              CanUserSortColumns="false" CanUserResizeRows="False" IsReadOnly="true" SelectionChanged="grdGCode_SelectionChanged"
+              DragEnter="grdGCode_Drag" DragOver="grdGCode_Drag" DragLeave="grdGCode_Drag" Drop="grdGCode_Drop">
         <DataGrid.Columns>
             <DataGridTextColumn x:Uid="hdr_block" Header="Block" Binding="{Binding LineNum}" Width="50" MinWidth="50" MaxWidth="60"/>
             <DataGridTextColumn Header="" Binding="{Binding Sent}" Width="*" MinWidth="30" MaxWidth="60"/>
             <DataGridTextColumn x:Uid="hdr_data" Header="Data" Binding="{Binding Data}" Width="*" MinWidth="280"/>
         </DataGrid.Columns>
+        <DataGrid.ContextMenu>
+            <ContextMenu x:Name="ctxMenu">
+                <MenuItem x:Uid="mnu_sendToController" Header="Send to controller" IsEnabled="{Binding Path=MultipleSelected}" Click="SendController_Click" />
+                <MenuItem x:Uid="mnu_startFromHere" Header="Start from here" IsEnabled="{Binding Path=SingleSelected}" Click="StartHere_Click" />
+                <MenuItem x:Uid="mnu_copyToMDI" Header="Copy to MDI" IsEnabled="{Binding Path=SingleSelected}" Click="CopyMDI_Click" />
+            </ContextMenu>
+        </DataGrid.ContextMenu>
     </DataGrid>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/GCodeListControl.xaml.cs b/CNC Controls/CNC Controls/GCodeListControl.xaml.cs
index e879fbf..af88e4b 100644
--- a/CNC Controls/CNC Controls/GCodeListControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/GCodeListControl.xaml.cs	
@@ -1,18 +1,47 @@
-using CNC.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+/*
+ * GcodeListControl.xaml.cs - part of CNC Controls library for Grbl
+ *
+ * v0.44 / 2023-10-07 / Io Engineering (Terje Io)
+ *
+ */
+
+/*
+
+Copyright (c) 2020-2023, Io Engineering (Terje Io)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+· Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+· Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+· Neither the name of the copyright holder nor the names of its contributors may
+be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+using System.Data;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Collections.Generic;
+using CNC.Core;
 
 namespace CNC.Controls
 {
@@ -22,12 +51,31 @@ namespace CNC.Controls
     public partial class GCodeListControl : UserControl
     {
         public ScrollViewer scroll = null;
-
+ 
         public GCodeListControl()
         {
             InitializeComponent();
 
+            ctxMenu.DataContext = this;
         }
+
+        #region Dependency properties
+
+        public static readonly DependencyProperty SingleSelectedProperty = DependencyProperty.Register(nameof(SingleSelected), typeof(bool), typeof(GCodeListControl), new PropertyMetadata(false));
+        public bool SingleSelected
+        {
+            get { return (bool)GetValue(SingleSelectedProperty); }
+            private set { SetValue(SingleSelectedProperty, value); }
+        }
+
+        public static readonly DependencyProperty MultipleSelectedProperty = DependencyProperty.Register(nameof(MultipleSelected), typeof(bool), typeof(GCodeListControl), new PropertyMetadata(false));
+        public bool MultipleSelected
+        {
+            get { return (bool)GetValue(MultipleSelectedProperty); }
+            private set { SetValue(MultipleSelectedProperty, value); }
+        }
+        #endregion
+
         private void grdGCode_Drag(object sender, DragEventArgs e)
         {
             GCode.File.Drag(sender, e);
@@ -59,5 +107,58 @@ private void GCodeListControl_PropertyChanged(object sender, System.ComponentMod
                     break;
             }
         }
+
+        void grdGCode_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            SingleSelected = grdGCode.SelectedItems.Count == 1 && (DataContext as GrblViewModel).StartFromBlock.CanExecute(grdGCode.SelectedIndex);
+            MultipleSelected = grdGCode.SelectedItems.Count >= 0 && (DataContext as GrblViewModel).StartFromBlock.CanExecute(grdGCode.SelectedIndex);
+        }
+
+        private void StartHere_Click(object sender, RoutedEventArgs e)
+        {
+            if (grdGCode.SelectedItems.Count == 1 &&
+                 MessageBox.Show(string.Format(LibStrings.FindResource("VerifyStartFrom"), ((DataRowView)(grdGCode.SelectedItems[0])).Row["LineNum"]),
+                                  "ioSender", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
+            {
+                (DataContext as GrblViewModel).StartFromBlock.Execute(grdGCode.SelectedIndex);
+            }
+        }
+
+        private void CopyMDI_Click(object sender, RoutedEventArgs e)
+        {
+            if (grdGCode.SelectedItems.Count == 1)
+                (DataContext as GrblViewModel).MDIText = (string)((DataRowView)(grdGCode.SelectedItems[0])).Row["Data"];
+        }
+
+        private void SendController_Click(object sender, RoutedEventArgs e)
+        {
+            if (grdGCode.SelectedItems.Count >= 1 &&
+                 MessageBox.Show(LibStrings.FindResource("VerifySendController"), "ioSender",
+                                  MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
+            {
+                var model = DataContext as GrblViewModel;
+
+                if (model.GrblError != 0)
+                    model.ExecuteCommand("");
+
+                List<DataRow> rows = new List<DataRow>();
+
+                for (int i = 0; i < grdGCode.SelectedItems.Count; i++)
+                    rows.Add(((DataRowView)(grdGCode.SelectedItems[i])).Row);
+
+                rows.Sort(new RowComparer());
+
+                foreach (DataRow row in rows)
+                    model.ExecuteCommand((string)row["Data"]);
+            }
+        }
+    }
+
+    internal class RowComparer : IComparer<DataRow>
+    {
+        public int Compare(DataRow a, DataRow b)
+        {
+            return (int)a["LineNum"] - (int)b["LineNum"];
+        }
     }
 }
diff --git a/CNC Controls/CNC Controls/GrblConfigView.xaml b/CNC Controls/CNC Controls/GrblConfigView.xaml
index fe94054..5f500d6 100644
--- a/CNC Controls/CNC Controls/GrblConfigView.xaml	
+++ b/CNC Controls/CNC Controls/GrblConfigView.xaml	
@@ -17,6 +17,8 @@
         <system:String x:Uid="str_settingsFail" x:Key="SettingsFail">Bummer...\nContinue loading?</system:String>
         <system:String x:Uid="str_settingsInvalid" x:Key="SettingsInvalid">The file does not contain any settings.</system:String>
         <system:String x:Uid="str_settingsRestore" x:Key="SettingsRestore">Restore settings from file</system:String>
+        <local:LogicalNotConverter x:Key="IsNotConverter" />
+        <local:GrblStateToBooleanConverter x:Key="StateToBooleanConverter" />
         <Style x:Key="NumericErrorStyle" TargetType="local:NumericTextBox">
             <Style.Triggers>
                 <Trigger Property="Validation.HasError" Value="true">
@@ -89,7 +91,20 @@
             <DockPanel DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" Height="Auto" Margin="10,0,10,10" VerticalAlignment="Top" Width="Auto">
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Left" Height="Auto" VerticalAlignment="Top">
                     <Button x:Uid="btn_reload" x:Name="btnReload" Content="Reload" ToolTip="Reload settings from controller." HorizontalAlignment="Left" Style="{StaticResource ConfigButtonStyle}" Click="btnReload_Click"/>
-                    <Button x:Uid="btn_save" x:Name="btnSave" Content="Save" ToolTip="Save changed settings to controller." HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Style="{StaticResource ConfigButtonStyle}" Click="btnSave_Click"/>
+                    <Button x:Uid="btn_save" x:Name="btnSave" Content="Save" ToolTip="Save changed settings to controller." HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Style="{StaticResource ConfigButtonStyle}" Click="btnSave_Click">
+<!--- TODO                        <Button.IsEnabled>
+                            <Binding Converter="IsNotConverter">
+                            <MultiBinding Converter="{StaticResource StateToBooleanConverter}">
+                            <Binding Path="Grbl.GrblState"/>
+                            <Binding>
+                                <Binding.Source>
+                                    <cnccore:GrblStates>Hold</cnccore:GrblStates>
+                                </Binding.Source>
+                            </Binding>
+                            </MultiBinding>
+                            </Binding>
+                        </Button.IsEnabled> -->
+                    </Button>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" Height="Auto" VerticalAlignment="Top" HorizontalAlignment="Right">
                     <Button x:Uid="btn_backup" x:Name="btnBackup" Content="Backup" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ConfigButtonStyle}" Click="btnBackup_Click"/>
diff --git a/CNC Controls/CNC Controls/GrblConfigView.xaml.cs b/CNC Controls/CNC Controls/GrblConfigView.xaml.cs
index 4070c56..92620f9 100644
--- a/CNC Controls/CNC Controls/GrblConfigView.xaml.cs	
+++ b/CNC Controls/CNC Controls/GrblConfigView.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * GrblConfigView.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.36 / 2021-11-01 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io)
+Copyright (c) 2018-2023, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -39,12 +39,12 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 
 using System.Windows;
 using System.Windows.Controls;
-using CNC.Core;
 using Microsoft.Win32;
 using System.Collections.Generic;
 using System.IO;
 using System;
 using System.Threading;
+using CNC.Core;
 
 namespace CNC.Controls
 {
@@ -58,19 +58,14 @@ public partial class GrblConfigView : UserControl, ICNCView
         public GrblConfigView()
         {
             InitializeComponent();
-
-            DataContextChanged += GrblConfigView_DataContextChanged;
-        }
-
-        private void GrblConfigView_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (e.OldValue is GrblViewModel)
-                model = (GrblViewModel)e.OldValue;
         }
 
         private void ConfigView_Loaded(object sender, RoutedEventArgs e)
         {
-            DataContext = new WidgetViewModel();
+            if(!(DataContext is WidgetViewModel))
+                DataContext = new WidgetViewModel(DataContext as GrblViewModel);
+
+            model = (DataContext as WidgetViewModel).Grbl;
 
             dgrSettings.Visibility = GrblInfo.HasEnums ? Visibility.Collapsed : Visibility.Visible;
             treeView.Visibility = !GrblInfo.HasEnums ? Visibility.Collapsed : Visibility.Visible;
diff --git a/CNC Controls/CNC Controls/JobControl.xaml.cs b/CNC Controls/CNC Controls/JobControl.xaml.cs
index adaae2d..78ab565 100644
--- a/CNC Controls/CNC Controls/JobControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/JobControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * JobControl.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.43 / 2023-05-31 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-20 / Io Engineering (Terje Io)
  *
  */
 
@@ -73,7 +73,7 @@ private struct StreamingHandlerFn
 
         private struct JobData
         {
-            public int CurrLine, PendingLine, PgmEndLine, ToolChangeLine, ACKPending, serialUsed;
+            public int CurrBlock, PendingLine, PgmEndLine, ToolChangeLine, ACKPending, serialUsed;
             public bool Started, Transferred, Complete, IsSDFile, IsChecking, HasError;
             public DataRow CurrentRow, NextRow;
         }
@@ -81,7 +81,7 @@ private struct JobData
         private static bool keyboardMappingsOk = false;
 
         private int serialSize = 128;
-        private bool holdSignal = false, cycleStartSignal = false, initOK = false, isActive = false, useBuffering = false;
+        private bool initOK = false, isActive = false, useBuffering = false;
         private volatile StreamingState streamingState = StreamingState.NoFile;
         private GrblState grblState;
         private GrblViewModel model;
@@ -203,10 +203,17 @@ private void JobControl_DataContextChanged(object sender, DependencyPropertyChan
                 model.PropertyChanged += OnDataContextPropertyChanged;
                 model.OnRealtimeStatusProcessed += RealtimeStatusProcessed;
                 model.OnCommandResponseReceived += ResponseReceived;
-
+                model.OnCycleStart += OnCycleStart;
                 GCode.File.Model = model;
             }
         }
+        private void OnCycleStart(object sender, EventArgs e)
+        {
+            if (isActive && JobPending)
+            {
+                CycleStart(0);
+            }
+        }
 
         private void RealtimeStatusProcessed(string response)
         {
@@ -226,22 +233,16 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                     SendCommand((sender as GrblViewModel).MDI);
                     break;
 
-                case nameof(GrblViewModel.IsMPGActive):
+                case nameof(GrblViewModel.StartFromBlockNum):
+                    CycleStart((sender as GrblViewModel).StartFromBlockNum);
+                    break;
+
+                    case nameof(GrblViewModel.IsMPGActive):
                     grblState.MPG = (sender as GrblViewModel).IsMPGActive == true;
                     (sender as GrblViewModel).Poller.SetState(grblState.MPG ? 0 : AppConfig.Settings.Base.PollInterval);
                     streamingHandler.Call(grblState.MPG ? StreamingState.Disabled : StreamingState.Idle, false);
                     break;
 
-                case nameof(GrblViewModel.Signals):
-                    if(isActive) {
-                        var signals = (sender as GrblViewModel).Signals.Value;
-                        if (JobPending && signals.HasFlag(Signals.CycleStart) && !signals.HasFlag(Signals.Hold) && !cycleStartSignal)
-                            CycleStart();
-                        holdSignal = signals.HasFlag(Signals.Hold);
-                        cycleStartSignal = signals.HasFlag(Signals.CycleStart);
-                    }
-                    break;
-
                 case nameof(GrblViewModel.ProgramEnd):
                     if (!GCode.File.IsLoaded)
                         streamingHandler.Call(model.IsSDCardJob ? StreamingState.JobFinished : StreamingState.NoFile, model.IsSDCardJob);
@@ -259,7 +260,7 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                         else
                         {
                             job.ToolChangeLine = -1;
-                            job.CurrLine = job.PendingLine = job.ACKPending = model.BlockExecuting = 0;
+                            job.CurrBlock = job.PendingLine = job.ACKPending = model.BlockExecuting = 0;
                             job.PgmEndLine = GCode.File.Blocks - 1;
                             if ((sender as GrblViewModel).IsPhysicalFileLoaded)
                             {
@@ -352,7 +353,7 @@ private bool StopJob(Key key)
 
         private bool StartJob(Key key)
         {
-            CycleStart();
+            CycleStart(0);
             return true;
         }
 
@@ -423,12 +424,12 @@ void btnStop_Click(object sender, RoutedEventArgs e)
 
         void btnStart_Click(object sender, RoutedEventArgs e)
         {
-            CycleStart();
+            CycleStart(0);
         }
 
         #endregion
 
-        public void CycleStart()
+        public void CycleStart(int fromBlock)
         {
             if (grblState.State == GrblStates.Hold || (grblState.State == GrblStates.Run && grblState.Substate == 1) || (grblState.State == GrblStates.Door && grblState.Substate == 0))
                 Comms.com.WriteByte(GrblLegacy.ConvertRTCommand(GrblConstants.CMD_CYCLE_START));
@@ -456,10 +457,11 @@ public void CycleStart()
                 else
                 {
                     job.ToolChangeLine = -1;
-                    model.BlockExecuting = 0;
-                    job.ACKPending = job.CurrLine = job.serialUsed = missed = 0;
+                    model.BlockExecuting = fromBlock;
+                    job.CurrBlock = job.ACKPending = job.PendingLine = fromBlock;
+                    job.serialUsed = missed = 0;
                     job.Started = job.Transferred = job.HasError = false;
-                    job.NextRow = GCode.File.Data.Rows[0];
+                    job.NextRow = GCode.File.Data.Rows[job.CurrBlock];
                     Comms.com.PurgeQueue();
                     JobTimer.Start();
                     streamingHandler.Call(StreamingState.Send, false);
@@ -560,7 +562,7 @@ public void RewindFile()
                     //                  grdGCode.DataContext = GCode.File.Data.DefaultView;
                     model.ScrollPosition = 0;
                     job.ToolChangeLine = -1;
-                    job.CurrLine = job.PendingLine = job.ACKPending = model.BlockExecuting = 0;
+                    job.CurrBlock = job.PendingLine = job.ACKPending = model.BlockExecuting = 0;
                     job.PgmEndLine = GCode.File.Blocks - 1;
 
                     btnStart.IsEnabled = true;
@@ -720,7 +722,7 @@ public bool StreamingSendFile(StreamingState newState, bool always)
                         if (grblState.State == GrblStates.Idle || grblState.State == GrblStates.Check)
                             newState = StreamingState.Idle;
                         job.Complete = job.Transferred = true;
-                        job.ACKPending = job.CurrLine = 0;
+                        job.ACKPending = job.CurrBlock = 0;
                         job.CurrentRow = job.NextRow = null;
                         SetStreamingHandler(StreamingHandler.AwaitIdle);
                         break;
@@ -880,7 +882,7 @@ public bool StreamingIdle(StreamingState newState, bool always)
                         btnStart.IsEnabled = GCode.File.IsLoaded || (model.IsSDCardJob && model.SDRewind);
                         btnStop.IsEnabled = model.IsSDCardJob && model.SDRewind;
                         btnHold.IsEnabled = !grblState.MPG;
-                        btnRewind.IsEnabled = !grblState.MPG && GCode.File.IsLoaded && job.CurrLine != 0;
+                        btnRewind.IsEnabled = !grblState.MPG && GCode.File.IsLoaded && job.CurrBlock != 0;
                         model.IsJobRunning = JobTimer.IsRunning;
                         break;
 
@@ -898,7 +900,6 @@ public bool StreamingIdle(StreamingState newState, bool always)
 
                     case StreamingState.Start: // Streaming from SD Card
                         job.IsSDFile = true;
-                        JobTimer.Start();
                         break;
 
                     case StreamingState.Error:
@@ -1160,11 +1161,11 @@ void SendNextLine()
                         if (line == "%")
                         {
                             if (!(job.Started = !job.Started))
-                                job.PgmEndLine = job.CurrLine;
+                                job.PgmEndLine = job.CurrBlock;
                         }
                         else if ((bool)job.CurrentRow["ProgramEnd"])
-                            job.PgmEndLine = job.CurrLine;
-                        job.NextRow = job.PgmEndLine == job.CurrLine ? null : GCode.File.Data.Rows[++job.CurrLine];
+                            job.PgmEndLine = job.CurrBlock;
+                        job.NextRow = job.PgmEndLine == job.CurrBlock ? null : GCode.File.Data.Rows[++job.CurrBlock];
                         //            ParseBlock(line + "\r");
                         job.serialUsed += (int)job.CurrentRow["Length"];
                         Comms.com.WriteString(line + '\r');
diff --git a/CNC Controls/CNC Controls/LibStrings.xaml b/CNC Controls/CNC Controls/LibStrings.xaml
index f0b923c..459c21c 100644
--- a/CNC Controls/CNC Controls/LibStrings.xaml	
+++ b/CNC Controls/CNC Controls/LibStrings.xaml	
@@ -40,6 +40,8 @@
     <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>
+    <system:String x:Uid="str_verifyStartFrom" x:Key="VerifyStartFrom">Are you sure the controller is in the correct state to start from block {0}?</system:String>
+    <system:String x:Uid="str_verifySendController" x:Key="VerifySendController">Are you sure you want to send the selected blocks to the controller?</system:String>
     <system:String x:Uid="str_themeBlack" x:Key="ThemeBlack">Black</system:String>
     <system:String x:Uid="str_themeDark" x:Key="ThemeDark">Dark</system:String>
     <system:String x:Uid="str_themeLight" x:Key="ThemeLight">Light</system:String>
diff --git a/CNC Controls/CNC Controls/MDIControl.xaml.cs b/CNC Controls/CNC Controls/MDIControl.xaml.cs
index f682744..0d3079a 100644
--- a/CNC Controls/CNC Controls/MDIControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/MDIControl.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * MDIControl.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.27 / 2020-09-17 / Io Engineering (Terje Io)
+ * v0.44 / 2023-10-07 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2020, Io Engineering (Terje Io)
+Copyright (c) 2018-2023, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -41,6 +41,7 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using CNC.Core;
 
 namespace CNC.Controls
@@ -70,6 +71,19 @@ public ObservableCollection<string> Commands
             set { SetValue(CommandsProperty, value); }
         }
 
+        private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (sender is GrblViewModel) switch (e.PropertyName)
+            {
+                case nameof(GrblViewModel.MDIText):
+                    var txt = (sender as GrblViewModel).MDIText;
+                    if (!string.IsNullOrEmpty(txt) && !Commands.Contains(txt))
+                        Commands.Insert(0, txt);
+                    Command = txt;
+                    break;
+            }
+        }
+
         private void txtMDI_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
         {
             if (e.Key == Key.Return && (DataContext as GrblViewModel).MDICommand.CanExecute(null))
@@ -109,6 +123,8 @@ private void MDIControl_Loaded(object sender, RoutedEventArgs e)
             var mdi = txtMDI.Template.FindName("PART_EditableTextBox", txtMDI) as TextBox;
             if(mdi != null)
                 mdi.Tag = "MDI";
+            if(DataContext != null)
+                (DataContext as GrblViewModel).PropertyChanged += OnDataContextPropertyChanged;
         }
     }
 }
diff --git a/CNC Controls/CNC Controls/OffsetView.xaml.cs b/CNC Controls/CNC Controls/OffsetView.xaml.cs
index ccd18f3..02c8b7c 100644
--- a/CNC Controls/CNC Controls/OffsetView.xaml.cs	
+++ b/CNC Controls/CNC Controls/OffsetView.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * OffsetView.xaml.cs - part of CNC Controls library
  *
- * v0.42 / 2023-03-21 / Io Engineering (Terje Io)
+ * v0.44 / 2023-09-16 / Io Engineering (Terje Io)
  *
  */
 
@@ -132,6 +132,10 @@ private void Parameters_PropertyChanged(object sender, System.ComponentModel.Pro
                         parameters.SuspendPositionNotifications = false;
                     }
                     break;
+
+                case nameof(GrblViewModel.GrblError):
+                    GrblWorkParameters.Get(parameters);
+                    break;
             }
         }
 
@@ -176,24 +180,33 @@ private void dgrOffsets_SelectionChanged(object sender, SelectionChangedEventArg
 
         void saveOffset(string axis)
         {
-            string cmd;
+            bool mChanged;
+            string cmd = string.Empty;
 
             Position newpos = new Position(Offset);
 
             newpos.X = GrblWorkParameters.ConvertX(GrblWorkParameters.LatheMode, GrblParserState.LatheMode, selectedOffset.X);
 
+            GrblParserState.Get();
+            if ((mChanged = GrblParserState.IsMetric != (DataContext as GrblViewModel).IsMetric))
+                cmd = (DataContext as GrblViewModel).IsMetric ? "G21" : "G20";
+
+            (DataContext as GrblViewModel).Message = String.Empty;
+
             if (selectedOffset.Id == 0)
             {
                 string code = selectedOffset.Code == "G28" || selectedOffset.Code == "G30" ? selectedOffset.Code + ".1" : selectedOffset.Code;
 
                 if (axis == "ClearAll" || IsPredefined)
-                    cmd = selectedOffset.Code == "G43.1" ? "G49" : selectedOffset.Code + ".1";
+                    cmd += selectedOffset.Code == "G43.1" ? "G49" : selectedOffset.Code + ".1";
                 else
-                    cmd = string.Format("G90{0}{1}", code, newpos.ToString(axis == "All" ? GrblInfo.AxisFlags : GrblInfo.AxisLetterToFlag(axis)));
+                    cmd += string.Format("G90{0}{1}", code, newpos.ToString(axis == "All" ? GrblInfo.AxisFlags : GrblInfo.AxisLetterToFlag(axis)));
             } else
-                cmd = string.Format("G90G10L2P{0}{1}", selectedOffset.Id, newpos.ToString(axis == "All" || axis == "ClearAll" ? GrblInfo.AxisFlags : GrblInfo.AxisLetterToFlag(axis)));
+                cmd += string.Format("G90G10L2P{0}{1}", selectedOffset.Id, newpos.ToString(axis == "All" || axis == "ClearAll" ? GrblInfo.AxisFlags : GrblInfo.AxisLetterToFlag(axis)));
 
             Comms.com.WriteCommand(cmd);
+            if(mChanged)
+                Comms.com.WriteCommand((DataContext as GrblViewModel).IsMetric ? "G20" : "G21");
         }
 
         private void cvOffset_Click(object sender, RoutedEventArgs e)
diff --git a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs b/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs
index 400bf09..6088b0d 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.43.0")]
-[assembly: AssemblyFileVersion("2.0.43.0")]
+[assembly: AssemblyVersion("2.0.44.0")]
+[assembly: AssemblyFileVersion("2.0.44.0")]
diff --git a/CNC Controls/CNC Controls/SignalsControl.xaml b/CNC Controls/CNC Controls/SignalsControl.xaml
index 8d41755..6e04ce3 100644
--- a/CNC Controls/CNC Controls/SignalsControl.xaml	
+++ b/CNC Controls/CNC Controls/SignalsControl.xaml	
@@ -61,6 +61,20 @@
                             </Setter.Value>
                         </Setter>
                     </Style>
+                    <Style x:Key="MotorFaultVisibleStyle">
+                        <Setter Property="Control.Visibility">
+                            <Setter.Value>
+                                <MultiBinding Converter="{StaticResource IsSignalVisibleConverter}">
+                                    <Binding Path="OptionalSignals" />
+                                    <Binding>
+                                        <Binding.Source>
+                                            <core:Signals>MotorFault</core:Signals>
+                                        </Binding.Source>
+                                    </Binding>
+                                </MultiBinding>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
                     <Style x:Key="BlockDeleteVisibleStyle">
                         <Setter Property="Control.Visibility">
                             <Setter.Value>
@@ -108,6 +122,7 @@
             </StackPanel>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,3,0" VerticalAlignment="Center" DockPanel.Dock="Right">
                 <local:SignalControl x:Uid="lbl_signalMotorWarning" Label="W" ToolTip="Motor warning" IsSet="{Binding Path=Signals[(core:Signals)MotorWarning], Mode=OneWay}" Style="{StaticResource MotorWarningVisibleStyle}"/>
+                <local:SignalControl x:Uid="lbl_signalMotorFault" Label="F" ToolTip="Motor fault" IsSet="{Binding Path=Signals[(core:Signals)MotorFault], Mode=OneWay}" Style="{StaticResource MotorFaultVisibleStyle}"/>
                 <local:SignalControl x:Uid="lbl_signalBlockDelete" Label="B" ToolTip="Block delete" IsSet="{Binding Path=Signals[(core:Signals)BlockDelete], Mode=OneWay}" Style="{StaticResource BlockDeleteVisibleStyle}"/>
                 <local:SignalControl x:Uid="lbl_signalOptionalStop" Label="O" ToolTip="Optional stop" IsSet="{Binding Path=Signals[(core:Signals)OptionalStop], Mode=OneWay}" Style="{StaticResource OptionalStopVisibleStyle}"/>
                 <local:SignalControl x:Uid="lbl_signalFeedHold" Label="H" ToolTip="Feed hold" IsSet="{Binding Path=Signals[(core:Signals)Hold], Mode=OneWay}"/>
diff --git a/CNC Controls/CNC Controls/THCMonitorControl.xaml b/CNC Controls/CNC Controls/THCMonitorControl.xaml
index c41c322..479a2b3 100644
--- a/CNC Controls/CNC Controls/THCMonitorControl.xaml	
+++ b/CNC Controls/CNC Controls/THCMonitorControl.xaml	
@@ -25,9 +25,9 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Border BorderBrush="DarkGray" BorderThickness="1" CornerRadius="3" Background="#FFE5E5EA">
-        <Grid Width="300" Margin="10,0,0,0">
+        <Grid Width="320" Margin="10,0,0,0">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="100*"/>
+                <ColumnDefinition Width="130*"/>
                 <ColumnDefinition Width="100*"/>
                 <ColumnDefinition Width="100*"/>
             </Grid.ColumnDefinitions>
@@ -38,19 +38,19 @@
                 <RowDefinition Height="28"/>
                 <RowDefinition Height="28"/>
             </Grid.RowDefinitions>
-            <StackPanel Orientation="Horizontal" Grid.RowSpan="2">
-                <Label Content="Arc voltage:" HorizontalContentAlignment="Right" VerticalAlignment="Center"/>
-                <TextBlock TextWrapping="NoWrap" Text="{Binding Path=THCVoltage, StringFormat=##0, Mode=OneWay}" Height="24" Width="40" FontSize="18" VerticalAlignment="Center" Margin="0,2,0,0"/>
+            <StackPanel Orientation="Horizontal" Grid.RowSpan="2" Height="40" Margin="0,4,0,0">
+                <Label Content="Arc voltage:" Margin="0,10,0,0" HorizontalContentAlignment="Right" VerticalAlignment="Center"/>
+                <TextBlock TextWrapping="NoWrap" Text="{Binding Path=THCVoltage, StringFormat=##0.0, Mode=OneWay}" Height="24" Width="50" FontSize="18" VerticalAlignment="Center" Margin="0,6,0,0"/>
             </StackPanel>
             <local:LEDControl Grid.Row="1" Grid.Column="1" Label="THC enabled" IsSet="{Binding Path=THCSignals[(core:THCSignals)THCEnabled], Mode=OneWay}"/>
             <local:LEDControl Grid.Row="1" Grid.Column="2" Label="THC active" IsSet="{Binding Path=THCSignals[(core:THCSignals)THCActive], Mode=OneWay}"/>
-            <local:LEDControl Grid.Row="2" Label="Ohmic probe" IsSet="{Binding Path=THCSignals[(core:THCSignals)OhmicProbe], Mode=OneWay}"/>
+            <local:LEDControl Grid.Row="2" Label="Ohmic probe" Padding="15,0" IsSet="{Binding Path=THCSignals[(core:THCSignals)OhmicProbe], Mode=OneWay}"/>
             <local:LEDControl Grid.Row="2" Grid.Column="1" Label="THC up" IsSet="{Binding Path=THCSignals[(core:THCSignals)Up], Mode=OneWay}"/>
             <local:LEDControl Grid.Row="2" Grid.Column="2" Label="THC down" IsSet="{Binding Path=THCSignals[(core:THCSignals)Down], Mode=OneWay}"/>
-            <local:LEDControl Grid.Row="3" Label="Torch on" IsSet="{Binding Path=THCSignals[(core:THCSignals)TorchOn], Mode=OneWay}"/>
+            <local:LEDControl Grid.Row="3" Label="Torch on" Padding="15,0" IsSet="{Binding Path=THCSignals[(core:THCSignals)TorchOn], Mode=OneWay}"/>
             <local:LEDControl Grid.Row="3" Grid.Column="1" Label="Float switch" IsSet="{Binding Path=THCSignals[(core:THCSignals)VelocityLock], Mode=OneWay}"/>
             <local:LEDControl Grid.Row="3" Grid.Column="2" Label="Velocity lock" IsSet="{Binding Path=THCSignals[(core:THCSignals)VelocityLock], Mode=OneWay}"/>
-            <local:LEDControl Grid.Row="4" Label="Arc ok" IsSet="{Binding Path=THCSignals[(core:THCSignals)ArcOk], Mode=OneWay}"/>
+            <local:LEDControl Grid.Row="4" Label="Arc ok" Padding="15,0" IsSet="{Binding Path=THCSignals[(core:THCSignals)ArcOk], Mode=OneWay}"/>
             <local:LEDControl Grid.Row="4" Grid.Column="1" Label="Breakaway" IsSet="{Binding Path=THCSignals[(core:THCSignals)ArcOk], Mode=OneWay}"/>
             <local:LEDControl Grid.Row="4" Grid.Column="2" Label="Void lock" IsSet="{Binding Path=THCSignals[(core:THCSignals)VoidLock], Mode=OneWay}"/>
             <Button Content="×" Focusable="False" Style="{StaticResource SmallXButtonStyle}" VerticalContentAlignment="Top" HorizontalAlignment="Right" Margin="0,0,5,0" VerticalAlignment="Top" Width="14" Height="18" Click="btn_Close" Grid.Column="1" Grid.ColumnSpan="2"/>
diff --git a/CNC Controls/CNC Controls/Widget.cs b/CNC Controls/CNC Controls/Widget.cs
index e68a546..58e53d5 100644
--- a/CNC Controls/CNC Controls/Widget.cs	
+++ b/CNC Controls/CNC Controls/Widget.cs	
@@ -1,7 +1,7 @@
 /*
  * Widget.cs - part of CNC Controls library for Grbl
  *
- * v0.43 / 2023-03-30 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
  *
  */
 
@@ -49,8 +49,16 @@ namespace CNC.Controls
 
     public class WidgetViewModel : ViewModelBase
     {
-        string _tv;
-        double _nv;
+        private string _tv;
+        private double _nv;
+        private GrblViewModel _grblmodel;
+
+        public WidgetViewModel (GrblViewModel grblmodel)
+        {
+            _grblmodel = grblmodel;
+        }
+
+        public GrblViewModel Grbl { get { return _grblmodel; } private set { _grblmodel = value; OnPropertyChanged(); } }
 
         public double NumericValue
         {
@@ -206,26 +214,29 @@ public Widget(GrblConfigView View, WidgetProperties widget, StackPanel Canvas)
                     string[] rformat = widget.Format.Split(',');
                     for (int i = 0; i < rformat.Length; i++)
                     {
-                        wRadiobutton = new RadioButton
-                        {
-                            Name = string.Format("_radiobutton{0}", i),
-                            Content = rformat[i].Trim(),
-                            IsEnabled = false,
-                            Tag = i
-                        };
-                        grid = AddGrid(300);
-                        if (i == 0)
+                        if (rformat[i] != "N/A")
                         {
-                            labelGrid = grid;
-                            wRadiobutton.Margin = new Thickness(0, 6, 0, 0);
+                            wRadiobutton = new RadioButton
+                            {
+                                Name = string.Format("_radiobutton{0}", i),
+                                Content = rformat[i].Trim(),
+                                IsEnabled = false,
+                                Tag = i
+                            };
+                            grid = AddGrid(300);
+                            if (i == 0)
+                            {
+                                labelGrid = grid;
+                                wRadiobutton.Margin = new Thickness(0, 6, 0, 0);
+                            }
+                            else
+                                grid.Height = 20;
+                            grid.Children.Add(wRadiobutton);
+                            Grid.SetColumn(wRadiobutton, 1);
+                            wRadiobutton.Checked += wWidget_TextChanged;
+                            components.Children.Add(grid);
+                            wRadiobutton = null;
                         }
-                        else
-                            grid.Height = 20;
-                        grid.Children.Add(wRadiobutton);
-                        Grid.SetColumn(wRadiobutton, 1);
-                        wRadiobutton.Checked += wWidget_TextChanged;
-                        components.Children.Add(grid);
-                        wRadiobutton = null;
                     }
                     break;
 
diff --git a/CNC Controls/CNC Controls/app.config b/CNC Controls/CNC Controls/app.config
new file mode 100644
index 0000000..e160454
--- /dev/null
+++ b/CNC Controls/CNC Controls/app.config	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="CNC.Controls.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <CNC.Controls.Properties.Settings>
+            <setting name="ColorMode" serializeAs="String">
+                <value>Standard</value>
+            </setting>
+        </CNC.Controls.Properties.Settings>
+    </userSettings>
+</configuration>
\ No newline at end of file
diff --git a/CNC Core/CNC Core/GCodeEmulator.cs b/CNC Core/CNC Core/GCodeEmulator.cs
index 8750157..67d9900 100644
--- a/CNC Core/CNC Core/GCodeEmulator.cs	
+++ b/CNC Core/CNC Core/GCodeEmulator.cs	
@@ -1,13 +1,13 @@
 /*
  * GCodeEmulator.cs - part of CNC Controls library
  *
- * v0.40 / 2022-07-12 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-16 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2023, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -528,6 +528,8 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                 action.Start = action.End;
                             }
 
+                            double oldZ = action.End.Z;
+
                             isRelative = wasRelative;
                             setEndP(drill.Values, AxisFlags.XY);
                             isRelative = false;
@@ -547,7 +549,7 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                                 yield return action;
                                 action.Start = action.End;
 
-                                values[2] = r;
+                                values[2] = RetractOldZ ? oldZ : r;
                                 setEndP(values, AxisFlags.Z);
                                 action.IsRetract = true;
                                 action.Token = new GCLinearMotion(Commands.G0, token.LineNumber, values, AxisFlags.Z);
@@ -602,7 +604,13 @@ public IEnumerable<RunAction> Execute(List<GCodeToken> Tokens)
                         }
                         break;
 
-                    //M3, M4, M5: Spindle Control
+                    // G98, G99: Canned cycle return mode
+                    case Commands.G98: // Old Z
+                    case Commands.G99: // R value
+                        RetractOldZ = (token as GCodeToken).Command == Commands.G98;
+                        break;
+
+                        //M3, M4, M5: Spindle Control
                     case Commands.M3: // CW
                     case Commands.M4: // CCW
                     case Commands.M5: // Off
diff --git a/CNC Core/CNC Core/GCodeJob.cs b/CNC Core/CNC Core/GCodeJob.cs
index de73264..a79b918 100644
--- a/CNC Core/CNC Core/GCodeJob.cs	
+++ b/CNC Core/CNC Core/GCodeJob.cs	
@@ -1,7 +1,7 @@
 /*
  * GCodeJob.cs - part of CNC Controls library
  *
- * v0.42 / 2023-03-22 / Io Engineering (Terje Io)
+ * v0.44 / 2023-11-30 / Io Engineering (Terje Io)
  *
  */
 
@@ -200,14 +200,19 @@ public void AddBlock(string block, Action action)
 
                 foreach (var cmd in emu.Execute(Tokens))
                 {
-                    if(cmd.Token is GCArc)
-                        BoundingBox.AddBoundingBox((cmd.Token as GCArc).GetBoundingBox(emu.Plane, new double[]{ cmd.Start.X, cmd.Start.Y, cmd.Start.Z }, emu.DistanceMode == DistanceMode.Incremental));
+                    if (cmd.Token is GCArc)
+                        BoundingBox.AddBoundingBox((cmd.Token as GCArc).GetBoundingBox(emu.Plane, new double[] { cmd.Start.X, cmd.Start.Y, cmd.Start.Z }, emu.DistanceMode == DistanceMode.Incremental));
                     else if (cmd.Token is GCCubicSpline)
                         BoundingBox.AddBoundingBox((cmd.Token as GCCubicSpline).GetBoundingBox(emu.Plane, new double[] { cmd.Start.X, cmd.Start.Y, cmd.Start.Z }, emu.DistanceMode == DistanceMode.Incremental));
                     else if (cmd.Token is GCQuadraticSpline)
                         BoundingBox.AddBoundingBox((cmd.Token as GCQuadraticSpline).GetBoundingBox(emu.Plane, new double[] { cmd.Start.X, cmd.Start.Y, cmd.Start.Z }, emu.DistanceMode == DistanceMode.Incremental));
                     else if (cmd.Token is GCAxisCommand9)
-                        BoundingBox.AddPoint(cmd.End, (cmd.Token as GCAxisCommand9).AxisFlags);
+                    {
+                        if (GrblInfo.LatheUVWModeEnabled)
+                            BoundingBox.AddBoundingBox((cmd.Token as GCAxisCommand9).GetBoundingBox(emu.Plane, new double[] { cmd.Start.X, cmd.Start.Y, cmd.Start.Z }, emu.DistanceMode == DistanceMode.Incremental));
+                        else
+                            BoundingBox.AddPoint(cmd.End, (cmd.Token as GCAxisCommand9).AxisFlags);
+                    }
                 }
 
                 BoundingBox.Conclude();
diff --git a/CNC Core/CNC Core/GCodeParser.cs b/CNC Core/CNC Core/GCodeParser.cs
index 9d84abe..9d02adb 100644
--- a/CNC Core/CNC Core/GCodeParser.cs	
+++ b/CNC Core/CNC Core/GCodeParser.cs	
@@ -1,7 +1,7 @@
 /*
  * GCodeParser.cs - part of CNC Controls library
  *
- * v0.43 / 2023-05-31 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-16 / Io Engineering (Terje Io)
  *
  */
 
@@ -369,9 +369,9 @@ public GCodeParser()
             IsScaled = motionModeChanged = false;
             Decimals = 3;
             zorg = feedRate = 0d;
-            remapU2A = !GrblInfo.AxisLetters.Contains('A');
-            remapV2B = !GrblInfo.AxisLetters.Contains('B');
-            remapW2C = !GrblInfo.AxisLetters.Contains('C');
+            remapU2A = !GrblInfo.AxisLetters.Contains('A') && !GrblInfo.LatheUVWModeEnabled;
+            remapV2B = !GrblInfo.AxisLetters.Contains('B') && !GrblInfo.LatheUVWModeEnabled;
+            remapW2C = !GrblInfo.AxisLetters.Contains('C') && !GrblInfo.LatheUVWModeEnabled;
         }
 
         private bool VerifyIgnore(string code, CommandIgnoreState state)
@@ -1566,7 +1566,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                             break;
 
                     }
-                    if(cmdNonModal != Commands.G53)
+                    if(cmdNonModal != Commands.G53 && cmdNonModal != Commands.G4)
                         axisWords = AxisFlags.None;
                 }
             }
@@ -2176,7 +2176,10 @@ public class GCodeToken
     {
         public uint LineNumber { get; set; }
         public Commands Command { get; set; }
-
+        /*
+        public int ViewIndexStart { get; set; }
+        public int ViewIndexEnd { get; set; }
+        */
         public GCodeToken()
         {
             Command = Commands.Undefined;
@@ -2246,6 +2249,39 @@ public GCAxisCommand9(Commands command, uint lnr, double[] values, AxisFlags axi
         public double V { get { return Values[7]; } set { Values[7] = value; } }
         public double W { get { return Values[8]; } set { Values[8] = value; } }
 
+        // NOTE: only called when Lathe UVW mode is active
+        public GcodeBoundingBox GetBoundingBox(GCPlane plane, double[] start, bool isRelative = false)
+        {
+            GcodeBoundingBox bbox = new GcodeBoundingBox();
+
+            bbox.AddPoint(plane, start[0], start[1], start[2]);
+
+            var end = (double[])start.Clone();
+
+            if (AxisFlags.HasFlag(AxisFlags.X))
+                end[0] = isRelative ? start[0] + X : X;
+            if (AxisFlags.HasFlag(AxisFlags.Y))
+                end[1] = isRelative ? start[1] + Y : Y;
+            if (AxisFlags.HasFlag(AxisFlags.Z))
+                end[2] = isRelative ? start[2] + Z : Z;
+
+            if(GrblInfo.LatheUVWModeEnabled)
+            {
+                if(AxisFlags.HasFlag(AxisFlags.U))
+                    end[0] += U / 2d;
+                if (AxisFlags.HasFlag(AxisFlags.V))
+                    end[1] += V;
+                if (AxisFlags.HasFlag(AxisFlags.W))
+                    end[2] += W;
+            }
+
+            bbox.AddPoint(plane, end[0], end[1], end[2]);
+
+            bbox.Conclude();
+
+            return bbox;
+        }
+
         public new string ToString()
         {
             string s = base.ToString();
diff --git a/CNC Core/CNC Core/Grbl.cs b/CNC Core/CNC Core/Grbl.cs
index 0561417..348b45b 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.43 / 2023-07-05 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-27 / Io Engineering (Terje Io)
  *
  */
 
@@ -135,7 +135,10 @@ public const int
             Z_AXIS = 2,
             A_AXIS = 3,
             B_AXIS = 4,
-            C_AXIS = 5;
+            C_AXIS = 5,
+            U_AXIS = 6,
+            V_AXIS = 7,
+            W_AXIS = 8;
     }
 
     public enum CameraMoveMode
@@ -274,7 +277,8 @@ public enum grblHALSetting
         MicroStepsBase = 150,
         StallGuardBase = 200,
         // End per axis settings
-        ToolChangeMode = 341
+        ToolChangeMode = 341,
+        UnlockAfterEStop = 484
     }
 
     public enum StreamingState
@@ -359,7 +363,7 @@ public class Resources
         public static string Path { get; set; }
         public static string Locale { get; set; }
         public static string IniName { get; set; }
-        public static string IniFile { get { return Path + IniName; } }
+        public static string IniFile { get { return (System.IO.Path.IsPathRooted(IniName) ? "" : Path) + IniName; } }
         public static string DebugFile { get; set; } = string.Empty;
         public static string ConfigName { get; set; }
         public static bool IsLegacyController { get; set; } = false; // Set true if controller is legacy v1.1
@@ -895,7 +899,7 @@ public static class GrblInfo
     {
         #region Attributes
 
-        private static bool _probeProtect = false;
+        private static bool _probeProtect = false, _latheUVWMode = false;
         private static int _numAxes;
 
         static GrblInfo()
@@ -969,8 +973,25 @@ private set
         public static bool LatheModeEnabled
         {
             get { return GrblParserState.LatheMode != LatheMode.Disabled; }
-            set { if (value && GrblParserState.LatheMode == LatheMode.Disabled) { GrblParserState.LatheMode = LatheMode.Radius; } }
+            set
+            {
+                if (value && GrblParserState.LatheMode == LatheMode.Disabled) {
+                    GrblParserState.LatheMode = LatheMode.Radius;
+                }
+            }
+        }
+        public static bool LatheUVWModeEnabled
+        {
+            get { return _latheUVWMode && GrblParserState.LatheMode != LatheMode.Disabled; }
+            set
+            {
+                if ((_latheUVWMode = value))
+                    AxisLetters = AxisLetters.Substring(0, 6) + (_numAxes == 2 ? "U-W" : "UVW");
+                else
+                    AxisLetters = AxisLetters.Substring(0, 6) + "---";
+            }
         }
+        public static bool THCMode { get; internal set; } = false;
         public static ObservableCollection<string> SystemInfo { get; private set; } = new ObservableCollection<string>();
         public static bool IsLoaded { get; private set; }
 
@@ -1263,6 +1284,10 @@ private static void Process(string data)
                                     ManualToolChange = true;
                                     break;
 
+                                case "THC":
+                                    THCMode = true;
+                                    break;
+
                                 case "ATC":
                                     HasATC = true;
                                     break;
@@ -1307,6 +1332,10 @@ private static void Process(string data)
                                     LatheModeEnabled = true;
                                     break;
 
+                                case "LATHEUVW":
+                                    LatheUVWModeEnabled = true;
+                                    break;
+
                                 case "BD":
                                     OptionalSignals |= Signals.BlockDelete;
                                     break;
@@ -1336,6 +1365,17 @@ private static void Process(string data)
                         SystemInfo.Add(data);
                         break;
 
+                    case "SIGNALS":
+                        int signals = 0;
+                        foreach (char c in valuepair[1])
+                        {
+                            int i = GrblInfo.SignalLetters.IndexOf(c);
+                            if (i >= 0)
+                                signals |= (1 << i);
+                        }
+                        OptionalSignals = (Signals)signals;
+                        break;
+
                     case "CLUSTER":
                         LightBurnCluster = true;
                         SystemInfo.Add(data);
@@ -2080,14 +2120,13 @@ public static bool Get(GrblViewModel model)
                             int key;
                             string[] columns = line.Split(',');
 
-                            columns[0].Replace("\"", "");
-
+                            columns[0] = columns[0].Replace("\"", "");
                             if (columns.Length == 3 && int.TryParse(columns[0], out key))
                             {
                                 if (!noload && messages.TryGetValue(key, out msg))
                                     messages.Remove(key);
 
-                                messages.Add(key, columns[1] + ": " + columns[2]);
+                                messages.Add(key, columns[1].Trim('"') + ": " + columns[2].Trim('"'));
                             }
 
                             line = file.ReadLine();
diff --git a/CNC Core/CNC Core/GrblViewModel.cs b/CNC Core/CNC Core/GrblViewModel.cs
index 040d599..970f1ac 100644
--- a/CNC Core/CNC Core/GrblViewModel.cs	
+++ b/CNC Core/CNC Core/GrblViewModel.cs	
@@ -1,7 +1,7 @@
 /*
  * GrblViewModel.cs - part of CNC Controls library
  *
- * v0.43 / 2023-07-21 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-20 / Io Engineering (Terje Io)
  *
  */
 
@@ -50,13 +50,13 @@ namespace CNC.Core
     public class GrblViewModel : MeasureViewModel
     {
         private string _tool, _message, _WPos, _MPos, _wco, _wcs, _a, _fs, _ov, _pn, _sc, _sd, _fans, _d, _gc, _h, _thcv, _thcs;
-        private string _mdiCommand, _fileName;
+        private string _mdiCommand, _mdiText, _fileName;
         private string[] _rtState = new string[3];
         private bool has_wco = false, _hasFans = false;
         private bool _flood, _mist, _fan0, _toolChange, _reset, _isMPos, _isJobRunning, _isProbeSuccess, _pgmEnd, _isParserStateLive, _isTloRefSet;
         private bool _isCameraVisible = false, _responseLogVerbose = false, _isProbing = false, _autoReporting = false;
         private bool? _mpg;
-        private int _pwm, _line, _scrollpos, _blocks = 0, _executingBlock = 0, _auxinValue = -2, _autoReportInterval = 0;
+        private int _pwm, _line, _scrollpos, _blocks = 0, _startFromBlock = 0, _executingBlock = 0, _auxinValue = -2, _autoReportInterval = 0;
         private double _feedrate = 0d;
         private double _rpm = 0d, _rpmInput = 0d, _rpmDisplay = 0d, _jogStep = 0.1d, _tloReferenceOffset = double.NaN;
         private double _rpmActual = double.NaN;
@@ -82,6 +82,7 @@ public class GrblViewModel : MeasureViewModel
         public Action<Position> OnCameraProbe;
 
         public delegate void GrblResetHandler();
+        public event EventHandler OnCycleStart;
 
         public GrblViewModel()
         {
@@ -91,6 +92,7 @@ public GrblViewModel()
 
             Keyboard = new KeypressHandler(this);
             MDICommand = new ActionCommand<string>(ExecuteMDI);
+            StartFromBlock = new ActionCommand<int>(ExecuteStartFromBlock, canExecuteStartFromBlock);
 
             pollThread = new Thread(new ThreadStart(Poller.Run));
             pollThread.Start();
@@ -183,7 +185,7 @@ private void OptionalSignals_PropertyChanged(object sender, System.ComponentMode
 
         public void Clear()
         {
-            _fileName = _mdiCommand = string.Empty;
+            _fileName = _mdiCommand = _mdiText = string.Empty;
             _streamingState = StreamingState.NoFile;
             _isMPos = _reset = _isJobRunning = _isProbeSuccess = _pgmEnd = _isTloRefSet = false;
             _pb_avail = _rxb_avail = _rtState[0] = _rtState[1] = _rtState[2] = string.Empty;
@@ -213,6 +215,8 @@ public void Clear()
                 LatheMode = LatheMode.Radius;
 
             _thcv = _thcs = string.Empty;
+
+            IgnoreNextCycleStart = true;
         }
 
         public void ClearPosition()
@@ -229,11 +233,13 @@ public void ClearPosition()
         public void ClearSignals()
         {
             Set("Pn", string.Empty);
+            IgnoreNextCycleStart = true;
         }
 
         public PollGrbl Poller { get; } = new PollGrbl();
 
         public ICommand MDICommand { get; private set; }
+        public ICommand StartFromBlock { get; private set; }
 
         public void CameraProbed(Position position)
         {
@@ -316,6 +322,16 @@ public void ExecuteMacro(string macro)
             }
         }
 
+        private bool canExecuteStartFromBlock(int block)
+        {
+            return IsFileLoaded && StreamingState == StreamingState.Idle;
+        }
+        private void ExecuteStartFromBlock(int block)
+        {
+            if(canExecuteStartFromBlock(block))
+                StartFromBlockNum = block;
+        }
+
         public KeypressHandler Keyboard { get; private set; }
 
         public bool ResponseLogVerbose { get { return _responseLogVerbose; } set { _responseLogVerbose = value; OnPropertyChanged(); } }
@@ -327,6 +343,7 @@ public void ExecuteMacro(string macro)
         public bool IsGrblHAL { get { return GrblInfo.IsGrblHAL; } }
         public string Firmware { get; set; } = string.Empty;
         public bool SuspendProcessing { get; set; } = false;
+        public bool IgnoreNextCycleStart { get; set; } = false;
 
         public bool LimitTriggered {
             get {
@@ -346,6 +363,7 @@ public bool LimitTriggered {
 
         public ProgramLimits ProgramLimits { get; private set; } = new ProgramLimits();
         public string MDI { get { return _mdiCommand; } private set { _mdiCommand = value; OnPropertyChanged(); _mdiCommand = string.Empty; } }
+        public string MDIText { get { return _mdiText; } set { _mdiText = value; OnPropertyChanged(); } }
         public ObservableCollection<CoordinateSystem> CoordinateSystems { get { return GrblWorkParameters.CoordinateSystems; } }
         public ObservableCollection<Tool> Tools { get { return GrblWorkParameters.Tools; } }
         public ObservableCollection<string> SystemInfo { get { return GrblInfo.SystemInfo; } }
@@ -376,7 +394,17 @@ private set
         public bool IsSleepMode { get { return _grblState.State == GrblStates.Sleep; } }
         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 IsJobRunning {
+            get { return _isJobRunning; }
+            set {
+                if (_isJobRunning != value) {
+                    _isJobRunning = value;
+                    if (!_isJobRunning)
+                        JobTimer.Stop();
+                    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(); } }
@@ -420,6 +448,7 @@ public int Blocks
                 OnPropertyChanged();
             }
         }
+        public int StartFromBlockNum { get { return _startFromBlock; } private set { _startFromBlock = value; OnPropertyChanged(); _startFromBlock = 0;  } }
         public int BlockExecuting { get { return _executingBlock; } set { _executingBlock = value; OnPropertyChanged(); } }
         public bool IsPhysicalFileLoaded { get { return _fileName != string.Empty && (_fileName.StartsWith(@"\\") || _fileName[1] == ':'); } }
         public bool? IsMPGActive { get { return _mpg; } private set { if (_mpg != value) { _mpg = value; OnPropertyChanged(); } } }
@@ -435,7 +464,7 @@ private set
                 if (_latheMode != value)
                 {
                     _latheMode = value;
-                    if(_latheMode != LatheMode.Disabled && NumAxes == 3)
+                    if(_latheMode != LatheMode.Disabled && NumAxes == 2)
                     {
                         Position.Y = MachinePosition.Y = WorkPosition.Y = WorkPositionOffset.Y = 0d;
                     }
@@ -793,7 +822,7 @@ public bool ParseStatus(string data)
                     }
 
                     if (!data.Contains("|Pn:"))
-                        Set("Pn", "");
+                        Set("Pn", string.Empty);
 
                     if (pos_changed)
                     {
@@ -951,8 +980,17 @@ private bool Set(string parameter, string value)
                 case "Pn":
                     if (_pn != value)
                     {
+                        bool isCycleStart = value.Contains('S') && !_pn.Contains('S');
+
                         _pn = value;
 
+                        if (!IgnoreNextCycleStart)
+                        {
+                            if (isCycleStart && !_pn.Contains('H'))
+                                OnCycleStart?.Invoke(this, EventArgs.Empty);
+                        } else
+                            IgnoreNextCycleStart = false;
+
                         int s = 0;
                         foreach (char c in _pn)
                         {
@@ -1020,6 +1058,8 @@ private bool Set(string parameter, string value)
                         value = string.Format(LibStrings.FindResource("SdStreamComplete"), value.Split(',')[0]);
                         if (SDCardStatus != value)
                             Message = SDCardStatus = value;
+                        if (IsSDCardJob && !JobTimer.IsRunning && GrblState.State == GrblStates.Run)
+                            JobTimer.Start();
                     }
                     break;
 
@@ -1035,6 +1075,8 @@ private bool Set(string parameter, string value)
                 case "MPG":
                     GrblInfo.MPGMode = _grblState.MPG = value == "1";
                     IsMPGActive = _grblState.MPG;
+                    if(IsMPGActive == false && AutoReportInterval > 0)
+                        Comms.com.WriteByte(GrblConstants.CMD_AUTO_REPORTING_TOGGLE);
                     break;
 
                 case "H":
@@ -1184,7 +1226,11 @@ public void DataReceived(string data)
                             switch(GrblState.Substate)
                             {
                                 case 10:
-                                    _message = LibStrings.FindResource("ContClearResetUnlock");
+                                    if (GrblSettings.GetInteger(grblHALSetting.UnlockAfterEStop) != 0)
+                                    {
+                                        msg = "Emergecy stop";
+                                        _message = LibStrings.FindResource("ContClearResetUnlock");
+                                    }
                                     break;
                                 case 11:
                                     _message = LibStrings.FindResource("ContHome");
@@ -1198,8 +1244,12 @@ public void DataReceived(string data)
                         }
                         else
                             Message = msg;
-                        if (msg == "Pgm End")
-                            ProgramEnd = true;
+                            if (msg == "Pgm End")
+                            {
+                                ProgramEnd = true;
+                                if (IsSDCardJob)
+                                    IsJobRunning = false;
+                            }
                         break;
                 }
             }
@@ -1210,6 +1260,7 @@ public void DataReceived(string data)
                 _grblState.State = GrblStates.Unknown;
                 var msg = Message;
                 GrblReset = true;
+                IsJobRunning = false;
                 OnGrblReset?.Invoke(data);
                 Message = msg;
                 _reset = false;
diff --git a/CNC Core/CNC Core/Machine.cs b/CNC Core/CNC Core/Machine.cs
index 6475fd8..1634048 100644
--- a/CNC Core/CNC Core/Machine.cs	
+++ b/CNC Core/CNC Core/Machine.cs	
@@ -1,13 +1,13 @@
 /*
  * Machine.cs - part of CNC Core library
  *
- * v0.41 / 2022-09-23 / Io Engineering (Terje Io)
+ * v0.44 / 2023-11-30 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2022, Io Engineering (Terje Io)
+Copyright (c) 2020-2023, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -90,6 +90,7 @@ public void Reset()
             CoolantState = GrblParserState.CoolantState;
             SpindleState = GrblParserState.SpindleState;
             LatheMode = GrblParserState.LatheMode;
+            LatheUVWMode = GrblInfo.LatheUVWModeEnabled;
             DistanceMode = GrblParserState.DistanceMode;
             ToolLengthOffset = GrblParserState.ToolLengthOffset;
             FeedRateMode = GrblParserState.FeedRateMode;
@@ -153,6 +154,7 @@ public DistanceMode DistanceMode
         public GCPlane Plane { get; protected set; }
         public IJKMode IJKMode { get; protected set; }
         public LatheMode LatheMode { get; protected set; }
+        public bool LatheUVWMode { get; protected set; }
         public CoolantState CoolantState { get; protected set; }
         public SpindleState SpindleState { get; protected set; }
         public ToolLengthOffset ToolLengthOffset { get; protected set; }
@@ -214,7 +216,38 @@ public bool SetG92Offset(GCCoordinateSystem token)
 
         protected void setEndP(double[] values, AxisFlags axisFlags)
         {
-            machinePos.Set(values, axisFlags, isRelative);
+            if(LatheUVWMode)
+            {
+                double[] target = (double[])values.Clone();
+                if(axisFlags.HasFlag(AxisFlags.U)) {
+                    axisFlags |= AxisFlags.X;
+                    axisFlags &= ~AxisFlags.U;
+                    target[GrblConstants.U_AXIS] /= 2d;
+                    if (!isRelative)
+                        target[GrblConstants.X_AXIS] = machinePos.X + target[GrblConstants.U_AXIS];
+                    target[GrblConstants.U_AXIS] = 0d;
+                }
+                if (axisFlags.HasFlag(AxisFlags.V))
+                {
+                    axisFlags |= AxisFlags.Y;
+                    axisFlags &= ~AxisFlags.V;
+                    if (!isRelative)
+                        target[GrblConstants.Y_AXIS] = machinePos.Y + target[GrblConstants.V_AXIS];
+                    target[GrblConstants.V_AXIS] = 0d;
+                }
+                if (axisFlags.HasFlag(AxisFlags.W))
+                {
+                    axisFlags |= AxisFlags.Z;
+                    axisFlags &= ~AxisFlags.W;
+                    if(!isRelative)
+                        target[GrblConstants.Z_AXIS] = machinePos.Z + target[GrblConstants.W_AXIS];
+                    target[GrblConstants.W_AXIS] = 0d;
+                }
+
+                machinePos.Set(target, axisFlags, isRelative);
+            }
+            else
+                machinePos.Set(values, axisFlags, isRelative);
         }
 
         public CoordinateSystem GetCoordSystem(int id)
diff --git a/CNC Core/CNC Core/Properties/AssemblyInfo.cs b/CNC Core/CNC Core/Properties/AssemblyInfo.cs
index a16889b..c20a5a0 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.43.0")]
-[assembly: AssemblyFileVersion("2.0.43.0")]
+[assembly: AssemblyVersion("2.0.44.0")]
+[assembly: AssemblyFileVersion("2.0.44")]
diff --git a/CNC Core/CNC Core/SerialStream.cs b/CNC Core/CNC Core/SerialStream.cs
index a091e8f..56c0978 100644
--- a/CNC Core/CNC Core/SerialStream.cs	
+++ b/CNC Core/CNC Core/SerialStream.cs	
@@ -127,7 +127,7 @@ public SerialStream(string PortParams, int ResetDelay, Dispatcher dispatcher)
                         /* For resetting ESP32 */
                         serialPort.RtsEnable = true;
                         System.Threading.Thread.Sleep(5);
-                        serialPort.RtsEnable = false;
+  //                      serialPort.RtsEnable = false;
                         if(ResetDelay > 0)
                             System.Threading.Thread.Sleep(ResetDelay);
                         break;
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 5cb2db1..ad69bba 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
@@ -74,8 +74,8 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.W
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Offset hinzu
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Prüfe Sensor Status vor dem Start (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Ein Alarm wird erzeugt, wenn nicht aktiviert und ein Sensor angeschlossen ist"
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Werkzeug Längenversatz löschen
@@ -138,6 +138,7 @@ CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFind
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapCompleted:System.String.$Content,None,True,True,,"Antasten abgeschlossen: Z min: {0}, Z max: {1}."
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed:System.String.$Content,None,True,True,,Antasten fehlgeschlagen
 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:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 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.
@@ -155,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen, Grbl ist nicht im Leerlauf- oder Werkzeugwechselzustand."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen, Tastsignal vorhanden."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbingAtX0Y0:System.String.$Content,None,True,True,,Probing @X0Y0...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,Im GCode enthaltene Kreise in XZ- oder YZ-Ebene (G18/19) können nicht umgewandelt werden. Verwenden Sie &apos;Kreisbogen zu Linien&apos; wenn Sie dies wirklich brauchen.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Antasten abgeschlossen.
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 4eaeb21..804620d 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
@@ -191,10 +191,13 @@ CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Wi
 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:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y Achse:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z Achse:
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_copyToMDI:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Copy to MDI
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Löschen
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,D_ownload and run
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Zurückspringen aktivieren
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Ausführen
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,Nach einer Änderung der Einstellungen ist ein Neustart erforderlich!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Warnung! - Grbl hat Fehler bei der Jog-Abschaltung (beim Lösen der Taste).
@@ -273,6 +276,8 @@ 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:libstrings.baml,str_verifySendController:System.String.$Content,None,True,True,,Are you sure you want to send the selected blocks to the controller?
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifyStartFrom:System.String.$Content,None,True,True,,Are you sure the controller is in the correct state to start from block {0}?
 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
diff --git a/Locale/de-DE/translation.txt b/Locale/de-DE/translation.txt
index 1a23401..1749cf7 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.Probing.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
index 9b37487..3ffb354 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
@@ -74,8 +74,8 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.W
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Add offset
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Check probe status before start (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,An alarm will be generated by the controller if not enabled and the probe is asserted.
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear tool length offset
@@ -138,6 +138,7 @@ CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFind
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapCompleted:System.String.$Content,None,True,True,,"Probing completed: Z min: {0}, Z max: {1}."
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed:System.String.$Content,None,True,True,,Probing failed
 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:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 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.
@@ -155,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Probing failed, Grbl is not in idle or tool changing state."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Probing failed, probe signal is asserted."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbingAtX0Y0:System.String.$Content,None,True,True,,Probing @X0Y0...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,"GCode contains arcs in XZ or YZ plane (G18/19), can&apos;t apply transform. Use &apos;Arcs to Lines&apos; if you really need this."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Probing completed.
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 b80b799..a398ecd 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
@@ -191,10 +191,13 @@ CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Wi
 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:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z axis:
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_copyToMDI:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Copy to MDI
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,D_ownload and run
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Enable rewind
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Run
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,A restart is required after changing settings!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Warning! - Grbl has outstanding bug(s) in jog cancel (on key up).
@@ -273,6 +276,8 @@ 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:libstrings.baml,str_verifySendController:System.String.$Content,None,True,True,,Are you sure you want to send the selected blocks to the controller?
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifyStartFrom:System.String.$Content,None,True,True,,Are you sure the controller is in the correct state to start from block {0}?
 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
diff --git a/Locale/en-US/translation.txt b/Locale/en-US/translation.txt
index 4d2d673..b7f988f 100644
Binary files a/Locale/en-US/translation.txt and b/Locale/en-US/translation.txt differ
diff --git a/Locale/hu-HU/csv/CNC.Controls.Probing.resources.hu-HU.csv b/Locale/hu-HU/csv/CNC.Controls.Probing.resources.hu-HU.csv
index f8a61e4..c826e92 100644
--- a/Locale/hu-HU/csv/CNC.Controls.Probing.resources.hu-HU.csv
+++ b/Locale/hu-HU/csv/CNC.Controls.Probing.resources.hu-HU.csv
@@ -74,8 +74,8 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.W
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Eltolás hozzáadása
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Egy párbeszédpanel jelenik meg mindaddig, amíg a szondát érvényesítik vagy a párbeszédpanelt meg nem szakítják."
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,A szonda manuális ellenőrzése csatlakoztatva van
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Egy párbeszédpanel jelenik meg mindaddig, amíg a szondát érvényesítik vagy a párbeszédpanelt meg nem szakítják."
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Indítás előtt ellenőrizze a szonda állapotát (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"A vezérlő riasztást generál, ha nincs engedélyezve, és a szonda érvényesül."
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Tiszta szerszámhossz-eltolás
@@ -138,6 +138,7 @@ CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFind
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapCompleted:System.String.$Content,None,True,True,,"A szondázás befejeződött: Z min: {0}, Z max: {1}."
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed:System.String.$Content,None,True,True,,A szondázás nem sikerült
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,"A magasságtérkép vizsgálatának megkezdése előtt gyors mozgást hajtunk végre az X0Y0 felé.\\nGyőződjön meg arról, hogy a kezdeti Z-pozíció mentes a tapintás során esetlegesen felmerülő akadályoktól."
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Billentyűzet kocogás aktív
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Billentyűzet kocogás letiltva
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} szondapozíció szükséges.
@@ -155,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"A tapintás nem sikerült, a Grbl nincs tétlen vagy szerszámcsere állapotban."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"A szonda kapcsolatának ellenőrzése nem történt meg, mégis folytatja?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"A szondázás sikertelen, a szonda jele érvényesül."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbingAtX0Y0:System.String.$Content,None,True,True,,Probing @X0Y0...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,"A GCode XZ vagy YZ síkban íveket tartalmaz (G18/19), transzformáció nem alkalmazható. Használat &apos;Arcs to Lines&apos; ha tényleg szüksége van erre."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Nyomja meg újra a [Start] gombot a tapintás megkezdéséhez.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,A szondázás befejeződött.
diff --git a/Locale/hu-HU/csv/CNC.Controls.WPF.resources.hu-HU.csv b/Locale/hu-HU/csv/CNC.Controls.WPF.resources.hu-HU.csv
index a13060a..950f21f 100644
--- a/Locale/hu-HU/csv/CNC.Controls.WPF.resources.hu-HU.csv
+++ b/Locale/hu-HU/csv/CNC.Controls.WPF.resources.hu-HU.csv
@@ -191,10 +191,13 @@ CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Wi
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X tengely:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y tengely:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z tengely:
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_copyToMDI:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Copy to MDI
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Törlés
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,letöltés_ és futtatás
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Visszatekerés engedélyezése
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Fut
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,A beállítások módosítása után újraindítás szükséges!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Figyelem! - A Grbl-nek kiemelkedő hibái vannak a kocogó-megszakításnál (felfelé mutató gombnál).
@@ -273,6 +276,8 @@ 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,,Érvénytelen bevitel: a minimális megengedett érték {0}.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Érvénytelen bevitel: nem IP4-cím..
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Érvénytelen bevitel: a megengedett tartomány {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifySendController:System.String.$Content,None,True,True,,Are you sure you want to send the selected blocks to the controller?
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifyStartFrom:System.String.$Content,None,True,True,,Are you sure the controller is in the correct state to start from block {0}?
 CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Riasztási kódok
 CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Hibakódok
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Hálózat
diff --git a/Locale/hu-HU/translation.txt b/Locale/hu-HU/translation.txt
index 380d750..9a1f3a5 100644
Binary files a/Locale/hu-HU/translation.txt and b/Locale/hu-HU/translation.txt differ
diff --git a/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv b/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv
index f90ebdf..1966a0c 100644
--- a/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv
+++ b/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv
@@ -74,8 +74,8 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.W
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Adicionar deslocamento (offset)
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verifique o status da sonda antes de iniciar (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Um alarme será ativado pelo controle se não estiver ligado e a sonda verificada.
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Limpar o deslocamento do tamanho da ferramenta
@@ -138,6 +138,7 @@ CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFind
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapCompleted:System.String.$Content,None,True,True,,"Sondagem completa.: Z min: {0}, Z max: {1}."
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed:System.String.$Content,None,True,True,,Sondagem falhou
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,Um movimento rápido até X0Y0 será feito antes da sondagem de nível começar.\\nGaranta que a posição inicial Z não irá colidir com nenhum obstáculo que pode ser encontrado durante a sondagem.
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Jogging com teclado está ativo
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Jogging com teclado desativado
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} posições da sonda são necessárias.
@@ -155,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Sondagem falhou, Grbl não está em estado inativo ou de mudança de ferramenta."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Sondagem falhou, sinal de sonda está determinada."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbingAtX0Y0:System.String.$Content,None,True,True,,Probing @X0Y0...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,"GCode contem arcos nos planos XZ ou YZ (G18/19), não é possível aplicar tranformação. Use &apos;Arcos para Linhas&apos; se isto é realmente necessário."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Sondagem completa.
diff --git a/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv b/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv
index df388b9..becd0c7 100644
--- a/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv
+++ b/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv
@@ -191,10 +191,13 @@ CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Wi
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Eixo X:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Eixo Y:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z Eixo:
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_copyToMDI:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Copy to MDI
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Deletar
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,D_ownload e executar
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Habilitar retrocesso
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Executar
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,É necessário reiniciar o programa após mudar as configurações!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Aviso! - Grbl tem muitos bug ao cancelar o movimento (na tecla pra cima).
@@ -273,6 +276,8 @@ 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,,Entrada inválida: valor mínimo é {0}.
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Entrada inválida: não é um endereço IP4..
 CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Entrada inválida: intervalo de valores válido é {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifySendController:System.String.$Content,None,True,True,,Are you sure you want to send the selected blocks to the controller?
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifyStartFrom:System.String.$Content,None,True,True,,Are you sure the controller is in the correct state to start from block {0}?
 CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Cógios de alarme
 CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Códigos de erro
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Rede
diff --git a/Locale/pt-BR/translation.txt b/Locale/pt-BR/translation.txt
index ad1a8b3..6670e65 100644
Binary files a/Locale/pt-BR/translation.txt and b/Locale/pt-BR/translation.txt differ
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 1cae682..b69c200 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
@@ -74,8 +74,8 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.W
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Добавить смещение
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Проверять состояние датчика перед стартом (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Авария будет активирована контроллером, при срабатвании не активного датчика."
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отменить коррекцию длинны
@@ -138,6 +138,7 @@ CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFind
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapCompleted:System.String.$Content,None,True,True,,"Измерение завершено: Z min: {0}, Z max: {1}."
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed:System.String.$Content,None,True,True,,Ошибка измерения
 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:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 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} точек измерения.
@@ -155,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Ошибка измерения, Grbl не в режиме ГОТОВ или смена инструмента."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Ошибка измерения, неожиданный сигнал с датчика."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbingAtX0Y0:System.String.$Content,None,True,True,,Probing @X0Y0...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,GCode содержит дуги в плоскости XZ или YZ (G18/19). Трансляция невозможна. Используйте &apos;Arcs to Lines&apos; при необходимости.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted: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 8c67ebd..3389d46 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
@@ -191,10 +191,13 @@ CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Wi
 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:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось Y:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось Z:
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_copyToMDI:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Copy to MDI
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Удалить
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Загрузить и вып_олнить
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Разрешить возврат
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Пуск
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,После изменения настроек необходима перезагрузка!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Внемание! - Grbl имеет ошибки в прерывании перемещения (при отпускании клавиши).
@@ -273,6 +276,8 @@ 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:libstrings.baml,str_verifySendController:System.String.$Content,None,True,True,,Are you sure you want to send the selected blocks to the controller?
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifyStartFrom:System.String.$Content,None,True,True,,Are you sure the controller is in the correct state to start from block {0}?
 CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Коды аварий
 CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Коды ошибок
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Сеть
diff --git a/Locale/ru-RU/translation.txt b/Locale/ru-RU/translation.txt
index 2226ee2..6e0cfa8 100644
Binary files a/Locale/ru-RU/translation.txt and b/Locale/ru-RU/translation.txt differ
diff --git a/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv
index 9aa20eb..9b0c6c1 100644
--- a/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv
+++ b/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv
@@ -74,8 +74,8 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.W
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Додати зміщення
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Перевіряти стан щупа перед стартом (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Аварія будет активована контролером, у разі спрацювання не активованого щупа."
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Відміна корекцію довжини
@@ -138,6 +138,7 @@ CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFind
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapCompleted:System.String.$Content,None,True,True,,"Вимірювання завершено: Z min: {0}, Z max: {1}."
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed:System.String.$Content,None,True,True,,Помилка вимірювання
 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:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 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} точок вимірювання.
@@ -155,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Помилка вимірювання, Grbl не в режимі ГОТОВ або зміна інструмента."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Помилка вимірювання, неочікуваний сигнал від зонда."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbingAtX0Y0:System.String.$Content,None,True,True,,Probing @X0Y0...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,GCode містить дуги у площині XZ або YZ (G18/19). Трансляція неможлива. Використовуйте &apos;Arcs to Lines&apos; за потреби трансляції.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Вимірювання завершено.
diff --git a/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv
index 67bba64..b9a6802 100644
--- a/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv
+++ b/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv
@@ -191,10 +191,13 @@ CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Wi
 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:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Вісь Y:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Вісь Z:
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_copyToMDI:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Copy to MDI
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Видалити
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Завантажити з вик_онанням
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Дозволити повернення
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Пуск
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,Зміни налаштувань почнуть діяти після перезапуска програми!
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Увага! - Grbl має помилки при перериванні переміщення (при відпусканні клавиш).
@@ -273,6 +276,8 @@ 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:libstrings.baml,str_verifySendController:System.String.$Content,None,True,True,,Are you sure you want to send the selected blocks to the controller?
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifyStartFrom:System.String.$Content,None,True,True,,Are you sure the controller is in the correct state to start from block {0}?
 CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Коди аварій
 CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Коди помилок
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Мережа
diff --git a/Locale/uk-UA/translation.txt b/Locale/uk-UA/translation.txt
index ce317b3..aeae97c 100644
Binary files a/Locale/uk-UA/translation.txt and b/Locale/uk-UA/translation.txt differ
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 8712ba2..d09e74c 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
@@ -74,8 +74,8 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.W
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,添加偏移量
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Determine X0,Y0 for right angled workpiece"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_addOffset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Adds a probe point on the left edge.
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启动前检查探头状态 (G59.3)
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,如果未启用并且探针被触发，控制器将生成警报。
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除刀具长度偏移
@@ -138,6 +138,7 @@ CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFind
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapCompleted:System.String.$Content,None,True,True,,"Probing completed: Z min: {0}, Z max: {1}."
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed:System.String.$Content,None,True,True,,Probing failed
 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:heightmapcontrol.baml,str_heightMapPointOf:System.String.$Content,None,True,True,,Probing point {0} of {1}...
 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.
@@ -155,6 +156,7 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Probing failed, Grbl is not in idle or tool changing state."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Probing failed, probe signal is asserted."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbingAtX0Y0:System.String.$Content,None,True,True,,Probing @X0Y0...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,GCode 包含 XZ 或 YZ 平面 (G18/19) 中的弧，不能应用变换。 使用“弧线” 如果你真的需要这个。
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Probing completed.
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 9b8adfd..19c7a9c 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
@@ -191,10 +191,13 @@ CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Wi
 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:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z axis:
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_copyToMDI:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Copy to MDI
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,删除
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,下载并运行
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Enable rewind
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Run
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_sendToController:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Send to controller
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,mnu_startFromHere:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Start from here
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_viewAll:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,View all
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,更改设置后需要重新启动！
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Warning! - Grbl has outstanding bug(s) in jog cancel (on key up).
@@ -273,6 +276,8 @@ 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,,无效输入：允许的最小值为 {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:libstrings.baml,str_verifySendController:System.String.$Content,None,True,True,,Are you sure you want to send the selected blocks to the controller?
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_verifyStartFrom:System.String.$Content,None,True,True,,Are you sure the controller is in the correct state to start from block {0}?
 CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,报警代码
 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,,以太网
diff --git a/Locale/zh-CN/translation.txt b/Locale/zh-CN/translation.txt
index 87f39ba..31570c9 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 943caf5..69e993a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,18 @@
 ## ioSender changelog
 
+2023-12-30: [Release 2.0.44](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.44).
+
+* Fix for issue #350 - improved handling of cycle start message coming from the controller to avoid unwanted start of loaded program.
+* Fix for issue #350 - Z probe with unexpected result in Probing tab.
+* Fix for issue #339- removed unpublished files from builds.
+* Fix for issue #310 - run time not updaing when streaming from SD card.
+* Added right click meny in the program listing to start from a given block, execute a single block or send selected commands to the controller.
+* Added Plasma THC flyout to sidebar menu. Visible when the controller supports THC. Plus fix for issue #331.
+* Updated rendering of canned cycles to match latest grblHAL controller release.
+* Added support for UVW lathe mode.
+* Added handling of controller auto-reporting mode, will be disabled when the sender is connected.
+* A number of minor bug fixes and improvements.
+
 2023-07-30: [Release 2.0.43](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.43).
 
 * Added gcode parser support for flow control statements. Note that this does not yet include validation.
diff --git a/ioSender XL/ioSender XL/JobView.xaml.cs b/ioSender XL/ioSender XL/JobView.xaml.cs
index 39d747d..13b80e4 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.43 / 2023-07-09 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,10 +56,11 @@ namespace GCode_Sender
     public partial class JobView : UserControl, ICNCView
     {
         private bool? initOK = null;
-        private bool isBooted = false, isCameraClaimed = false;
+        private bool isBooted = false, isCameraClaimed = false, holdActivated = false;
         private GrblViewModel model;
         private IInputElement focusedControl = null;
         private Controller Controller = null;
+        private SidebarItem thcFlyout = null;
 
         public JobView()
         {
@@ -89,6 +90,13 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                     {
                         if (isBooted && initOK == false && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
                             Dispatcher.BeginInvoke(new System.Action(() => InitSystem()), DispatcherPriority.ApplicationIdle);
+                        else if ((sender as GrblViewModel).GrblState.State == GrblStates.Hold && !MainWindow.ui.JobRunning)
+                        {
+                            holdActivated = true;
+                            MainWindow.ui.JobRunning = true;
+                        }
+                        else if ((sender as GrblViewModel).GrblState.State != GrblStates.Hold && holdActivated)
+                            MainWindow.ui.JobRunning = holdActivated = false;
                     }
                     break;
 
@@ -234,6 +242,8 @@ public void Activate(bool activate, ViewType chgMode)
 
                 if (!GrblInfo.IsGrblHAL)
                     model.Keyboard.IsContinuousJoggingEnabled = AppConfig.Settings.Jog.KeyboardEnable;
+
+                model.IgnoreNextCycleStart = true;
             }
             else if(ViewType != ViewType.Shutdown)
             {
@@ -430,6 +440,9 @@ private bool InitSystem()
             else
                 MainWindow.ShowView(false, ViewType.TrinamicTuner);
 
+            if (GrblInfo.THCMode && thcFlyout == null)
+                MainWindow.UIViewModel.SidebarItems.Add(thcFlyout = new SidebarItem(MainWindow.ui.thcControl));
+
             return true;
         }
 
@@ -490,7 +503,7 @@ protected override void OnPreviewKeyUp(KeyEventArgs e)
 
         protected bool ProcessKeyPreview(KeyEventArgs e)
         {
-            return model.Keyboard.ProcessKeypress(e, !(mdiControl.IsFocused || DRO.IsFocused || spindleControl.IsFocused || workParametersControl.IsFocused));
+            return model.Keyboard.ProcessKeypress(e, !(mdiControl.IsFocused || DRO.IsFocused || spindleControl.IsFocused || workParametersControl.IsFocused), this);
         }
 
 #endregion
diff --git a/ioSender XL/ioSender XL/MainWindow.xaml.cs b/ioSender XL/ioSender XL/MainWindow.xaml.cs
index ee5432c..b365c34 100644
--- a/ioSender XL/ioSender XL/MainWindow.xaml.cs	
+++ b/ioSender XL/ioSender XL/MainWindow.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.41 / 2022-09-14 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2022, Io Engineering (Terje Io)
+Copyright (c) 2019-2023, 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.43";
+        private const string version = "2.0.44";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
diff --git a/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs b/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs
index c2e4518..f44f6e6 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.43.0")]
-[assembly: AssemblyFileVersion("2.0.43.0")]
+[assembly: AssemblyVersion("2.0.44.0")]
+[assembly: AssemblyFileVersion("2.0.44.0")]
diff --git a/ioSender/ioSender/JobView.xaml.cs b/ioSender/ioSender/JobView.xaml.cs
index 4a76e21..04fb002 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.43 / 2023-07-09 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,10 +56,11 @@ namespace GCode_Sender
     public partial class JobView : UserControl, ICNCView
     {
         private bool? initOK = null;
-        private bool isBooted = false, isCameraClaimed = false;
+        private bool isBooted = false, isCameraClaimed = false, holdActivated = false;
         private GrblViewModel model;
         private IInputElement focusedControl = null;
         private Controller Controller = null;
+        private SidebarItem thcFlyout = null;
 
         public JobView()
         {
@@ -88,9 +89,14 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                     if (Controller != null && !Controller.ResetPending)
                     {
                         if (initOK == false && isBooted && (sender as GrblViewModel).GrblState.State != GrblStates.Alarm)
-                        {
                             Dispatcher.BeginInvoke(new System.Action(() => InitSystem()), DispatcherPriority.ApplicationIdle);
+                        else if ((sender as GrblViewModel).GrblState.State == GrblStates.Hold && !MainWindow.ui.JobRunning)
+                        {
+                            holdActivated = true;
+                            MainWindow.ui.JobRunning = true;
                         }
+                        else if ((sender as GrblViewModel).GrblState.State != GrblStates.Hold && holdActivated)                   
+                            MainWindow.ui.JobRunning = holdActivated = false;
                     }
                     break;
 
@@ -114,9 +120,9 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                     break;
 
                 case nameof(GrblViewModel.Tool):
-                if (GrblInfo.ManualToolChange && (sender as GrblViewModel).Tool != GrblConstants.NO_TOOL)
-                    GrblWorkParameters.RemoveNoTool();
-                break;
+                    if (GrblInfo.ManualToolChange && (sender as GrblViewModel).Tool != GrblConstants.NO_TOOL)
+                        GrblWorkParameters.RemoveNoTool();
+                    break;
 
                 case nameof(GrblViewModel.GrblReset):
                     if ((sender as GrblViewModel).IsReady)
@@ -234,6 +240,8 @@ public void Activate(bool activate, ViewType chgMode)
 
                 if (!GrblInfo.IsGrblHAL)
                     model.Keyboard.IsContinuousJoggingEnabled = AppConfig.Settings.Jog.KeyboardEnable;
+
+                model.IgnoreNextCycleStart = true;
             }
             else if(ViewType != ViewType.Shutdown)
             {
@@ -421,6 +429,9 @@ bool InitSystem()
             else
                 MainWindow.ShowView(false, ViewType.TrinamicTuner);
 
+            if(GrblInfo.THCMode && thcFlyout == null)
+                MainWindow.UIViewModel.SidebarItems.Add(thcFlyout = new SidebarItem(MainWindow.ui.thcControl));
+
             return true;
         }
 
@@ -481,7 +492,12 @@ protected override void OnPreviewKeyUp(KeyEventArgs e)
 
         protected bool ProcessKeyPreview(KeyEventArgs e)
         {
-            return model.Keyboard.ProcessKeypress(e, !(mdiControl.IsFocused || DRO.IsFocused || spindleControl.IsFocused || workParametersControl.IsFocused), this);
+            bool claimed = model.Keyboard.ProcessKeypress(e, !(mdiControl.IsFocused || DRO.IsFocused || spindleControl.IsFocused || workParametersControl.IsFocused), this);
+/*
+            if (model.ResponseLogVerbose)
+                model.ResponseLog.Add(e.Key.ToString() + " " + e.SystemKey.ToString() + " " + Keyboard.Modifiers.ToString() + " " + claimed.ToString());
+*/
+            return claimed;
         }
 
 #endregion
diff --git a/ioSender/ioSender/MainWindow.xaml b/ioSender/ioSender/MainWindow.xaml
index e7d3fae..1c2ace8 100644
--- a/ioSender/ioSender/MainWindow.xaml
+++ b/ioSender/ioSender/MainWindow.xaml
@@ -11,7 +11,7 @@
         xmlns:local="clr-namespace:GCode_Sender"
         mc:Ignorable="d"
         Background="#FFE5E5E5"
-        Title="Sender ({0})" Height="640" Width="925" MinHeight="700" MinWidth="1020"
+        Title="Sender ({0})" Height="640" Width="925" MinHeight="685" MinWidth="1020"
         Loaded="Window_Load"
         SizeChanged="Window_SizeChanged"
         Closing="Window_Closing"
diff --git a/ioSender/ioSender/MainWindow.xaml.cs b/ioSender/ioSender/MainWindow.xaml.cs
index 231afb4..955471e 100644
--- a/ioSender/ioSender/MainWindow.xaml.cs
+++ b/ioSender/ioSender/MainWindow.xaml.cs
@@ -1,7 +1,7 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.42 / 2023-03-21 / Io Engineering (Terje Io)
+ * v0.44 / 2023-12-30 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.43";
+        private const string version = "2.0.44";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
@@ -164,7 +164,7 @@ private void Window_Load(object sender, EventArgs e)
             UIViewModel.SidebarItems.Add(new SidebarItem(gotoControl));
             UIViewModel.SidebarItems.Add(new SidebarItem(outlineFlyout));
             UIViewModel.SidebarItems.Add(new SidebarItem(mposFlyout));
-//          UIViewModel.SidebarItems.Add(new SidebarItem(thcControl));
+//            UIViewModel.SidebarItems.Add(new SidebarItem(thcControl));
 
             UIViewModel.CurrentView = getView((TabItem)tabMode.Items[tabMode.SelectedIndex = 0]);
             System.Threading.Thread.Sleep(50);
diff --git a/ioSender/ioSender/Properties/AssemblyInfo.cs b/ioSender/ioSender/Properties/AssemblyInfo.cs
index c2e4518..f44f6e6 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.43.0")]
-[assembly: AssemblyFileVersion("2.0.43.0")]
+[assembly: AssemblyVersion("2.0.44.0")]
+[assembly: AssemblyFileVersion("2.0.44.0")]
diff --git a/ioSender/ioSender/ioSender.csproj b/ioSender/ioSender/ioSender.csproj
index f569643..de19ac3 100644
--- a/ioSender/ioSender/ioSender.csproj
+++ b/ioSender/ioSender/ioSender.csproj
@@ -77,11 +77,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="..\..\CNC Controls\CNC Controls\Themes\ThemeSelector.xaml">
-      <Link>ThemeSelector.xaml</Link>
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="JobView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/readme.md b/readme.md
index 58a8bb3..3e95ebb 100644
--- a/readme.md
+++ b/readme.md
@@ -10,11 +10,7 @@ Please check out the [Wiki](https://github.com/terjeio/Grbl-GCode-Sender/wiki) f
 
 ---
 
-Latest release is 2.0.43, see the [changelog](changelog.md) for details. 
-
----
-
-A complete rewrite of my [Grbl CNC Controls library](https://github.com/terjeio/Grbl_CNC_Controls) including a sender application on top of these. It supports new features in [grblHAL](https://github.com/grblHAL) such as manual tool change and [external MPG](https://github.com/terjeio/GRBL_MPG_DRO_BoosterPack) control - and is one of the reasons for writing this library and app. Other senders I have tried does not play nice when a MPG pendant is connected directly to the Grbl processor card...
+Latest release is 2.0.44, see the [changelog](changelog.md) for details. 
 
 ---
 
@@ -60,4 +56,4 @@ Lathe mode.
 Conversational programming for Lathe Mode. Threading requires [grblHAL](https://github.com/grblHAL) controller with driver that has spindle sync support.
 
 ---
-2023-07-30
+2023-12-30