From 19fdd92047b4cf80b9621a803d965739e89ec2a6 Mon Sep 17 00:00:00 2001
From: Terje Io <terjeio@online.no>
Date: Tue, 26 Oct 2021 12:49:34 +0200
Subject: [PATCH] Release 2.0.35

See changelog for details
---
 .../CNC AppLaunch/Properties/AssemblyInfo.cs  |   2 +-
 .../CNC Controls Camera.csproj                |   2 +
 .../CNC Controls Camera/CameraControl.xaml    |   2 +-
 .../CNC Controls Camera/ConfigControl.xaml    |  10 +-
 .../Properties/AssemblyInfo.cs                |   7 +-
 .../CNC Controls Dragknife.csproj             |   3 +
 CNC Controls Dragknife/DragKnifeDialog.xaml   |  23 +-
 .../Properties/AssemblyInfo.cs                |  11 +-
 .../CNC Controls Lathe.csproj                 |   1 +
 .../Properties/AssemblyInfo.cs                |   6 +-
 .../CNC Controls Probing.csproj               |  10 +
 .../CenterFinderControl.xaml                  |  28 +--
 .../CenterFinderControl.xaml.cs               |   4 +-
 .../CNC Controls Probing/ConfigControl.xaml   |  15 ++
 .../ConfigControl.xaml.cs                     |  54 +++++
 .../CNC Controls Probing/CsSelectControl.xaml |  10 +-
 .../EdgeFinderControl.xaml                    |  14 +-
 .../EdgeFinderIntControl.xaml                 |  14 +-
 .../HeightMapControl.xaml                     |  42 ++--
 .../CNC Controls Probing/ProbingView.xaml     |  58 ++---
 .../CNC Controls Probing/ProbingView.xaml.cs  |   2 +
 .../CNC Controls Probing/ProbingViewModel.cs  |   4 +-
 .../CNC Controls Probing/Program.cs           | 208 ++++++++++++------
 .../Properties/AssemblyInfo.cs                |  12 +-
 .../CNC Controls Probing/RotationControl.xaml |  24 +-
 .../ToolLengthControl.xaml                    |  20 +-
 .../ToolLengthControl.xaml.cs                 |   2 +-
 CNC Controls/CNC Controls/About.xaml          |   6 +-
 CNC Controls/CNC Controls/AppConfig.cs        |  10 +
 CNC Controls/CNC Controls/AppConfigView.xaml  |   2 +-
 .../CNC Controls/BasicConfigControl.xaml      |  18 +-
 CNC Controls/CNC Controls/CNC Controls.csproj |   2 +
 CNC Controls/CNC Controls/ConsoleControl.xaml |   8 +-
 CNC Controls/CNC Controls/ConsoleWindow.xaml  |   1 +
 CNC Controls/CNC Controls/CoolantControl.xaml |   8 +-
 .../CNC Controls/CoordValueSetControl.xaml    |   2 +-
 CNC Controls/CNC Controls/DROControl.xaml     |   4 +-
 CNC Controls/CNC Controls/FeedControl.xaml    |   5 +-
 .../CNC Controls/GCodeListControl.xaml        |   4 +-
 .../CNC Controls/GCodeRotateDialog.xaml       |   8 +-
 CNC Controls/CNC Controls/GotoControl.xaml    |   4 +-
 CNC Controls/CNC Controls/GrblConfigView.xaml |   8 +-
 CNC Controls/CNC Controls/JobControl.xaml     |   8 +-
 CNC Controls/CNC Controls/JobControl.xaml.cs  |  41 +++-
 .../CNC Controls/JogConfigControl.xaml        |  16 +-
 CNC Controls/CNC Controls/JogControl.xaml     |   4 +-
 .../CNC Controls/JogUiConfigControl.xaml      |  18 +-
 CNC Controls/CNC Controls/KeypressHandler.cs  |  95 +++++---
 CNC Controls/CNC Controls/LimitsControl.xaml  |   2 +-
 CNC Controls/CNC Controls/MDIControl.xaml     |   4 +-
 CNC Controls/CNC Controls/MPGPending.xaml     |   2 +-
 .../CNC Controls/MachinePositionFlyout.xaml   |   2 +-
 CNC Controls/CNC Controls/MacroEditor.xaml    |   7 +-
 .../CNC Controls/MacroExecuteControl.xaml     |   4 +-
 CNC Controls/CNC Controls/OffsetView.xaml     |  22 +-
 CNC Controls/CNC Controls/OutlineFlyout.xaml  |   8 +-
 .../CNC Controls/OverrideControl.xaml         |   2 +-
 CNC Controls/CNC Controls/PortDialog.xaml     |  29 +--
 CNC Controls/CNC Controls/PortDialog.xaml.cs  |   8 +-
 .../CNC Controls/Properties/AssemblyInfo.cs   |   5 +-
 CNC Controls/CNC Controls/SDCardView.xaml     |  14 +-
 CNC Controls/CNC Controls/SignalsControl.xaml |   4 +-
 CNC Controls/CNC Controls/SpindleControl.xaml |  10 +-
 CNC Controls/CNC Controls/StatusControl.xaml  |  10 +-
 .../CNC Controls/StripGCodeConfigControl.xaml |   2 +-
 CNC Controls/CNC Controls/ToolView.xaml       |  20 +-
 CNC Controls/CNC Controls/TrinamicView.xaml   |  19 +-
 .../CNC Controls/WorkParametersControl.xaml   |  10 +-
 CNC Converters/CNC Converters.csproj          |   3 +
 CNC Converters/JobParametersDialog.xaml       |  24 +-
 CNC Converters/Properties/AssemblyInfo.cs     |  11 +-
 CNC Core/CNC Core/CNC Core.csproj             |   1 +
 CNC Core/CNC Core/GCodeJob.cs                 |  26 ++-
 CNC Core/CNC Core/GCodeParser.cs              |   2 +-
 CNC Core/CNC Core/Grbl.cs                     |  30 ++-
 CNC Core/CNC Core/GrblViewModel.cs            |  22 +-
 CNC Core/CNC Core/Properties/AssemblyInfo.cs  |   9 +-
 CNC Core/CNC Core/SerialStream.cs             |  46 +++-
 .../CNC GCodeViewer/CNC GCodeViewer.csproj    |   3 +
 .../CNC GCodeViewer/ConfigControl.xaml        |  34 +--
 .../Properties/AssemblyInfo.cs                |   8 +-
 .../CNC GCodeViewer/RenderControl.xaml        |   2 +-
 .../CNC GCodeViewer/Renderer.xaml.cs          |   4 +-
 CNC GCodeViewer/CNC GCodeViewer/Viewer.xaml   |   2 +-
 GCode Sender/GCode Sender/App.xaml.cs         |  37 +++-
 GCode Sender/GCode Sender/GCode Sender.csproj |   2 +
 GCode Sender/GCode Sender/MainWindow.xaml     |  58 ++---
 GCode Sender/GCode Sender/MainWindow.xaml.cs  |   6 +-
 .../GCode Sender/Properties/AssemblyInfo.cs   |   5 +-
 .../Grbl Config App/MainWindow.xaml           |   6 +-
 .../Grbl Config App/MainWindow.xaml.cs        |  57 ++++-
 .../Properties/AssemblyInfo.cs                |   4 +-
 Locale/ReadMe.md                              |   4 +
 Locale/en-US/ReadMe.md                        |   5 +
 .../CNC.Controls.Camera.resources.en-US.csv   |   4 +
 ...CNC.Controls.DragKnife.resources.en-US.csv |   6 +
 .../CNC.Controls.Probing.resources.en-US.csv  |  85 +++++++
 .../CNC.Controls.Viewer.resources.en-US.csv   |  17 ++
 .../csv/CNC.Controls.WPF.resources.en-US.csv  | 140 ++++++++++++
 .../csv/CNC.Converters.resources.en-US.csv    |   6 +
 Locale/en-US/csv/ioSender.resources.en-US.csv |  27 +++
 Locale/en-US/translation.txt                  | Bin 0 -> 41302 bytes
 .../CNC.Controls.Camera.resources.zh-CN.csv   |   4 +
 ...CNC.Controls.DragKnife.resources.zh-CN.csv |   6 +
 .../CNC.Controls.Probing.resources.zh-CN.csv  |  85 +++++++
 .../CNC.Controls.Viewer.resources.zh-CN.csv   |  17 ++
 .../csv/CNC.Controls.WPF.resources.zh-CN.csv  | 140 ++++++++++++
 .../csv/CNC.Converters.resources.zh-CN.csv    |   6 +
 Locale/zh-CN/csv/ioSender.resources.zh-CN.csv |  27 +++
 Locale/zh-CN/translation.txt                  | Bin 0 -> 41048 bytes
 changelog.md                                  |  20 ++
 readme.md                                     |   8 +-
 112 files changed, 1532 insertions(+), 521 deletions(-)
 create mode 100644 CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml
 create mode 100644 CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml.cs
 create mode 100644 Locale/ReadMe.md
 create mode 100644 Locale/en-US/ReadMe.md
 create mode 100644 Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv
 create mode 100644 Locale/en-US/csv/CNC.Controls.DragKnife.resources.en-US.csv
 create mode 100644 Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
 create mode 100644 Locale/en-US/csv/CNC.Controls.Viewer.resources.en-US.csv
 create mode 100644 Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
 create mode 100644 Locale/en-US/csv/CNC.Converters.resources.en-US.csv
 create mode 100644 Locale/en-US/csv/ioSender.resources.en-US.csv
 create mode 100644 Locale/en-US/translation.txt
 create mode 100644 Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
 create mode 100644 Locale/zh-CN/csv/CNC.Controls.DragKnife.resources.zh-CN.csv
 create mode 100644 Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
 create mode 100644 Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv
 create mode 100644 Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
 create mode 100644 Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv
 create mode 100644 Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
 create mode 100644 Locale/zh-CN/translation.txt

diff --git a/CNC AppLaunch/CNC AppLaunch/Properties/AssemblyInfo.cs b/CNC AppLaunch/CNC AppLaunch/Properties/AssemblyInfo.cs
index 25d8d8d..8fa1003 100644
--- a/CNC AppLaunch/CNC AppLaunch/Properties/AssemblyInfo.cs	
+++ b/CNC AppLaunch/CNC AppLaunch/Properties/AssemblyInfo.cs	
@@ -9,7 +9,7 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
-[assembly: AssemblyProduct("CNC AppLaunch")]
+[assembly: AssemblyProduct("ioSender")]
 [assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/CNC Controls Camera/CNC Controls Camera/CNC Controls Camera.csproj b/CNC Controls Camera/CNC Controls Camera/CNC Controls Camera.csproj
index 538543d..cdca9ea 100644
--- a/CNC Controls Camera/CNC Controls Camera/CNC Controls Camera.csproj	
+++ b/CNC Controls Camera/CNC Controls Camera/CNC Controls Camera.csproj	
@@ -32,7 +32,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
+    <UICulture>en-US</UICulture>
     <ApplicationIcon>App.ico</ApplicationIcon>
+    <Localizable>False</Localizable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AForge">
diff --git a/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml b/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml
index 1338d29..2e65930 100644
--- a/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml	
+++ b/CNC Controls Camera/CNC Controls Camera/CameraControl.xaml	
@@ -18,7 +18,7 @@
         </Grid.ColumnDefinitions>
         <Image Width="400" Height="300" HorizontalAlignment="Left" Name="frameHolder" VerticalAlignment="Top" Margin="10,10,0,0"/>
         <Slider x:Name="sldcircle" Orientation="Vertical" HorizontalAlignment="Left" Value="{Binding Path=GuideScale, Mode=TwoWay}" Margin="28,30,0,0" VerticalAlignment="Top" Height="118" Width="30" Grid.Column="1" ValueChanged="sldcircle_ValueChanged" Maximum="100" Minimum="5" LargeChange="10" SmallChange="1"/>
-        <Button x:Name="btnMove" Content="Move offset" IsEnabled="{Binding Path=IsMoveEnabled}" HorizontalAlignment="Left" Margin="10,4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Click="btnMove_Click" Height="22"/>
+        <Button x:Uid="btn_moveOffset" x:Name="btnMove" Content="Move offset" IsEnabled="{Binding Path=IsMoveEnabled}" HorizontalAlignment="Left" Margin="10,4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Click="btnMove_Click" Height="22"/>
         <ComboBox x:Name="cbxCamera" ItemsSource="{Binding Path=Cameras}" DisplayMemberPath="Name" SelectedValuePath="Camera" HorizontalAlignment="Left" Margin="100,4,0,0" Grid.Row="1" VerticalAlignment="Top" Width="300" SelectionChanged="cbxCamera_SelectionChanged" Height="22"/>
     </Grid>
 </UserControl>
diff --git a/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml b/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml
index 02f430d..fa754c4 100644
--- a/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml	
+++ b/CNC Controls Camera/CNC Controls Camera/ConfigControl.xaml	
@@ -7,19 +7,19 @@
              xmlns:Controls="clr-namespace:CNC.Controls;assembly=CNC.Controls.WPF" x:Class="CNC.Controls.Camera.ConfigControl"
              mc:Ignorable="d" 
              d:DesignHeight="140" d:DesignWidth="250">
-    <GroupBox x:Name="grpCamera" Header="Camera" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
+    <GroupBox x:Uid="grp_camera" x:Name="grpCamera" Header="Camera" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
         <StackPanel HorizontalAlignment="Left" Height="115" Margin="0,3,0,0" VerticalAlignment="Top" Width="235">
-            <Controls:NumericField x:Name="xOffset" Label="X offset:" ColonAt="90" Value="{Binding Path=Camera.XOffset, Mode=TwoWay}"/>
-            <Controls:NumericField x:Name="yOffset" Label="Y offset:" ColonAt="90" Value="{Binding Path=Camera.YOffset, Mode=TwoWay}"/>
+            <Controls:NumericField x:Uid="fld_xOffset" x:Name="xOffset" Label="X offset:" ColonAt="90" Value="{Binding Path=Camera.XOffset, Mode=TwoWay}"/>
+            <Controls:NumericField x:Uid="fld_yOffset" x:Name="yOffset" Label="Y offset:" ColonAt="90" Value="{Binding Path=Camera.YOffset, Mode=TwoWay}"/>
             <Grid Height="29">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="90"/>
                     <ColumnDefinition Width="100*"/>
                 </Grid.ColumnDefinitions>
-                <Label Content="Offset motion:" HorizontalAlignment="Right" Margin="0,0,0,0" VerticalAlignment="Top"/>
+                <Label x:Uid="lbl_offsetMotion" Content="Offset motion:" HorizontalAlignment="Right" Margin="0,0,0,0" VerticalAlignment="Top"/>
                 <ComboBox x:Name="comboBox" ItemsSource="{Binding Path=Camera.MoveModes}" SelectedItem="{Binding Path=Camera.MoveMode, Mode=TwoWay}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top" Width="80"/>
             </Grid>
-            <Button x:Name="getPosition" Content="Get current position" Width="150" Margin="0,4,0,0" Click="getPosition_Click"/>
+            <Button x:Uid="btn_getPosition" x:Name="getPosition" Content="Get current position" Width="150" Margin="0,4,0,0" Click="getPosition_Click"/>
         </StackPanel>
     </GroupBox>
 </UserControl>
diff --git a/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs b/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs
index 15eb341..83bc810 100644
--- a/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Camera/CNC Controls Camera/Properties/AssemblyInfo.cs	
@@ -11,10 +11,11 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
-[assembly: AssemblyProduct("CNC Camera Control")]
+[assembly: AssemblyProduct("ioSender")]
 [assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -51,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.33.0")]
-[assembly: AssemblyFileVersion("2.0.33.0")]
+[assembly: AssemblyVersion("2.0.35.0")]
+[assembly: AssemblyFileVersion("2.0.35.0")]
diff --git a/CNC Controls Dragknife/CNC Controls Dragknife.csproj b/CNC Controls Dragknife/CNC Controls Dragknife.csproj
index 46dad4a..e863480 100644
--- a/CNC Controls Dragknife/CNC Controls Dragknife.csproj	
+++ b/CNC Controls Dragknife/CNC Controls Dragknife.csproj	
@@ -31,6 +31,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <UICulture>en-US</UICulture>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="RP.Math.Vector3">
       <HintPath>..\Vector-master\RP.Math.Vector3\bin\Release\RP.Math.Vector3.dll</HintPath>
diff --git a/CNC Controls Dragknife/DragKnifeDialog.xaml b/CNC Controls Dragknife/DragKnifeDialog.xaml
index 4a40359..bc48bb0 100644
--- a/CNC Controls Dragknife/DragKnifeDialog.xaml	
+++ b/CNC Controls Dragknife/DragKnifeDialog.xaml	
@@ -8,27 +8,28 @@
              mc:Ignorable="d" 
              d:DesignHeight="320" d:DesignWidth="300"
              SizeToContent="WidthAndHeight" ResizeMode="NoResize"
+             x:Uid="dlg_dragKnife"
              Title="Drag knife parameters" Loaded="Window_Loaded" Icon="App.ico">
     <Grid Background="#FFE5E5E5">
         <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Margin="5,5">
-            <GroupBox Header="Knife" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
+            <GroupBox x:Uid="grp_knife" Header="Knife" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
                 <StackPanel>
-                    <Controls:NumericField Label="Tip offset:" ColonAt="90" Unit="mm" Format="#0.###" Value="{Binding Path=KnifeTipOffset, Mode=TwoWay}"/>
-                    <Controls:NumericField Label="Cut depth:" ColonAt="90" Unit="mm" Format="-###0.###" Value="{Binding Path=CutDepth, Mode=TwoWay}"/>
-                    <Controls:NumericField Label="Swivel angle:" ColonAt="90" Unit="deg" Format="##0" Value="{Binding Path=SwivelAngle, Mode=TwoWay}"/>
-                    <Controls:NumericField Label="Dent length:" ColonAt="90" Unit="mm" Format="###0.###" Value="{Binding Path=DentLength, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_tipOffset" Label="Tip offset:" ColonAt="90" Unit="mm" Format="#0.###" Value="{Binding Path=KnifeTipOffset, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_cutDepth" Label="Cut depth:" ColonAt="90" Unit="mm" Format="-###0.###" Value="{Binding Path=CutDepth, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_swivelAngle" Label="Swivel angle:" ColonAt="90" Unit="deg" Format="##0" Value="{Binding Path=SwivelAngle, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_dentLength" Label="Dent length:" ColonAt="90" Unit="mm" Format="###0.###" Value="{Binding Path=DentLength, Mode=TwoWay}"/>
                 </StackPanel>
             </GroupBox>
-            <GroupBox Header="Retract" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
+            <GroupBox x:Uid="grp_retract" Header="Retract" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
                 <StackPanel>
-                    <CheckBox Content="Retract enable" IsChecked="{Binding Path=RetractEnable, Mode=TwoWay}" Margin="90,5,0,0"/>
-                    <Controls:NumericField Label="Retract angle:" ColonAt="90" Unit="deg" Format="##0" Value="{Binding Path=RetractAngle, Mode=TwoWay}"/>
-                    <Controls:NumericField Label="Retract depth:" ColonAt="90" Unit="mm/min" Format="-###0.###" Value="{Binding Path=RetractDepth, Mode=TwoWay}"/>
+                    <CheckBox x:Uid="lbl_retractEnable" Content="Retract enable" IsChecked="{Binding Path=RetractEnable, Mode=TwoWay}" Margin="90,5,0,0"/>
+                    <Controls:NumericField x:Uid="fld_retractAngle" Label="Retract angle:" ColonAt="90" Unit="deg" Format="##0" Value="{Binding Path=RetractAngle, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_retractDepth" Label="Retract depth:" ColonAt="90" Unit="mm/min" Format="-###0.###" Value="{Binding Path=RetractDepth, Mode=TwoWay}"/>
                 </StackPanel>
             </GroupBox>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Width="Auto" Margin="0,10">
-                <Button x:Name="btnOk" Content="Ok" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
-                <Button x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
+                <Button x:Uid="btn_ok" x:Name="btnOk" Content="Ok" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
+                <Button x:Uid="btn_cancel" x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/CNC Controls Dragknife/Properties/AssemblyInfo.cs b/CNC Controls Dragknife/Properties/AssemblyInfo.cs
index 24aeeff..6d75f2a 100644
--- a/CNC Controls Dragknife/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Dragknife/Properties/AssemblyInfo.cs	
@@ -10,11 +10,12 @@
 [assembly: AssemblyTitle("CNC Controls Dragknife")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CNC Controls Dragknife")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyCompany("Io Engineering")]
+[assembly: AssemblyProduct("ioSender")]
+[assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -51,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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.35.0")]
+[assembly: AssemblyFileVersion("2.0.35.0")]
diff --git a/CNC Controls Lathe/CNC Controls Lathe/CNC Controls Lathe.csproj b/CNC Controls Lathe/CNC Controls Lathe/CNC Controls Lathe.csproj
index 5d921e8..714529b 100644
--- a/CNC Controls Lathe/CNC Controls Lathe/CNC Controls Lathe.csproj	
+++ b/CNC Controls Lathe/CNC Controls Lathe/CNC Controls Lathe.csproj	
@@ -33,6 +33,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>App.ico</ApplicationIcon>
+    <Localizable>False</Localizable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/CNC Controls Lathe/CNC Controls Lathe/Properties/AssemblyInfo.cs b/CNC Controls Lathe/CNC Controls Lathe/Properties/AssemblyInfo.cs
index 1d116d9..5c32c2d 100644
--- a/CNC Controls Lathe/CNC Controls Lathe/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Lathe/CNC Controls Lathe/Properties/AssemblyInfo.cs	
@@ -11,7 +11,7 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
-[assembly: AssemblyProduct("CNC Controls Lathe")]
+[assembly: AssemblyProduct("ioSender")]
 [assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -51,5 +51,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.31.0")]
-[assembly: AssemblyFileVersion("2.0.31.0")]
+[assembly: AssemblyVersion("2.0.35.0")]
+[assembly: AssemblyFileVersion("2.0.35.0")]
diff --git a/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj b/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj
index 4ba1637..931a15b 100644
--- a/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj	
+++ b/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj	
@@ -31,6 +31,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <UICulture>en-US</UICulture>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="HelixToolkit.Wpf">
       <HintPath>..\..\helix-toolkit\HelixToolkit.Wpf.dll</HintPath>
@@ -58,6 +61,9 @@
     <Compile Include="CenterFinderControl.xaml.cs">
       <DependentUpon>CenterFinderControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ConfigControl.xaml.cs">
+      <DependentUpon>ConfigControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Converters.cs" />
     <Compile Include="CsSelectControl.xaml.cs">
       <DependentUpon>CsSelectControl.xaml</DependentUpon>
@@ -104,6 +110,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ConfigControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="CsSelectControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml
index 1ea98b1..a6c6c74 100644
--- a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml	
@@ -31,22 +31,22 @@
         <StackPanel Orientation="Vertical" Margin="5" HorizontalAlignment="Left" Width="330">
             <DockPanel>
                 <local:CsSelectControl/>
-                <GroupBox Header="Passes" ToolTip="More than one pass is usually needed to get accurate dimensions." HorizontalAlignment="Stretch">
-                    <Controls:NumericField Label="Passes:" Value="{Binding Path=Passes, Mode=TwoWay}" Unit="" Format="0" Margin="0,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
+                <GroupBox x:Uid="grp_passes" Header="Passes" ToolTip="More than one pass is usually needed to get accurate dimensions." HorizontalAlignment="Stretch">
+                    <Controls:NumericField x:Uid="fld_passes" Label="Passes:" Value="{Binding Path=Passes, Mode=TwoWay}" Unit="" Format="0" Margin="0,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
                  </GroupBox>
             </DockPanel>
-            <GroupBox Header="Workpiece dimensions">
+            <GroupBox x:Uid="grp_dimensions" Header="Workpiece dimensions">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="30"/>
                         <RowDefinition Height="30"/>
                     </Grid.RowDefinitions>
-                    <Controls:NumericField Grid.Row="0" Label="X size:" Format="{Binding Path=Grbl.Format}" Value="{Binding Path=WorkpieceSizeX, Mode=TwoWay}" Margin="0,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
-                    <Controls:NumericField Grid.Row="1" Label="Y size:" Format="{Binding Path=Grbl.Format}" Value="{Binding Path=WorkpieceSizeY, Mode=TwoWay}" Margin="0,2,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
-                    <CheckBox Content="Lock" Grid.RowSpan="2" IsChecked="{Binding Path=WorkpiecLockXY, Mode=TwoWay}" ToolTip="Unlock and set X or Y size to 0 to probe in one direction only." Margin="170,4,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"/>
+                    <Controls:NumericField x:Uid="fld_xSize" Grid.Row="0" Label="X size:" Format="{Binding Path=Grbl.Format}" Value="{Binding Path=WorkpieceSizeX, Mode=TwoWay}" Margin="0,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
+                    <Controls:NumericField x:Uid="fld_ySize" Grid.Row="1" Label="Y size:" Format="{Binding Path=Grbl.Format}" Value="{Binding Path=WorkpieceSizeY, Mode=TwoWay}" Margin="0,2,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
+                    <CheckBox x:Uid="lbl_lock" Content="Lock" Grid.RowSpan="2" IsChecked="{Binding Path=WorkpiecLockXY, Mode=TwoWay}" ToolTip="Unlock and set X or Y size to 0 to probe in one direction only." Margin="170,4,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"/>
                 </Grid>
             </GroupBox>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,5,0,0" ToolTip="Click to select probing action.">
+            <StackPanel x:Uid="grd_action" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,5,0,0" ToolTip="Click to select probing action.">
                 <StackPanel.Resources>
                     <Style x:Key="RadioImage" TargetType="RadioButton">
                         <Style.Triggers>
@@ -77,15 +77,15 @@
             </StackPanel>
         </StackPanel>
         <StackPanel Margin="5,0,0,5" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="Auto" Width="Auto">
-            <Button Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
-            <Button Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
+            <Button x:Uid="btn_start" Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
+            <Button x:Uid="btn_stop" Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
         </StackPanel>
-        <CheckBox Content="Preview" Margin="345,10,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
-        <GroupBox Header="Preview" Margin="345,30,0,0" Visibility="{Binding Path=PreviewEnable, Converter={StaticResource ToVisibleConverter}}" VerticalAlignment="Top">
+        <CheckBox x:Uid="lbl_preview" Content="Preview" Margin="345,10,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
+        <GroupBox x:Uid="grp_preview" Header="Preview" Margin="345,30,0,0" Visibility="{Binding Path=PreviewEnable, Converter={StaticResource ToVisibleConverter}}" VerticalAlignment="Top">
             <TextBox IsReadOnly="True" Text="{Binding Path=PreviewText, Mode=OneWay}" TextWrapping="NoWrap" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="235" Height="300"
-                         FontSize="10" FontFamily="Verdana"
-                         ScrollViewer.VerticalScrollBarVisibility="Auto"
-                         ScrollViewer.HorizontalScrollBarVisibility="Auto">
+                FontSize="10" FontFamily="Verdana"
+                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                ScrollViewer.HorizontalScrollBarVisibility="Auto">
             </TextBox>
         </GroupBox>
     </Grid>
diff --git a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs
index 5fb41d3..453bdb1 100644
--- a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs	
@@ -348,7 +348,7 @@ private bool OnCompleted()
                 }
 
                 if (!ok || pass == 1)
-                    probing.Program.End(ok ? string.Format("Probing completed: X distance {0}, Y distance {1}", X_distance.ToInvariantString(), Y_distance.ToInvariantString())  : "Probing failed");
+                    probing.Program.End(ok ? string.Format("Probing completed: X distance {0}, Y distance {1}", X_distance.ToInvariantString(), Y_distance.ToInvariantString()) : "Probing failed");
             }
 
             return ok;
@@ -373,7 +373,7 @@ private void PreviewOnCompleted()
                 probing.Program.Add(string.Format("G10L2P{0}{1}", probing.CoordinateSystem, probing.StartPosition.ToString(axisflags)));
         }
 
-private void start_Click(object sender, RoutedEventArgs e)
+        private void start_Click(object sender, RoutedEventArgs e)
         {
             Start((DataContext as ProbingViewModel).PreviewEnable);
         }
diff --git a/CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml b/CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml
new file mode 100644
index 0000000..810b8fa
--- /dev/null
+++ b/CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml	
@@ -0,0 +1,15 @@
+<UserControl x:Class="CNC.Controls.Probing.ConfigControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:CNC.Controls.Probing"
+             xmlns:Controls="clr-namespace:CNC.Controls;assembly=CNC.Controls.WPF"
+             mc:Ignorable="d" 
+             d:DesignHeight="42" d:DesignWidth="250">
+    <GroupBox x:Uid="grp_probeConfig" Header="Probing" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
+        <StackPanel HorizontalAlignment="Left" Height="Auto" Margin="0,3,0,0" VerticalAlignment="Top" Width="235">
+            <CheckBox x:Uid="lbl_chkProbeStatus" Content="Check probe status before start (G59.3)" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=Probing.CheckProbeStatus, Mode=TwoWay}" ToolTip="An alarm will be generated by the controller if not enabled and the probe is asserted."/>
+        </StackPanel>
+    </GroupBox>
+</UserControl>
diff --git a/CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml.cs
new file mode 100644
index 0000000..eef4f57
--- /dev/null
+++ b/CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml.cs	
@@ -0,0 +1,54 @@
+/*
+ * ConfigControl.xaml.cs - part of ioSender
+ *
+ * v0.35 / 2021-10-19 / Io Engineering (Terje Io)
+ *
+ */
+
+/*
+
+Copyright (c) 2021, 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.Windows.Controls;
+
+namespace CNC.Controls.Probing
+{
+    /// <summary>
+    /// Interaction logic for ConfigControl.xaml
+    /// </summary>
+    public partial class ConfigControl : UserControl
+    {
+        public ConfigControl()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/CNC Controls Probing/CNC Controls Probing/CsSelectControl.xaml b/CNC Controls Probing/CNC Controls Probing/CsSelectControl.xaml
index 2a02b61..623cc9f 100644
--- a/CNC Controls Probing/CNC Controls Probing/CsSelectControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/CsSelectControl.xaml	
@@ -11,16 +11,16 @@
         <Controls:EnumValueToBooleanConverter x:Key="EnumToCheckedConverter" />
         <Controls:BoolToVisibleConverter x:Key="IsVisibleConverter" />
     </UserControl.Resources>
-    <GroupBox Header="Action" Height="85">
+    <GroupBox x:Uid="grp_action" Header="Action" Height="85">
         <StackPanel Orientation="Vertical" Margin="2,5,0,0">
             <DockPanel>
-                <RadioButton Content="Set coordinate system:" IsChecked="{Binding Path=CoordinateMode, Mode=TwoWay, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=G10}" VerticalAlignment="Center"/>
+                <RadioButton x:Uid="set_coord" Content="Set coordinate system:" IsChecked="{Binding Path=CoordinateMode, Mode=TwoWay, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=G10}" VerticalAlignment="Center"/>
                 <ComboBox x:Name="cbxOffset" Margin="3,0" DisplayMemberPath="Code" SelectedValuePath="Id" ItemsSource="{Binding Path=CoordinateSystems}" SelectedValue="{Binding Path=CoordinateSystem, Mode=TwoWay}" HorizontalAlignment="Right" VerticalAlignment="Center" Width="55" Height="22"/>
             </DockPanel>
             <DockPanel Margin="0,5,0,0" Width="Auto" Height="30">
-                <RadioButton Content="Set offset (G92)" IsChecked="{Binding Path=CoordinateMode, Mode=TwoWay, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=G92}" VerticalAlignment="Center"/>
-                <Border  Visibility="{Binding Path=Grbl.IsG92Active, Converter={StaticResource IsVisibleConverter}}" Background="Salmon" HorizontalAlignment="Right" VerticalAlignment="Center" CornerRadius="2" Width="61" Height="28">
-                    <Button Content="Clear" HorizontalAlignment="Center" VerticalAlignment="Center" Width="55" Height="22" Click="ClearG92_Click"/>
+                <RadioButton x:Uid="btn_setG92" Content="Set offset (G92)" IsChecked="{Binding Path=CoordinateMode, Mode=TwoWay, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=G92}" VerticalAlignment="Center"/>
+                <Border Visibility="{Binding Path=Grbl.IsG92Active, Converter={StaticResource IsVisibleConverter}}" Background="Salmon" HorizontalAlignment="Right" VerticalAlignment="Center" CornerRadius="2" Width="61" Height="28">
+                    <Button x:Uid="btn_clear" Content="Clear" HorizontalAlignment="Center" VerticalAlignment="Center" Width="55" Height="22" Click="ClearG92_Click"/>
                 </Border>
             </DockPanel>
         </StackPanel>
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml
index 0d66b0e..e5dceeb 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml	
@@ -65,16 +65,16 @@
             </StackPanel.Resources>
             <StackPanel Orientation="Horizontal">
                 <local:CsSelectControl/>
-                <GroupBox Header="Workpiece">
-                    <Controls:NumericField Label="Height" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=ProbeZ}" Margin="0,5,85,0" VerticalAlignment="Top"/>
+                <GroupBox x:Uid="grp_workpiece" Header="Workpiece">
+                    <Controls:NumericField x:Uid="lbl_height" Label="Height" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=ProbeZ}" Margin="0,5,85,0" VerticalAlignment="Top"/>
                 </GroupBox>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
-                <CheckBox Content="Probe Z" IsChecked="{Binding Path=ProbeZ}" IsEnabled="{Binding ElementName=probez, Path=IsChecked, Converter={StaticResource IsNotRunningConverter}}"/>
-                <CheckBox Content="Preview" Margin="15,0,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
+                <CheckBox x:Uid="lbl_probeZ" Content="Probe Z" IsChecked="{Binding Path=ProbeZ}" IsEnabled="{Binding ElementName=probez, Path=IsChecked, Converter={StaticResource IsNotRunningConverter}}"/>
+                <CheckBox x:Uid="lbl_preview" Content="Preview" Margin="15,0,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-            <Grid ToolTip="Click edge, corner or center to select probing action." Width="180" Height="180" Margin="5,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
+            <Grid x:Uid="grd_action" ToolTip="Click edge, corner or center to select probing action." Width="180" Height="180" Margin="5,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="60" />
                     <RowDefinition Height="60" />
@@ -177,8 +177,8 @@
             </StackPanel>
         </StackPanel>
         <StackPanel Margin="5,0,0,5" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="Auto" Width="Auto">
-            <Button Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
-            <Button Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
+            <Button x:Uid="btn_start" Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
+            <Button x:Uid="btn_stop" Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml
index 44eb73d..61ab556 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml	
@@ -65,16 +65,16 @@
             </StackPanel.Resources>
             <StackPanel Orientation="Horizontal">
                 <local:CsSelectControl/>
-                <GroupBox Header="Workpiece">
-                    <Controls:NumericField Label="Height" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=ProbeZ}" Margin="0,5,85,0" VerticalAlignment="Top"/>
+                <GroupBox x:Uid="grp_workpiece" Header="Workpiece">
+                    <Controls:NumericField x:Uid="lbl_height" Label="Height" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=ProbeZ}" Margin="0,5,85,0" VerticalAlignment="Top"/>
                 </GroupBox>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
-                <CheckBox Content="Probe Z" IsChecked="{Binding Path=ProbeZ}" IsEnabled="{Binding ElementName=probez, Path=IsChecked, Converter={StaticResource IsNotRunningConverter}}"/>
-                <CheckBox Content="Preview" Margin="15,0,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
+                <CheckBox x:Uid="lbl_probeZ" Content="Probe Z" IsChecked="{Binding Path=ProbeZ}" IsEnabled="{Binding ElementName=probez, Path=IsChecked, Converter={StaticResource IsNotRunningConverter}}"/>
+                <CheckBox x:Uid="lbl_preview" Content="Preview" Margin="15,0,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <Grid ToolTip="Click edge, corner or center to select probing action." Width="180" Height="180" Margin="5,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
+                <Grid x:Uid="grd_action" ToolTip="Click edge, corner or center to select probing action." Width="180" Height="180" Margin="5,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="60" />
                         <RowDefinition Height="60" />
@@ -177,8 +177,8 @@
             </StackPanel>
         </StackPanel>
         <StackPanel Margin="5,0,0,5" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="Auto" Width="Auto">
-            <Button Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
-            <Button Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
+            <Button x:Uid="btn_start" Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
+            <Button x:Uid="btn_stop" Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml
index affa554..10cfd20 100644
--- a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml	
@@ -1,13 +1,13 @@
 <UserControl
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:CNC.Controls.Probing"
-             xmlns:Controls="clr-namespace:CNC.Controls;assembly=CNC.Controls.WPF" x:Class="CNC.Controls.Probing.HeightMapControl"
-             xmlns:helix="clr-namespace:HelixToolkit.Wpf;assembly=HelixToolkit.Wpf"
-             mc:Ignorable="d" Height="370"
-             d:DesignHeight="370" d:DesignWidth="600">
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+    xmlns:local="clr-namespace:CNC.Controls.Probing"
+    xmlns:Controls="clr-namespace:CNC.Controls;assembly=CNC.Controls.WPF" x:Class="CNC.Controls.Probing.HeightMapControl"
+    xmlns:helix="clr-namespace:HelixToolkit.Wpf;assembly=HelixToolkit.Wpf"
+    mc:Ignorable="d" Height="370"
+    d:DesignHeight="370" d:DesignWidth="600">
     <UserControl.Resources>
         <Controls:LogicalNotConverter x:Key="IsNotRunningConverter" />
     </UserControl.Resources>
@@ -17,13 +17,13 @@
                 <StackPanel Margin="5,5,0,0">
                     <StackPanel Orientation="Horizontal">
                         <Controls:NumericField Label="X:" ColonAt="20" Value="{Binding Path=HeightMap.MinX, Mode=TwoWay}" Format="-###0.0##"/>
-                        <Controls:NumericField Label="W:" ColonAt="25" Value="{Binding Path=HeightMap.Width, Mode=TwoWay}" Format="-###0.0##"/>
+                        <Controls:NumericField x:Uid="lbl_width" Label="W:" ColonAt="25" Value="{Binding Path=HeightMap.Width, Mode=TwoWay}" Format="-###0.0##"/>
                     </StackPanel>
                     <StackPanel Margin="0,5,0,0" Orientation="Horizontal">
                         <Controls:NumericField Label="Y:" ColonAt="20" Value="{Binding Path=HeightMap.MinY, Mode=TwoWay}" Format="-###0.0##"/>
-                        <Controls:NumericField Label="H:" ColonAt="25" Value="{Binding Path=HeightMap.Height, Mode=TwoWay}" Format="-###0.0##"/>
+                        <Controls:NumericField x:Uid="lbl_height" Label="H:" ColonAt="25" Value="{Binding Path=HeightMap.Height, Mode=TwoWay}" Format="-###0.0##"/>
                     </StackPanel>
-                    <Button Content="Set from program limits" IsEnabled="{Binding Path=Grbl.IsFileLoaded}" Margin="5,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Click="limits_Click"/>
+                    <Button x:Uid="btn_fromLimits" Content="Set from program limits" IsEnabled="{Binding Path=Grbl.IsFileLoaded}" Margin="5,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Click="limits_Click"/>
                 </StackPanel>
             </GroupBox>
             <GroupBox Header="Gridsize">
@@ -34,11 +34,11 @@
                     </Grid.RowDefinitions>
                     <Controls:NumericField Grid.Row="0" Label="X:" Value="{Binding Path=HeightMap.GridSizeX, Mode=TwoWay}" ColonAt="25" Margin="0,5,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                     <Controls:NumericField Grid.Row="1" Label="Y:" Value="{Binding Path=HeightMap.GridSizeY, Mode=TwoWay}" ColonAt="25" Margin="0,2,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                    <CheckBox Content="Lock" Grid.RowSpan="2" IsChecked="{Binding Path=HeightMap.GridSizeLockXY, Mode=TwoWay}" Margin="125,4,0,0" VerticalAlignment="Center"/>
+                    <CheckBox x:Uid="lbl_lock" Content="Lock" Grid.RowSpan="2" IsChecked="{Binding Path=HeightMap.GridSizeLockXY, Mode=TwoWay}" Margin="125,4,0,0" VerticalAlignment="Center"/>
                 </Grid>
             </GroupBox>
-            <CheckBox Content="Pause before probing" Margin="5,5,0,0" IsChecked="{Binding Path=HeightMap.AddPause, Mode=TwoWay}"/>
-            <CheckBox Content="Set Z = 0 at X0Y0:" Margin="5,0,0,0" IsChecked="{Binding Path=HeightMap.SetToolOffset, Mode=TwoWay}"/>
+            <CheckBox x:Uid="lbl_pause" Content="Pause before probing" Margin="5,5,0,0" IsChecked="{Binding Path=HeightMap.AddPause, Mode=TwoWay}"/>
+            <CheckBox x:Uid="lbl_setZ0AtX0Y0" Content="Set Z = 0 at X0Y0:" Margin="5,0,0,0" IsChecked="{Binding Path=HeightMap.SetToolOffset, Mode=TwoWay}"/>
             <local:CsSelectControl IsEnabled="{Binding Path=HeightMap.SetToolOffset}"/>
         </StackPanel>
         <helix:HelixViewport3D BorderBrush="DarkGray" BorderThickness="1" Width="300" Height="300" Margin="280,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="viewport" Panel.ZIndex="0" ZoomExtentsWhenLoaded="False" RotateAroundMouseDownPoint="true" ZoomAroundMouseDownPoint="true"
@@ -77,12 +77,12 @@
             <helix:PointsVisual3D Size="4" Color="Red" Points="{Binding Path=HeightMap.MapPoints}"/>
         </helix:HelixViewport3D>
         <StackPanel Margin="5,0,0,5" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="Auto" Width="Auto">
-            <Button Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
-            <Button Content="_Probe" IsEnabled="{Binding Path=IsPaused}" Margin="2,0" Width="75" Click="probe_Click"/>
-            <Button Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
-            <Button Content="_Load" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="load_Click"/>
-            <Button Content="_Save" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="save_Click"/>
-            <Button Content="_Apply" IsEnabled="{Binding Path=HeightMap.CanApply}" Margin="2,0" Width="75" Click="apply_Click"/>
+            <Button x:Uid="btn_start" Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
+            <Button x:Uid="btn_probe" Content="_Probe" IsEnabled="{Binding Path=IsPaused}" Margin="2,0" Width="75" Click="probe_Click"/>
+            <Button x:Uid="btn_stop" Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
+            <Button x:Uid="btn_load" Content="_Load" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="load_Click"/>
+            <Button x:Uid="btn_save" Content="_Save" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="save_Click"/>
+            <Button x:Uid="btn_apply" Content="_Apply" IsEnabled="{Binding Path=HeightMap.CanApply}" Margin="2,0" Width="75" Click="apply_Click"/>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml
index cb135ff..a71c596 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml	
@@ -41,83 +41,83 @@
         <DockPanel x:Name="dp" DockPanel.Dock="Left" Margin="5,10,5,0" Width="240" HorizontalAlignment="Left" VerticalAlignment="Stretch">
             <StackPanel x:Name="t1" Height="Auto" HorizontalAlignment="Left" VerticalAlignment="Top" DockPanel.Dock="Top" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsVisibleConverter}}">
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,5" HorizontalAlignment="Stretch">
-                    <Label x:Name="lblProfile" Content="Profile:" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Height="25" Width="48"/>
+                    <Label x:Uid="lbl_profile" x:Name="lblProfile" Content="Profile:" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Height="25" Width="48"/>
                     <ComboBox x:Name="cbxProfile" IsEditable="True"  HorizontalAlignment="Left" VerticalAlignment="Center" Width="155" Height="22"
                         ItemsSource="{Binding Path=Profiles}"
                         SelectedItem="{Binding Path=Profile, Mode=TwoWay}"
                         DisplayMemberPath="Name"
                         SelectedValuePath="Id" 
                     />
-                    <Button x:Name="btnAddProfile" Content="..." HorizontalAlignment="Right" VerticalAlignment="Center" Width="22" Height="22" Focusable="False" Click="btnAddProfile_Click" Margin="4,0,0,0">
+                    <Button x:Uid="btn_addProfile" x:Name="btnAddProfile" Content="..." HorizontalAlignment="Right" VerticalAlignment="Center" Width="22" Height="22" Focusable="False" Click="btnAddProfile_Click" Margin="4,0,0,0">
                         <Button.ContextMenu>
                             <ContextMenu x:Name="cm">
-                                <MenuItem x:Name="mnuAdd" Header="Add" Click="mnu_Click"/>
-                                <MenuItem x:Name="mnuUpdate" Header="Update" Click="mnu_Click"/>
-                                <MenuItem x:Name="mnuDelete" Header="Delete" Click="mnu_Click"/>
+                                <MenuItem x:Uid="mnu_add" x:Name="mnuAdd" Header="Add" Click="mnu_Click"/>
+                                <MenuItem x:Uid="mnu_update" x:Name="mnuUpdate" Header="Update" Click="mnu_Click"/>
+                                <MenuItem x:Uid="mnu_delete" x:Name="mnuDelete" Header="Delete" Click="mnu_Click"/>
                             </ContextMenu>
                         </Button.ContextMenu>
                     </Button>
                 </StackPanel>
-                <GroupBox Header="Probe tip/tool">
-                    <Controls:NumericField Label="Diameter:" Value="{Binding Path=ProbeDiameter, Mode=TwoWay}" IsEnabled="{Binding Path=ProbeDiameterEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
+                <GroupBox x:Uid="grp_probeTipOrTool" Header="Probe tip/tool">
+                    <Controls:NumericField x:Uid="fld_diameter" Label="Diameter:" Value="{Binding Path=ProbeDiameter, Mode=TwoWay}" IsEnabled="{Binding Path=ProbeDiameterEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
                 </GroupBox>
-                <GroupBox Header="Touch plate/fixture height">
+                <GroupBox x:Uid="grp_touchOrFixture" Header="Touch plate/fixture height">
                     <StackPanel Orientation="Vertical">
-                        <Controls:NumericField Visibility="{Binding Path=ProbeFixture, Converter={StaticResource IsNotVisibleConverter}}"  Label="Touch plate:" Value="{Binding Path=TouchPlateHeight, Mode=TwoWay}" IsEnabled="{Binding Path=TouchPlateHeightEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
-                        <Controls:NumericField Visibility="{Binding Path=ProbeFixture, Converter={StaticResource IsVisibleConverter}}" Label="Fixture:" Value="{Binding Path=FixtureHeight, Mode=TwoWay}" IsEnabled="{Binding Path=FixtureHeightEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
+                        <Controls:NumericField x:Uid="fld_touchPlate" Visibility="{Binding Path=ProbeFixture, Converter={StaticResource IsNotVisibleConverter}}"  Label="Touch plate:" Value="{Binding Path=TouchPlateHeight, Mode=TwoWay}" IsEnabled="{Binding Path=TouchPlateHeightEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
+                        <Controls:NumericField x:Uid="fld_fixture" Visibility="{Binding Path=ProbeFixture, Converter={StaticResource IsVisibleConverter}}" Label="Fixture:" Value="{Binding Path=FixtureHeight, Mode=TwoWay}" IsEnabled="{Binding Path=FixtureHeightEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
                     </StackPanel>
                 </GroupBox>
-                <GroupBox Header="Probing distances and speed">
+                <GroupBox x:Uid="grp_distanceAndSpeed" Header="Probing distances and speed">
                     <StackPanel Orientation="Vertical">
-                        <Controls:NumericField Label="Rapids feed rate:" ToolTip="Feed rate for rapid moves, set to 0 to use controller setting" Format="###0" Unit="mm/min" Value="{Binding Path=RapidsFeedRate, Mode=TwoWay}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
-                        <Controls:NumericField Label="Search feed rate:" ToolTip="Feed rate for initial probing move" Unit="mm/min" Format="###0" Value="{Binding Path=ProbeFeedRate, Mode=TwoWay}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
-                        <Controls:NumericField Label="Latch feed rate:" ToolTip="Feed rate for second slow probing move" Unit="mm/min" Format="###0" Value="{Binding Path=LatchFeedRate, Mode=TwoWay}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
-                        <Controls:NumericField Label="Probing distance:" Tag="Max. distance for probing moves" Value="{Binding Path=ProbeDistance, Mode=TwoWay}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
-                        <Controls:NumericField Label="Latch distance:" Tag="Distance to retract for second slow probing move, set to 0 to skip" Value="{Binding Path=LatchDistance, Mode=TwoWay}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
+                        <Controls:NumericField x:Uid="lbl_rapidsFeed" Label="Rapids feed rate:" ToolTip="Feed rate for rapid moves, set to 0 to use controller setting" Format="###0" Unit="mm/min" Value="{Binding Path=RapidsFeedRate, Mode=TwoWay}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
+                        <Controls:NumericField x:Uid="lbl_searchFeed" Label="Search feed rate:" ToolTip="Feed rate for initial probing move" Unit="mm/min" Format="###0" Value="{Binding Path=ProbeFeedRate, Mode=TwoWay}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
+                        <Controls:NumericField x:Uid="lbl_latchFeed" Label="Latch feed rate:" ToolTip="Feed rate for second slow probing move" Unit="mm/min" Format="###0" Value="{Binding Path=LatchFeedRate, Mode=TwoWay}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
+                        <Controls:NumericField x:Uid="lbl_probingDistance" Label="Probing distance:" Tag="Max. distance for probing moves" Value="{Binding Path=ProbeDistance, Mode=TwoWay}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
+                        <Controls:NumericField x:Uid="lbl_latchDistance" Label="Latch distance:" Tag="Distance to retract for second slow probing move, set to 0 to skip" Value="{Binding Path=LatchDistance, Mode=TwoWay}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
                     </StackPanel>
                 </GroupBox>
-                <GroupBox Header="Probing clearances">
+                <GroupBox x:Uid="grp_clearances" Header="Probing clearances">
                     <StackPanel Orientation="Vertical">
-                        <Controls:NumericField Label="XY Clearance:" Tag="Initial distance away from face to probe" Value="{Binding Path=XYClearance, Mode=TwoWay}" IsEnabled="{Binding Path=XYOffsetEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,7,0,0" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
-                        <Controls:NumericField Label="Offset:" ToolTip="Distance from corner to probe" Value="{Binding Path=Offset, Mode=TwoWay}" IsEnabled="{Binding Path=OffsetEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
-                        <Controls:NumericField Label="Depth:" ToolTip="Z offset from current position where probing will take place" Value="{Binding Path=Depth, Mode=TwoWay}" IsEnabled="{Binding Path=XYOffsetEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
+                        <Controls:NumericField x:Uid="fld_xyClearance" Label="XY Clearance:" Tag="Initial distance away from face to probe" Value="{Binding Path=XYClearance, Mode=TwoWay}" IsEnabled="{Binding Path=XYOffsetEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,7,0,0" VerticalAlignment="Top" Style="{StaticResource ErrorStyle}"/>
+                        <Controls:NumericField x:Uid="fld_offset" Label="Offset:" ToolTip="Distance from corner to probe" Value="{Binding Path=Offset, Mode=TwoWay}" IsEnabled="{Binding Path=OffsetEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
+                        <Controls:NumericField x:Uid="fld_depth" Label="Depth:" ToolTip="Z offset from current position where probing will take place" Value="{Binding Path=Depth, Mode=TwoWay}" IsEnabled="{Binding Path=XYOffsetEnable}" ColonAt="102" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
                     </StackPanel>
                 </GroupBox>
-                <GroupBox x:Name="probeProperties" Header="Probe XY offsets" Visibility="Collapsed" IsEnabled="{Binding Path=XYOffsetEnable}">
+                <GroupBox x:Uid="grp_prbeProperties" x:Name="probeProperties" Header="Probe XY offsets" Visibility="Collapsed" IsEnabled="{Binding Path=XYOffsetEnable}">
                     <StackPanel Orientation="Horizontal">
                         <Controls:NumericField Label="X:" ToolTip="X offset from probe to controlled point" Value="{Binding Path=ProbeOffsetX, Mode=TwoWay}" ColonAt="20" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
                         <Controls:NumericField Label="Y:" ToolTip="Y offset from probe to controlled point" Value="{Binding Path=ProbeOffsetY, Mode=TwoWay}" ColonAt="20" HorizontalAlignment="Left" Margin="0,2,0,0" VerticalAlignment="Top"/>
                     </StackPanel>
                 </GroupBox>
-                <Button x:Name="Jog" Content="Click to activate keyboard jogging" ToolTip="Ctrl+Shift to activate" Margin="0,5,0,6" Focusable="True" FocusVisualStyle="{x:Null}" GotFocus="Jog_FocusedChanged" LostFocus="Jog_FocusedChanged"/>
+                <Button x:Uid="btn_jog" x:Name="Jog" Content="Click to activate keyboard jogging" ToolTip="Ctrl+Shift to activate" Margin="0,5,0,6" Focusable="True" FocusVisualStyle="{x:Null}" GotFocus="Jog_FocusedChanged" LostFocus="Jog_FocusedChanged"/>
             </StackPanel>
             <TextBlock Text="{Binding Path=Position, Mode=OneWay}" TextWrapping="NoWrap" Height="25" Width="235" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
         </DockPanel>
         <StackPanel DockPanel.Dock="Right" Margin="0,10,0,0" Width="615" HorizontalAlignment="Left" VerticalAlignment="Top">
             <TabControl x:Name="tab" HorizontalAlignment="Stretch" VerticalAlignment="Top" Width="Auto" Height="400" SelectionChanged="tab_SelectionChanged">
-                <TabItem Header="Tool length offset">
+                <TabItem x:Uid="tab_toolOffset" Header="Tool length offset">
                     <local:ToolLengthControl HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 </TabItem>
-                <TabItem Header="Edge finder, external">
+                <TabItem x:Uid="tab_edgeInternal" Header="Edge finder, external">
                     <local:EdgeFinderControl HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 </TabItem>
-                <TabItem Header="Edge finder, internal">
+                <TabItem x:Uid="tab_edgeExternal" Header="Edge finder, internal">
                     <local:EdgeFinderIntControl HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 </TabItem>
-                <TabItem Header="Rotation">
+                <TabItem x:Uid="tab_Rotation" Header="Rotation">
                     <local:RotationControl HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 </TabItem>
-                <TabItem Header="Center finder">
+                <TabItem x:Uid="tab_Center" Header="Center finder">
                     <local:CenterFinderControl HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 </TabItem>
-                <TabItem Header="Height map">
+                <TabItem x:Uid="tab_heightmap" Header="Height map">
                     <local:HeightMapControl HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 </TabItem>
             </TabControl>
             <TextBlock TextWrapping="Wrap" Height="70" Margin="0,2,0,0" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Top">
             <Run Text="{Binding Path=Instructions, Mode=OneWay}"/>
             <LineBreak/>
-            <Run Text="Warning! Use with care - incorrect parameters may damage your probe! (NOTE: only lightly tested)" Foreground="Red" FontWeight="Bold"/>
+            <Run x:Uid="txt_warning" Text="Warning! Use with care - incorrect parameters may damage your probe!" Foreground="Red" FontWeight="Bold"/>
             </TextBlock>
         </StackPanel>
     </DockPanel>
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs
index 83e8a3a..7770e4c 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
@@ -294,6 +294,8 @@ public void CloseFile()
 
         public void Setup(UIViewModel model, AppConfig profile)
         {
+            if (!model.IsConfigControlInstantiated<ConfigControl>())
+                model.ConfigControls.Add(new ConfigControl());
         }
 
         #endregion
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs
index 0bf43ae..1c3f6f5 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.33 / 2021-05-10 / Io Engineering (Terje Io)
+ * v0.35 / 2021-10-19 / Io Engineering (Terje Io)
  *
  */
 
@@ -207,7 +207,7 @@ public bool WaitForWcoUpdate()
                     null,
                     a => Grbl.OnWCOUpdated += a,
                     a => Grbl.OnWCOUpdated -= a,
-                    5000);
+                    AppConfig.Settings.Base.PollInterval * 35);
                 }).Start();
             }
 
diff --git a/CNC Controls Probing/CNC Controls Probing/Program.cs b/CNC Controls Probing/CNC Controls Probing/Program.cs
index e3052c6..0ae458b 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.27 / 2020-09-26 / Io Engineering (Terje Io)
+ * v0.35 / 2020-10-18 / Io Engineering (Terje Io)
 
  *
  */
@@ -52,8 +52,10 @@ public class Program
         private List<string> _program = new List<string>();
         ProbingViewModel probing;
         private bool probeProtect = false;
+        private volatile bool probeAsserted = false, probeConnected = false;
         private volatile bool _isComplete = false, isRunning = false, isProbing = false, hasPause = false, probeOnCycleStart = false;
         private int step = 0;
+        private volatile string cmd_response;
         private CancellationToken cancellationToken = new CancellationToken();
 
         public bool Silent = false;
@@ -122,7 +124,82 @@ public void Clear()
             _program.Clear();
         }
 
-        public bool Init()
+        private void probeCheck(string data)
+        {
+            if (data.StartsWith("<"))
+            {
+                int pos;
+                if ((probeAsserted = (pos = data.IndexOf("|Pn:")) > 0))
+                {
+                    string[] elements = (data.Substring(pos + 4).TrimEnd('>') + "|").Split('|');
+                    probeAsserted = elements[0].Contains("P");
+                    probeConnected = !elements[0].Contains("O");
+                }
+            }
+        }
+
+        public bool IsProbeReady(bool get_status = true)
+        {
+            bool ok = true;
+
+            if (get_status) // Check for probe connected and not asserted in next real-time report
+            {
+                bool? res = null;
+                CancellationToken cancellationToken = new CancellationToken();
+
+                probeAsserted = probeConnected = true;
+
+                // Timeout wait for skipping first report as this may have probe asserted true
+                new Thread(() =>
+                {
+                    res = WaitFor.SingleEvent<string>(
+                    cancellationToken,
+                    null,
+                    a => Grbl.OnGrblReset += a,
+                    a => Grbl.OnGrblReset -= a,
+                    AppConfig.Settings.Base.PollInterval * 2 + 50);
+                }).Start();
+
+                while (res == null)
+                    EventUtils.DoEvents();
+
+                res = null;
+
+                new Thread(() =>
+                {
+                    res = WaitFor.SingleEvent<string>(
+                    cancellationToken,
+                    probeCheck,
+                    a => Grbl.OnResponseReceived += a,
+                    a => Grbl.OnResponseReceived -= a,
+                    AppConfig.Settings.Base.PollInterval * 5);
+                }).Start();
+
+                while (res == null)
+                    EventUtils.DoEvents();
+            }
+            else
+            {
+                probeAsserted = Grbl.Signals.Value.HasFlag(Signals.Probe);
+                probeConnected = !Grbl.Signals.Value.HasFlag(Signals.ProbeDisconnected);
+            }
+
+            if (ok && !probeConnected)
+            {
+                probing.Message = "Probing failed, probe is not connected";
+                ok = false;
+            }
+
+            if (ok && probeAsserted)
+            {
+                probing.Message = "Probing failed, probe signal is asserted";
+                ok = false;
+            }
+
+            return ok;
+        }
+
+        public bool Init(bool check_probe = true)
         {
             bool? res = null;
 
@@ -158,7 +235,7 @@ public bool Init()
                 null,
                 a => Grbl.OnResponseReceived += a,
                 a => Grbl.OnResponseReceived -= a,
-                1000, () => Comms.com.WriteByte(GrblInfo.IsGrblHAL ? GrblConstants.CMD_STATUS_REPORT_ALL : GrblLegacy.ConvertRTCommand(GrblConstants.CMD_STATUS_REPORT)));
+                AppConfig.Settings.Base.PollInterval * 5, () => Comms.com.WriteByte(GrblInfo.IsGrblHAL ? GrblConstants.CMD_STATUS_REPORT_ALL : GrblLegacy.ConvertRTCommand(GrblConstants.CMD_STATUS_REPORT)));
             }).Start();
 
             while (res == null)
@@ -172,17 +249,8 @@ public bool Init()
                 res = false;
             }
 
-            if (res == true && Grbl.Signals.Value.HasFlag(Signals.ProbeDisconnected))
-            {
-                probing.Message = "Probing failed, probe is not connected";
-                res = false;
-            }
-
-            if (res == true && Grbl.Signals.Value.HasFlag(Signals.Probe))
-            {
-                probing.Message = "Probing failed, probe signal is asserted";
-                res = false;
-            }
+            if (res == true && check_probe)
+                res = IsProbeReady(false);
 
             if (res == true && !(Grbl.GrblState.State == GrblStates.Idle || Grbl.GrblState.State == GrblStates.Tool))
             {
@@ -201,9 +269,6 @@ public bool Init()
             hasPause = probeOnCycleStart = false;
             _program.Clear();
 
-            //if (res != true) // Reenable status polling if init fails 
-            //    Grbl.Poller.SetState(AppConfig.Settings.Base.PollInterval);
-
             return res == true;
         }
 
@@ -270,7 +335,7 @@ public void End(string message)
                 isRunning = Grbl.IsJobRunning = false;
                 Grbl.ExecuteCommand(probing.DistanceMode == DistanceMode.Absolute ? "G90" : "G91");
             }
-            if(!_isComplete)
+            if(!_isComplete || probing.IsSuccess)
                 probing.Message = message;
             _isComplete = true;
         }
@@ -283,6 +348,8 @@ public bool Execute(bool go)
 
             if (_program.Count > 0)
             {
+                string response;
+
                 step = 0;
                 probing.Positions.Clear();
                 probing.Machine.Clear();
@@ -305,61 +372,78 @@ public bool Execute(bool go)
                 if (probing.Message == string.Empty)
                     probing.Message = "Probing...";
 
+                cmd_response = string.Empty;
                 Grbl.ExecuteCommand(_program[step]);
 
-                while(!_isComplete)
+                while (!_isComplete)
+                {
                     EventUtils.DoEvents();
-            }
 
-            return probing.IsSuccess;
-        }
+                    if(cmd_response != string.Empty)
+                    {
+                        response = cmd_response;
+                        cmd_response = string.Empty;
 
-        private void ResponseReceived(string response)
-        {
-            if (Grbl.ResponseLogVerbose)
-                Grbl.ResponseLog.Add("PM:" + response);
+                        if (Grbl.ResponseLogVerbose)
+                            Grbl.ResponseLog.Add("PM:" + response);
 
-            if (response == "ok")
-            {
-                step++;
-                if (step < _program.Count)
-                {
-                    int i;
-                    //if ((i = _program[step].IndexOf('$')) > 0)
-                    //{
-                    //    string rp = _program[step].Substring(i, 2);
-                    //    i = GrblInfo.AxisLetterToIndex(rp[1]);
-                    //    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("!"))
-                    {
-                        isProbing = false;
-                        _program[step] = _program[step].Substring(1);
-                        probing.RemoveLastPosition();
-                    }
+                        if (response == "ok")
+                        {
+                            step++;
+                            if (step < _program.Count)
+                            {
+                                int i;
+                                //if ((i = _program[step].IndexOf('$')) > 0)
+                                //{
+                                //    string rp = _program[step].Substring(i, 2);
+                                //    i = GrblInfo.AxisLetterToIndex(rp[1]);
+                                //    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("!"))
+                                {
+                                    isProbing = false;
+                                    _program[step] = _program[step].Substring(1);
+                                    probing.RemoveLastPosition();
+                                }
+
+                                if (_program[step] == "pause")
+                                {
+                                    probing.IsPaused = true;
+                                    probeOnCycleStart = !probing.Grbl.Signals.Value.HasFlag(Signals.CycleStart);
+                                }
+                                else
+                                {
+                                    // This fails with a hang if probe is asserted when it should not be...
+                                    //if ((isProbing = _program[step].Contains("G38")) && !IsProbeReady())
+                                    //    response = "probe!";
+                                    //else
+                                        Grbl.ExecuteCommand(_program[step]);
+                                }
+                            }
+                        }
 
-                    if (_program[step] == "pause")
-                    {
-                        probing.IsPaused = true;
-                        probeOnCycleStart = !probing.Grbl.Signals.Value.HasFlag(Signals.CycleStart);
-                    }
-                    else
-                    {
-                        isProbing = _program[step].Contains("G38");
-                        Grbl.ExecuteCommand(_program[step]);
+                        if (step == _program.Count || response != "ok")
+                        {
+                            probing.IsSuccess = step == _program.Count && response == "ok";
+                            if (!probing.IsSuccess && response != "probe!")
+                                End(Grbl.GrblState.State == GrblStates.Alarm ? "Probing failed with alarm, clear in Grbl tab" : "Probing cancelled/failed");
+                            _isComplete = probing.IsCompleted = true;
+                        }
                     }
+
                 }
-            }
 
-            if (step == _program.Count || response != "ok")
-            {
-                probing.IsSuccess = step == _program.Count && response == "ok";
-                if (!probing.IsSuccess)
-                    End(Grbl.GrblState.State == GrblStates.Alarm ? "Probing failed with alarm, clear in Grbl tab" : "Probing cancelled/failed");
-                _isComplete = probing.IsCompleted = true;
-//                Grbl.Poller.SetState(AppConfig.Settings.Base.PollInterval);
+                if (probing.Message == "Probing...")
+                    probing.Message = string.Empty;
             }
+
+            return probing.IsSuccess;
+        }
+
+        private void ResponseReceived(string response)
+        {
+            cmd_response = response;
         }
 
         public override string ToString()
diff --git a/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs b/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs
index 3a0b8a9..da93a6d 100644
--- a/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs	
@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -8,11 +9,12 @@
 [assembly: AssemblyTitle("CNC Controls Probing")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CNC Controls Probing")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyCompany("Io Engineering")]
+[assembly: AssemblyProduct("ioSender")]
+[assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.33.0")]
-[assembly: AssemblyFileVersion("2.0.33.0")]
+[assembly: AssemblyVersion("2.0.35.0")]
+[assembly: AssemblyFileVersion("2.0.35.0")]
diff --git a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml
index 046f57b..1293ce8 100644
--- a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml	
@@ -57,24 +57,24 @@
                 </Style>
             </StackPanel.Resources>
             <StackPanel Orientation="Horizontal" Height="70">
-                <GroupBox Header="Workpiece" Visibility="Collapsed">
-                    <Controls:NumericField Label="Distance" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" Margin="0,5,85,0" VerticalAlignment="Top"/>
+                <GroupBox x:Uid="grp_workpiece" Header="Workpiece" Visibility="Collapsed">
+                    <Controls:NumericField x:Uid="fld_distance" Label="Distance" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" Margin="0,5,85,0" VerticalAlignment="Top"/>
                 </GroupBox>
-                <GroupBox Header="Camera">
-                    <Button Content="Add _position" IsEnabled="{Binding Path=Grbl.IsCameraVisible}" Margin="2,0" Width="75" Height="23" Focusable="False" Click="addPosition_Click"/>
+                <GroupBox x:Uid="grp_camera" Header="Camera">
+                    <Button x:Uid="btn_addPosition" Content="Add _position" IsEnabled="{Binding Path=Grbl.IsCameraVisible}" Margin="2,0" Width="75" Height="23" Focusable="False" Click="addPosition_Click"/>
                 </GroupBox>
-                <GroupBox Header="Rotation center" HorizontalAlignment="Left" Margin="5,0" ToolTip="Click to select rotation center relative to job, if not selected X0,Y0 is used.">
+                <GroupBox x:Uid="grp_RotationCenter" Header="Rotation center" HorizontalAlignment="Left" Margin="5,0" ToolTip="Click to select rotation center relative to job, if not selected X0,Y0 is used.">
                     <StackPanel Orientation="Horizontal">
                         <Controls:OriginControl Value="{Binding Path=Origin, Mode=TwoWay}" IsEnabled="{Binding Path=Grbl.IsFileLoaded}" Margin="5,5,0,0"/>
-                        <Button Content="Use X0,Y0" IsEnabled="{Binding Path=Grbl.IsFileLoaded}" Margin="8,0,5,3" Width="75" Focusable="False" Click="use00_Click" VerticalAlignment="Bottom"/>
+                        <Button x:Uid="btn_useX0Y0" Content="Use X0,Y0" IsEnabled="{Binding Path=Grbl.IsFileLoaded}" Margin="8,0,5,3" Width="75" Focusable="False" Click="use00_Click" VerticalAlignment="Bottom"/>
                     </StackPanel>
                 </GroupBox>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
-                <CheckBox Content="Preview" Margin="15,0,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
+                <CheckBox x:Uid="lbl_preview" Content="Preview" Margin="15,0,0,0" IsChecked="{Binding Path=PreviewEnable}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal">
-                <Grid ToolTip="Click edge to select probing action." Width="160" Height="160" Margin="5,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
+                <Grid x:Uid="grd_action" ToolTip="Click edge to select probing action." Width="160" Height="160" Margin="5,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="80" />
                         <RowDefinition Height="80" />
@@ -88,7 +88,7 @@
                     <RadioButton Content="Resources/RotaterAB.png" Grid.Row="1" Grid.Column="0" Style="{StaticResource Flag}" IsChecked="{Binding Path=ProbeEdge, Mode=TwoWay, Converter={StaticResource EnumToEdgeConverter}, ConverterParameter=AB}" />
                     <RadioButton Content="Resources/RotaterCB.png" Grid.Row="1" Grid.Column="1" Style="{StaticResource Flag}" IsChecked="{Binding Path=ProbeEdge, Mode=TwoWay, Converter={StaticResource EnumToEdgeConverter}, ConverterParameter=CB}" />
                 </Grid>
-                <GroupBox Header="Preview" Margin="30,0,0,0" Visibility="{Binding Path=PreviewEnable, Converter={StaticResource ToVisibleConverter}}" VerticalAlignment="Top">
+                <GroupBox x:Uid="hdr_preview" Header="Preview" Margin="30,0,0,0" Visibility="{Binding Path=PreviewEnable, Converter={StaticResource ToVisibleConverter}}" VerticalAlignment="Top">
                     <TextBox IsReadOnly="True" Text="{Binding Path=PreviewText, Mode=OneWay}" TextWrapping="NoWrap" Margin="0,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="245" Height="180"
                          FontSize="10" FontFamily="Verdana"
                          ScrollViewer.VerticalScrollBarVisibility="Auto"
@@ -98,9 +98,9 @@
             </StackPanel>
         </StackPanel>
         <StackPanel Margin="5,0,0,5" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="Auto" Width="Auto">
-            <Button Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
-            <Button Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
-            <Button Content="_Apply" IsEnabled="{Binding Path=CanApplyTransform}" Margin="2,0" Width="75" Click="apply_Click"/>
+            <Button x:Uid="btn_start" Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
+            <Button x:Uid="btn_stop" Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
+            <Button x:Uid="btn_apply" Content="_Apply" IsEnabled="{Binding Path=CanApplyTransform}" Margin="2,0" Width="75" Click="apply_Click"/>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml
index 0fd0f09..f312270 100644
--- a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml	
@@ -20,33 +20,33 @@
     <Grid>
         <StackPanel Margin="5" HorizontalAlignment="Left" VerticalAlignment="Top">
             <StackPanel Orientation="Horizontal" Margin="10,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
-                <CheckBox Content="Probe fixture @ G59.3" IsEnabled="{Binding Path=HasCoordinateSystem9}" IsChecked="{Binding Path=ProbeFixture, Mode=TwoWay}" VerticalAlignment="Center"/>
-                <Label Content="with tool:"></Label>
+                <CheckBox x:Uid="lbl_probeFixture" Content="Probe fixture @ G59.3" IsEnabled="{Binding Path=HasCoordinateSystem9}" IsChecked="{Binding Path=ProbeFixture, Mode=TwoWay}" VerticalAlignment="Center"/>
+                <Label x:Uid="lbl_withTool" Content="with tool:"></Label>
                 <Controls:NumericComboBox Margin="2,2" DisplayMemberPath="Code" SelectedValuePath="Code" ItemsSource="{Binding Path=Grbl.Tools}" SelectedValue="{Binding Path=Tool, Mode=TwoWay}" IsEnabled="{Binding Path=HasToolTable}" Format="##0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="56" Height="22"/>
             </StackPanel>
-            <CheckBox Content="Establish reference offset" IsChecked="{Binding Path=ReferenceToolOffset, Mode=TwoWay}" IsEnabled="{Binding Path=CanReferenceToolOffset}" Margin="10,0,0,0" VerticalAlignment="Center"/>
+            <CheckBox x:Uid="lbl_setRefernecOffset" Content="Establish reference offset" IsChecked="{Binding Path=ReferenceToolOffset, Mode=TwoWay}" IsEnabled="{Binding Path=CanReferenceToolOffset}" Margin="10,0,0,0" VerticalAlignment="Center"/>
             <Border Margin="5,10,0,0" Visibility="{Binding Path=Grbl.IsToolOffsetActive, Converter={StaticResource IsVisibleConverter}}" Background="Salmon" HorizontalAlignment="Left" VerticalAlignment="Center" CornerRadius="2" Width="156" Height="28">
-                <Button Content="Clear tool length offset" HorizontalAlignment="Center" VerticalAlignment="Center" Width="150" Height="22" Click="clearToolOffset_Click"/>
+                <Button x:Uid="lbl_clearToolOffset" Content="Clear tool length offset" HorizontalAlignment="Center" VerticalAlignment="Center" Width="150" Height="22" Click="clearToolOffset_Click"/>
             </Border>
-            <GroupBox Header="Workpiece offset" Visibility="{Binding Path=ProbeFixture, Converter={StaticResource IsNotVisibleConverter}}" Margin="5,5,0,0">
+            <GroupBox x:Uid="grp_workpieceOffset" Header="Workpiece offset" Visibility="{Binding Path=ProbeFixture, Converter={StaticResource IsNotVisibleConverter}}" Margin="5,5,0,0">
                 <StackPanel>
-                    <CheckBox Content="Add offset" IsChecked="{Binding Path=AddAction, Mode=TwoWay}"  Margin="5,7,0,5" VerticalAlignment="Center"/>
+                    <CheckBox x:Uid="lbl_addOffset" Content="Add offset" IsChecked="{Binding Path=AddAction, Mode=TwoWay}"  Margin="5,7,0,5" VerticalAlignment="Center"/>
                     <StackPanel Orientation="Horizontal">
                         <local:CsSelectControl IsEnabled="{Binding Path=AddAction}" Margin="5,0,0,0"/>
-                        <GroupBox Header="Workpiece">
+                        <GroupBox x:Uid="grp_workpiece" Header="Workpiece">
                             <Controls:NumericField Label="Height" Value="{Binding Path=WorkpieceHeight, Mode=TwoWay}" IsEnabled="{Binding Path=AddAction}" Margin="0,5,85,0" VerticalAlignment="Top"/>
                         </GroupBox>
                     </StackPanel>
                 </StackPanel>
             </GroupBox>
             <StackPanel Visibility="{Binding Path=ProbeFixture, Converter={StaticResource IsVisibleConverter}}" Margin="10,5,0,0">
-                <CheckBox Content="Set coordinate system or offset" IsChecked="{Binding Path=AddAction, Mode=TwoWay}" VerticalAlignment="Center"/>
+                <CheckBox x:Uid="lbl_setCoordOrOffset" Content="Set coordinate system or offset" IsChecked="{Binding Path=AddAction, Mode=TwoWay}" VerticalAlignment="Center"/>
                 <local:CsSelectControl IsEnabled="{Binding Path=AddAction}"/>
             </StackPanel>
         </StackPanel>
         <StackPanel Margin="5,0,0,5" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="Auto" Width="Auto">
-            <Button Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
-            <Button Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
+            <Button x:Uid="btn_start" Content="Start" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsNotRunningConverter}}" Margin="2,0" Width="75" Click="start_Click"/>
+            <Button x:Uid="btn_stop" Content="Stop" IsEnabled="{Binding Path=Grbl.IsJobRunning}" Margin="2,0" Width="75" Click="stop_Click"/>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs
index 5a9c482..a3bb01c 100644
--- a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs	
@@ -78,7 +78,7 @@ public void Start(bool preview = false)
                 return;
             }
 
-            if (!probing.Program.Init())
+            if (!probing.Program.Init(AppConfig.Settings.Probing.CheckProbeStatus || !probing.ProbeFixture))
                 return;
 
             probing.Program.Add(string.Format("G91F{0}", probing.ProbeFeedRate.ToInvariantString()));
diff --git a/CNC Controls/CNC Controls/About.xaml b/CNC Controls/CNC Controls/About.xaml
index 986d484..69e35ed 100644
--- a/CNC Controls/CNC Controls/About.xaml	
+++ b/CNC Controls/CNC Controls/About.xaml	
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CNC.Controls"
         mc:Ignorable="d"
-        Title="About" Height="285" Width="315" ResizeMode="NoResize" ShowInTaskbar="False"
+        x:Uid="dlg_about" Title="About" Height="285" Width="315" ResizeMode="NoResize" ShowInTaskbar="False"
         WindowStartupLocation="CenterOwner"
         Loaded="About_Load" Icon="App.ico">
     <Window.Resources>
@@ -36,8 +36,8 @@
             </StackPanel>
         </GroupBox>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="2">
-            <Button x:Name="btnOk" Content="Ok" HorizontalAlignment="Center" VerticalAlignment="Top" Width="85" Click="okButton_Click"/>
-            <Button x:Name="btnToClipboard" Content="To Clipboard" ToolTip="Copy grbl version information and settings to clipboard" Margin="5,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Top" Width="85" Click="clbButton_Click"/>
+            <Button x:Uid="btn_ok" x:Name="btnOk" Content="Ok" HorizontalAlignment="Center" VerticalAlignment="Top" Width="85" Click="okButton_Click"/>
+            <Button x:Uid="btn_toClipboard" x:Name="btnToClipboard" Content="To Clipboard" ToolTip="Copy grbl version information and settings to clipboard" Margin="5,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Top" Width="85" Click="clbButton_Click"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/CNC Controls/CNC Controls/AppConfig.cs b/CNC Controls/CNC Controls/AppConfig.cs
index 7af773b..cc8f26e 100644
--- a/CNC Controls/CNC Controls/AppConfig.cs	
+++ b/CNC Controls/CNC Controls/AppConfig.cs	
@@ -74,6 +74,14 @@ public class LatheConfig : ViewModelBase
         public double FeedRate { get; set; } = 300d;
     }
 
+    [Serializable]
+    public class ProbeConfig : ViewModelBase
+    {
+        private bool _CheckProbeStatus = true;
+
+        public bool CheckProbeStatus { get { return _CheckProbeStatus; } set { _CheckProbeStatus = value; OnPropertyChanged(); } }
+    }
+
     [Serializable]
     public class CameraConfig : ViewModelBase
     {
@@ -213,6 +221,7 @@ public class Config : ViewModelBase
         public LatheConfig Lathe { get; set; } = new LatheConfig();
         public CameraConfig Camera { get; set; } = new CameraConfig();
         public GCodeViewerConfig GCodeViewer { get; set; } = new GCodeViewerConfig();
+        public ProbeConfig Probing { get; set; } = new ProbeConfig();
     }
 
     public class AppConfig
@@ -238,6 +247,7 @@ private AppConfig()
         public CameraConfig Camera { get { return Base == null ? null : Base.Camera; } }
         public LatheConfig Lathe { get { return Base == null ? null : Base.Lathe; } }
         public GCodeViewerConfig GCodeViewer { get { return Base == null ? null : Base.GCodeViewer; } }
+        public ProbeConfig Probing { get { return Base == null ? null : Base.Probing; } }
 
         public bool Save(string filename)
         {
diff --git a/CNC Controls/CNC Controls/AppConfigView.xaml b/CNC Controls/CNC Controls/AppConfigView.xaml
index edde20b..3935b7b 100644
--- a/CNC Controls/CNC Controls/AppConfigView.xaml	
+++ b/CNC Controls/CNC Controls/AppConfigView.xaml	
@@ -7,7 +7,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="515" d:DesignWidth="875">
     <DockPanel>
-        <Button x:Name="btnSave" DockPanel.Dock="Bottom" Content="Save settings" Margin="10,0,0,5" HorizontalAlignment="Left" VerticalAlignment="Top" Width="100" Click="btnSave_Click"/>
+        <Button x:Uid="btn_saveSettings" x:Name="btnSave" DockPanel.Dock="Bottom" Content="Save settings" Margin="10,0,0,5" HorizontalAlignment="Left" VerticalAlignment="Top" Width="100" Click="btnSave_Click"/>
         <ItemsControl x:Name="xx" DockPanel.Dock="Top">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
diff --git a/CNC Controls/CNC Controls/BasicConfigControl.xaml b/CNC Controls/CNC Controls/BasicConfigControl.xaml
index a4079c3..a17f9ff 100644
--- a/CNC Controls/CNC Controls/BasicConfigControl.xaml	
+++ b/CNC Controls/CNC Controls/BasicConfigControl.xaml	
@@ -6,16 +6,16 @@
              xmlns:local="clr-namespace:CNC.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="185" d:DesignWidth="250">
-    <GroupBox x:Name="grpBasic" Header="Main" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
+    <GroupBox x:Uid="grb_mainConfig" x:Name="grpBasic" Header="Main" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
         <StackPanel HorizontalAlignment="Left">
-            <local:NumericField Label="Reset delay:" ColonAt="90" Unit="ms" Format="###0" Value="{Binding Path=ResetDelay, Mode=TwoWay}" Height="29" VerticalAlignment="Bottom" ToolTip="Delay to allow controller to finish booting before communication starts."/>
-            <local:NumericField Label="Poll interval:" ColonAt="90" Unit="ms" Format="###0" Value="{Binding Path=PollInterval, Mode=TwoWay}" Height="29" VerticalAlignment="Bottom" ToolTip="Time between status request sent to controller."/>
-            <local:NumericField Label="Max buffer:" ColonAt="90" Unit="bytes" Format="###0" Value="{Binding Path=MaxBufferSize, Mode=TwoWay}" Height="29" VerticalAlignment="Bottom" ToolTip="Maximum serial buffer size utilized (limited to 90% of reported value)."/>
-            <CheckBox Content="Agressive buffering" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=UseBuffering, Mode=TwoWay}" ToolTip="Buffers more than one GCode block in controller for smoother execution. For GrblHAL only!"/>
-            <CheckBox Content="Keep MDI focus" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=KeepMdiFocus, Mode=TwoWay}" ToolTip="Buffers more than one GCode block in controller for smoother execution. For GrblHAL only!"/>
-            <CheckBox Content='Filter "ok" response' HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=FilterOkResponse, Mode=TwoWay}" ToolTip="Enable if ok responses overwhelm console logging, typically happens when sending lots of short commands."/>
-            <CheckBox Content='Auto-compress gcode on transforms' HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=AutoCompress, Mode=TwoWay}" ToolTip="Removes superfluous gcode command elements."/>
-            <CheckBox Content='Restore last window size on startup' HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=KeepWindowSize, Mode=TwoWay}" ToolTip="Restore window size on next startup."/>
+            <local:NumericField x:Uid="fld_resetDelay" Label="Reset delay:" ColonAt="90" Unit="ms" Format="###0" Value="{Binding Path=ResetDelay, Mode=TwoWay}" Height="29" VerticalAlignment="Bottom" ToolTip="Delay to allow controller to finish booting before communication starts."/>
+            <local:NumericField x:Uid="fld_pollInterval" Label="Poll interval:" ColonAt="90" Unit="ms" Format="###0" Value="{Binding Path=PollInterval, Mode=TwoWay}" Height="29" VerticalAlignment="Bottom" ToolTip="Time between status request sent to controller."/>
+            <local:NumericField x:Uid="fld_maxBuffer" Label="Max buffer:" ColonAt="90" Unit="bytes" Format="###0" Value="{Binding Path=MaxBufferSize, Mode=TwoWay}" Height="29" VerticalAlignment="Bottom" ToolTip="Maximum serial buffer size utilized (limited to 90% of reported value)."/>
+            <CheckBox x:Uid="lbl_agressiveBuffering" Content="Agressive buffering" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=UseBuffering, Mode=TwoWay}" ToolTip="Buffers more than one GCode block in controller for smoother execution. For grblHAL only!"/>
+            <CheckBox x:Uid="lbl_keepMdiFocus" Content="Keep MDI focus" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=KeepMdiFocus, Mode=TwoWay}" ToolTip="Buffers more than one GCode block in controller for smoother execution. For grblHAL only!"/>
+            <CheckBox x:Uid="lbl_FilterOk" Content='Filter "ok" response' HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=FilterOkResponse, Mode=TwoWay}" ToolTip="Enable if ok responses overwhelm console logging, typically happens when sending lots of short commands."/>
+            <CheckBox x:Uid="lbl_autoCompressGcode" Content='Auto-compress gcode on transforms' HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=AutoCompress, Mode=TwoWay}" ToolTip="Removes superfluous gcode command elements."/>
+            <CheckBox x:Uid="lbl_restoreWindowSize" Content='Restore last window size on startup' HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=KeepWindowSize, Mode=TwoWay}" ToolTip="Restore window size on next startup."/>
         </StackPanel>
     </GroupBox>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/CNC Controls.csproj b/CNC Controls/CNC Controls/CNC Controls.csproj
index 695b000..9dcb961 100644
--- a/CNC Controls/CNC Controls/CNC Controls.csproj	
+++ b/CNC Controls/CNC Controls/CNC Controls.csproj	
@@ -32,7 +32,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
+    <UICulture>en-US</UICulture>
     <ApplicationIcon>App.ico</ApplicationIcon>
+    <Localizable>False</Localizable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="RP.Math.Vector3">
diff --git a/CNC Controls/CNC Controls/ConsoleControl.xaml b/CNC Controls/CNC Controls/ConsoleControl.xaml
index dc87cbc..5efe5fd 100644
--- a/CNC Controls/CNC Controls/ConsoleControl.xaml	
+++ b/CNC Controls/CNC Controls/ConsoleControl.xaml	
@@ -12,10 +12,10 @@
     <!--> <GroupBox Header="Console" HorizontalAlignment="Center" VerticalAlignment="Top" Width="394" Height="328"> <\!-->
     <DockPanel VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
         <DockPanel DockPanel.Dock="Top" HorizontalAlignment="Stretch" Margin="0,0,0,5">
-            <CheckBox Content="Verbose" IsChecked="{Binding Path=ResponseLogVerbose}" HorizontalAlignment="Left" Margin="10,8,0,0" VerticalAlignment="Top"/>
-            <CheckBox Content="Filter out realtime responses" IsChecked="{Binding Path=ResponseLogFilterRT}" IsEnabled="{Binding Path=ResponseLogVerbose}" HorizontalAlignment="Left" Margin="10,8,0,0" VerticalAlignment="Top"/>
-            <CheckBox Content="Show all realtime responses" IsChecked="{Binding Path=ResponseLogShowRTAll}" IsEnabled="{Binding Path=ResponseLogVerbose}" HorizontalAlignment="Left" Margin="10,8,0,0" VerticalAlignment="Top"/>
-            <Button Content="Clear" HorizontalAlignment="Right" Margin="0,5,5,0" VerticalAlignment="Top" Width="75" Click="btn_Clear"/>
+            <CheckBox x:Uid="lbl_verbose" Content="Verbose" IsChecked="{Binding Path=ResponseLogVerbose}" HorizontalAlignment="Left" Margin="10,8,0,0" VerticalAlignment="Top"/>
+            <CheckBox x:Uid="lbl_filterRT" Content="Filter out realtime responses" IsChecked="{Binding Path=ResponseLogFilterRT}" IsEnabled="{Binding Path=ResponseLogVerbose}" HorizontalAlignment="Left" Margin="10,8,0,0" VerticalAlignment="Top"/>
+            <CheckBox x:Uid="lbl_showAll" Content="Show all realtime responses" IsChecked="{Binding Path=ResponseLogShowRTAll}" IsEnabled="{Binding Path=ResponseLogVerbose}" HorizontalAlignment="Left" Margin="10,8,0,0" VerticalAlignment="Top"/>
+            <Button x:Uid="btn_clear" Content="Clear" HorizontalAlignment="Right" Margin="0,5,5,0" VerticalAlignment="Top" Width="75" Click="btn_Clear"/>
         </DockPanel>
         <TextBox IsReadOnly="True" TextWrapping="NoWrap" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
                  local:TextBoxUtilities.AlwaysScrollToEnd="True" FontSize="10" FontFamily="Verdana"
diff --git a/CNC Controls/CNC Controls/ConsoleWindow.xaml b/CNC Controls/CNC Controls/ConsoleWindow.xaml
index 921bdb7..5a1ec69 100644
--- a/CNC Controls/CNC Controls/ConsoleWindow.xaml	
+++ b/CNC Controls/CNC Controls/ConsoleWindow.xaml	
@@ -7,6 +7,7 @@
         mc:Ignorable="d"
         ShowActivated="False"
         Background="#FFE5E5E5"
+        x:Uid="dlg_senderConsole"
         Title="Sender Console" Height="500" MinHeight="115" Width="500" MinWidth="350" Icon="App.ico" ShowInTaskbar="False"
         Closing="Window_Closing" WindowStyle="ToolWindow">
     <local:ConsoleControl/>
diff --git a/CNC Controls/CNC Controls/CoolantControl.xaml b/CNC Controls/CNC Controls/CoolantControl.xaml
index 6314730..f014471 100644
--- a/CNC Controls/CNC Controls/CoolantControl.xaml	
+++ b/CNC Controls/CNC Controls/CoolantControl.xaml	
@@ -9,11 +9,11 @@
     <UserControl.Resources>
         <local:BoolToVisibleConverter x:Key="IsVisibleConverter" />
     </UserControl.Resources>
-    <GroupBox x:Name="grpCoolant" Header="Coolant" HorizontalAlignment="Left" VerticalAlignment="Top" Width="216">
+    <GroupBox x:Uid="grp_coolant" x:Name="grpCoolant" Header="Coolant" HorizontalAlignment="Left" VerticalAlignment="Top" Width="216">
         <StackPanel HorizontalAlignment="Left" Margin="3,3,0,0" Grid.Row="1" VerticalAlignment="Top" Width="184">
-            <CheckBox x:Name="chkFlood" Tag="Flood" Content="Flood" IsChecked="{Binding Path=Flood, Mode=OneWay}" HorizontalAlignment="Left" Margin="20,3,0,0" VerticalAlignment="Top" Click="chkBox_Click"/>
-            <CheckBox x:Name="chkMist" Tag="Mist" Content="Mist" IsChecked="{Binding Path=Mist, Mode=OneWay}"  HorizontalAlignment="Left" Margin="20,3,0,0" VerticalAlignment="Top" Click="chkBox_Click"/>
-            <CheckBox x:Name="chkFan" Tag="Fan" Content="Fan" IsChecked="{Binding Path=Fan0, Mode=OneWay}"  Visibility="{Binding Path=HasFans, Mode=OneWay, Converter={StaticResource IsVisibleConverter}}" HorizontalAlignment="Left" Margin="20,3,0,0" VerticalAlignment="Top" Click="chkBox_Click"/>
+            <CheckBox x:Uid="lbl_flood" x:Name="chkFlood" Tag="Flood" Content="Flood" IsChecked="{Binding Path=Flood, Mode=OneWay}" HorizontalAlignment="Left" Margin="20,3,0,0" VerticalAlignment="Top" Click="chkBox_Click"/>
+            <CheckBox x:Uid="lbl_mist" x:Name="chkMist" Tag="Mist" Content="Mist" IsChecked="{Binding Path=Mist, Mode=OneWay}"  HorizontalAlignment="Left" Margin="20,3,0,0" VerticalAlignment="Top" Click="chkBox_Click"/>
+            <CheckBox x:Uid="lbl_fan" x:Name="chkFan" Tag="Fan" Content="Fan" IsChecked="{Binding Path=Fan0, Mode=OneWay}"  Visibility="{Binding Path=HasFans, Mode=OneWay, Converter={StaticResource IsVisibleConverter}}" HorizontalAlignment="Left" Margin="20,3,0,0" VerticalAlignment="Top" Click="chkBox_Click"/>
         </StackPanel>
     </GroupBox>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/CoordValueSetControl.xaml b/CNC Controls/CNC Controls/CoordValueSetControl.xaml
index 546e2e7..5efd437 100644
--- a/CNC Controls/CNC Controls/CoordValueSetControl.xaml	
+++ b/CNC Controls/CNC Controls/CoordValueSetControl.xaml	
@@ -17,6 +17,6 @@
             Unit="{Binding Path=Unit, Mode=OneWay}"
             Label="{Binding Path=Label, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=OneWay}"
         />
-        <Button x:Name="btnSet" Content="Set" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="35" Height="22" Margin="0,4" Click="btnSet_Click"/>
+        <Button x:Uid="btn_set" x:Name="btnSet" Content="Set" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="35" Height="22" Margin="0,4" Click="btnSet_Click"/>
     </Grid>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/DROControl.xaml b/CNC Controls/CNC Controls/DROControl.xaml
index 66fe0ce..bc3175e 100644
--- a/CNC Controls/CNC Controls/DROControl.xaml	
+++ b/CNC Controls/CNC Controls/DROControl.xaml	
@@ -19,7 +19,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <GroupBox x:Name="grpDRO" Header="DRO" HorizontalAlignment="Center" VerticalAlignment="Top" Width="216">
+    <GroupBox x:Uid="grp_dro" x:Name="grpDRO" Header="DRO" HorizontalAlignment="Center" VerticalAlignment="Top" Width="216">
         <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="2,5,0,5">
             <Label x:Name="lblXMode" Content="{Binding Path=LatheMode, Mode=OneWay, Converter={StaticResource LatheModeConverter}}" Visibility="{Binding Path=LatheModeEnabled, Mode=OneWay, Converter={StaticResource IsVisibleConverter}}" Height="25" HorizontalContentAlignment="Right" Margin="20,0,65,0"/>
             <local:DROBaseControl x:Name="axisX" Label="X"
@@ -46,7 +46,7 @@
                 Value="{Binding Path=Position.C, Mode=TwoWay}"
                 IsScaled="{Binding Path=AxisScaled[(gcode:AxisFlags)C], Mode=OneWay}"
             />
-            <Button x:Name="btnZeroAll" Content="Zero all" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" Focusable="False" Height="28" Width="180" HorizontalAlignment="Center" Margin="2,3" Click="btnZeroAll_Click"/>
+            <Button x:Uid="btn_zeroAll" x:Name="btnZeroAll" Content="Zero all" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" Focusable="False" Height="28" Width="180" HorizontalAlignment="Center" Margin="2,3" Click="btnZeroAll_Click"/>
         </StackPanel>
     </GroupBox>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/FeedControl.xaml b/CNC Controls/CNC Controls/FeedControl.xaml
index 32d7050..49382fa 100644
--- a/CNC Controls/CNC Controls/FeedControl.xaml	
+++ b/CNC Controls/CNC Controls/FeedControl.xaml	
@@ -7,7 +7,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="160" d:DesignWidth="216">
     <Grid>
-        <GroupBox x:Name="grpFeedRate" Header="Feed rate" HorizontalAlignment="Left" VerticalAlignment="Top" Height="160" Width="216">
+        <GroupBox x:Uid="grp_feedrate" x:Name="grpFeedRate" Header="Feed rate" HorizontalAlignment="Left" VerticalAlignment="Top" Height="160" Width="216">
             <Grid HorizontalAlignment="Center" Height="135" VerticalAlignment="Top" Width="206">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="25*"/>
@@ -17,10 +17,9 @@
                 <local:NumericTextBox x:Name="cvFeedRate" Value="{Binding Path=FeedRate, Mode=OneWay}" Format="####0" Background="#FFF8F8F8" HorizontalAlignment="Left" Margin="10,0,0,0" IsReadOnly="True" Focusable="False" VerticalAlignment="Center" Width="50"/>
                 <Label x:Name="lblFeedRrate" Content="{Binding Path=FeedrateUnit, Mode=OneWay}" HorizontalAlignment="Left" Margin="60,00,0,0" VerticalAlignment="Center"/>
                 <local:OverrideControl x:Name="feedOverrideControl" Value="{Binding Path=FeedOverride, Mode=OneWay}" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,3,0" Grid.Row="1" CommandGenerated="override_CommandGenerated" EncoderMode="FeedRate"/>
-                <Label x:Name="lblRapids" Content="Rapids:" HorizontalAlignment="Left" Margin="5,20,0,2" Grid.Row="1" VerticalAlignment="Center" Grid.RowSpan="2" Height="26"/>
+                <Label x:Uid="lbl_rapids" x:Name="lblRapids" Content="Rapids:" HorizontalAlignment="Left" Margin="5,20,0,2" Grid.Row="1" VerticalAlignment="Center" Grid.RowSpan="2" Height="26"/>
                 <local:OverrideControl x:Name="rapidsOverrideControl" Value="{Binding Path=RapidsOverride, Mode=OneWay}" MinusOnly="True" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,3,0" Grid.Row="3" CommandGenerated="override_CommandGenerated" EncoderMode="RapidRate"/>
             </Grid>
         </GroupBox>
-
     </Grid>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/GCodeListControl.xaml b/CNC Controls/CNC Controls/GCodeListControl.xaml
index 20b6a02..6528ee7 100644
--- a/CNC Controls/CNC Controls/GCodeListControl.xaml	
+++ b/CNC Controls/CNC Controls/GCodeListControl.xaml	
@@ -10,9 +10,9 @@
     <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">
         <DataGrid.Columns>
-            <DataGridTextColumn Header="Block" Binding="{Binding LineNum}" Width="50" MinWidth="50" MaxWidth="60"/>
+            <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 Header="Data" Binding="{Binding Data}" Width="*" MinWidth="280"/>
+            <DataGridTextColumn x:Uid="hdr_data" Header="Data" Binding="{Binding Data}" Width="*" MinWidth="280"/>
         </DataGrid.Columns>
     </DataGrid>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/GCodeRotateDialog.xaml b/CNC Controls/CNC Controls/GCodeRotateDialog.xaml
index f50584f..db122fa 100644
--- a/CNC Controls/CNC Controls/GCodeRotateDialog.xaml	
+++ b/CNC Controls/CNC Controls/GCodeRotateDialog.xaml	
@@ -13,13 +13,13 @@
     </Window.Resources>
     <Grid Background="#FFE5E5E5">
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Height="Auto" Margin="5,5">
-            <local:NumericField x:Name="Angle" Label="Angle:" ColonAt="50" Unit="degrees" Format="-##0.#" Value="{Binding Path=Angle, Mode=TwoWay}"/>
-            <GroupBox Header="Rotation center" Width="100" HorizontalAlignment="Left" Margin="10,0" ToolTip="Click to select rotation center relative to job, if not selected X0,Y0 is used.">
+            <local:NumericField x:Uid="fld_angle" x:Name="Angle" Label="Angle:" ColonAt="50" Unit="degrees" Format="-##0.#" Value="{Binding Path=Angle, Mode=TwoWay}"/>
+            <GroupBox x:Uid="grp_rotationCenter" Header="Rotation center" Width="100" HorizontalAlignment="Left" Margin="10,0" ToolTip="Click to select rotation center relative to job, if not selected X0,Y0 is used.">
                 <local:OriginControl Value="{Binding Path=Origin, Mode=TwoWay}" HorizontalAlignment="Center"/>
             </GroupBox>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" Width="Auto" Margin="0,10,0,0">
-                <Button x:Name="btnOk" Content="Ok" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
-                <Button x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
+                <Button x:Uid="btn_ok" x:Name="btnOk" Content="Ok" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
+                <Button x:Uid="btn_cancel" x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/CNC Controls/CNC Controls/GotoControl.xaml b/CNC Controls/CNC Controls/GotoControl.xaml
index 6d61a08..b053411 100644
--- a/CNC Controls/CNC Controls/GotoControl.xaml	
+++ b/CNC Controls/CNC Controls/GotoControl.xaml	
@@ -20,8 +20,8 @@
     <Border BorderBrush="DarkGray" BorderThickness="1" CornerRadius="3" Background="#FFE5E5EA">
         <Grid>
             <StackPanel Margin="5,15,25,15">
-                <Button Tag="G28" Content="Goto position 1 (G28)" IsEnabled="{Binding Path=HomedState, Mode=OneWay, Converter={StaticResource IsHomed}}" Focusable="False" HorizontalAlignment="Left" Margin="5,5,0,0" Width="150" VerticalAlignment="Top" Click="button_Click"/>
-                <Button Tag="G30" Content="Goto position 2 (G30)" IsEnabled="{Binding Path=HomedState, Mode=OneWay, Converter={StaticResource IsHomed}}" Focusable="False" HorizontalAlignment="Left" Margin="5,5,0,0" Width="150" VerticalAlignment="Top" Click="button_Click"/>
+                <Button x:Uid="btn_gotoG28" Tag="G28" Content="Goto position 1 (G28)" IsEnabled="{Binding Path=HomedState, Mode=OneWay, Converter={StaticResource IsHomed}}" Focusable="False" HorizontalAlignment="Left" Margin="5,5,0,0" Width="150" VerticalAlignment="Top" Click="button_Click"/>
+                <Button x:Uid="btn_gotoG30" Tag="G30" Content="Goto position 2 (G30)" IsEnabled="{Binding Path=HomedState, Mode=OneWay, Converter={StaticResource IsHomed}}" Focusable="False" HorizontalAlignment="Left" Margin="5,5,0,0" Width="150" VerticalAlignment="Top" Click="button_Click"/>
             </StackPanel>
             <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>
diff --git a/CNC Controls/CNC Controls/GrblConfigView.xaml b/CNC Controls/CNC Controls/GrblConfigView.xaml
index 86216c5..2e68b1c 100644
--- a/CNC Controls/CNC Controls/GrblConfigView.xaml	
+++ b/CNC Controls/CNC Controls/GrblConfigView.xaml	
@@ -62,10 +62,10 @@
         </DataGrid>
         <DockPanel x:Name="dpan" DockPanel.Dock="Left">
             <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Stretch" Height="Auto" Margin="10,0,10,10" VerticalAlignment="Top" Width="Auto">
-                <Button x:Name="btnReload" Content="Reload" ToolTip="Reload settings from controller." HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Click="btnReload_Click"/>
-                <Button x:Name="btnSave" Content="Save" ToolTip="Save changed settings to controller." HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnSave_Click"/>
-                <Button x:Name="btnBackup" Content="Backup" HorizontalAlignment="Left" Margin="230,0,0,0" VerticalAlignment="Top" Width="75" Click="btnBackup_Click"/>
-                <Button x:Name="btnRestore" Content="Restore" HorizontalAlignment="Right" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnRestore_Click"/>
+                <Button x:Uid="btn_reload" x:Name="btnReload" Content="Reload" ToolTip="Reload settings from controller." HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" 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" Width="75" Click="btnSave_Click"/>
+                <Button x:Uid="btn_backup" x:Name="btnBackup" Content="Backup" HorizontalAlignment="Left" Margin="230,0,0,0" VerticalAlignment="Top" Width="75" Click="btnBackup_Click"/>
+                <Button x:Uid="btn_restore" x:Name="btnRestore" Content="Restore" HorizontalAlignment="Right" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnRestore_Click"/>
             </StackPanel>
             <StackPanel x:Name="details" DockPanel.Dock="Top" HorizontalAlignment="Left" Height="Auto" Margin="5,15,0,0" VerticalAlignment="Top">
                 <StackPanel x:Name="canvas" HorizontalAlignment="Left" Height="Auto" VerticalAlignment="Center" Width="455"/>
diff --git a/CNC Controls/CNC Controls/JobControl.xaml b/CNC Controls/CNC Controls/JobControl.xaml
index f72ed91..5dc46c4 100644
--- a/CNC Controls/CNC Controls/JobControl.xaml	
+++ b/CNC Controls/CNC Controls/JobControl.xaml	
@@ -14,9 +14,9 @@
         </Style>
     </UserControl.Resources>
     <StackPanel Orientation="Horizontal">
-        <Button x:Name="btnStart" Content="Cycle Start" ToolTip="Alt+R" Style="{StaticResource JobButtonStyle}" Click="btnStart_Click"/>
-        <Button x:Name="btnHold" Content="Feed Hold" ToolTip="Space" Style="{StaticResource JobButtonStyle}" Margin="5,0,0,0" Click="btnHold_Click"/>
-        <Button x:Name="btnStop" Content="Stop" ToolTip="Alt+S" Style="{StaticResource JobButtonStyle}" Margin="5,0,0,0" Click="btnStop_Click"/>
-        <Button x:Name="btnRewind" Content="Rewind" Style="{StaticResource JobButtonStyle}" Margin="5,0,0,0" Click="btnRewind_Click"/>
+        <Button x:Uid="btn_cycleStart" x:Name="btnStart" Content="Cycle Start" ToolTip="Alt+R" Style="{StaticResource JobButtonStyle}" Click="btnStart_Click"/>
+        <Button x:Uid="btn_feedHold" x:Name="btnHold" Content="Feed Hold" ToolTip="Space" Style="{StaticResource JobButtonStyle}" Margin="5,0,0,0" Click="btnHold_Click"/>
+        <Button x:Uid="btn_stop" x:Name="btnStop" Content="Stop" ToolTip="Alt+S" Style="{StaticResource JobButtonStyle}" Margin="5,0,0,0" Click="btnStop_Click"/>
+        <Button x:Uid="btn_rewind" x:Name="btnRewind" Content="Rewind" Style="{StaticResource JobButtonStyle}" Margin="5,0,0,0" Click="btnRewind_Click"/>
     </StackPanel>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/JobControl.xaml.cs b/CNC Controls/CNC Controls/JobControl.xaml.cs
index 152036b..e38abe2 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.34 / 2021-07-04 / Io Engineering (Terje Io)
+ * v0.35 / 2021-09-22 / Io Engineering (Terje Io)
  *
  */
 
@@ -75,7 +75,7 @@ private struct StreamingHandlerFn
 
         private struct JobData
         {
-            public int CurrLine, PendingLine, PgmEndLine, ACKPending, serialUsed;
+            public int CurrLine, PendingLine, PgmEndLine, ToolChangeLine, ACKPending, serialUsed;
             public bool Started, Complete, IsSDFile;
             public DataRow CurrentRow, NextRow;
         }
@@ -215,6 +215,7 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                             job.NextRow = null;
                         else
                         {
+                            job.ToolChangeLine = -1;
                             job.CurrLine = job.PendingLine = job.ACKPending = model.BlockExecuting = 0;
                             job.PgmEndLine = GCode.File.Blocks - 1;
                             if ((sender as GrblViewModel).IsPhysicalFileLoaded)
@@ -389,7 +390,7 @@ void btnStart_Click(object sender, RoutedEventArgs e)
 
         public void CycleStart()
         {
-            if (grblState.State == GrblStates.Hold || (grblState.State == GrblStates.Run && grblState.Substate == 1))
+            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));
             else if(grblState.State == GrblStates.Idle && model.SDRewind) {
                 streamingHandler.Call(StreamingState.Start, false);
@@ -408,8 +409,8 @@ public void CycleStart()
             else if (GCode.File.IsLoaded)
             {
                 model.RunTime = "";
-                model.BlockExecuting = -1;
-                job.ACKPending = job.CurrLine = job.ACKPending = job.serialUsed = 0;
+                job.ToolChangeLine = model.BlockExecuting = -1;
+                job.ACKPending = job.CurrLine = job.serialUsed = 0;
                 job.Started = false;
                 job.NextRow = GCode.File.Data.Rows[0];
                 Comms.com.PurgeQueue();
@@ -466,6 +467,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.PgmEndLine = GCode.File.Blocks - 1;
 
@@ -509,9 +511,12 @@ public bool StreamingToolChange(StreamingState newState, bool always)
                     if (JobTimer.IsRunning)
                     {
                         model.IsJobRunning = true;
-                        GCode.File.Data.Rows[job.PendingLine]["Sent"] = "ok";
+                        if (job.ToolChangeLine >= 0) {
+                            GCode.File.Data.Rows[job.ToolChangeLine]["Sent"] = "ok";
+                            job.ToolChangeLine = -1;
+                        }
                         SetStreamingHandler(StreamingHandler.SendFile);
-                        SendNextLine();
+                       // SendNextLine();
                     }
                     else
                         SetStreamingHandler(StreamingHandler.Previous);
@@ -892,8 +897,12 @@ void GrblStateChanged(GrblState newstate)
                         if (grblState.State != GrblStates.Jog)
                         {
                             if (JobTimer.IsRunning)
-                                ResponseReceived("pending");
-                            streamingHandler.Call(StreamingState.ToolChange, false);
+                            {
+                                job.ToolChangeLine = job.PendingLine - 1;
+                                GCode.File.Data.Rows[job.ToolChangeLine]["Sent"] = "pending";
+                          //      ResponseReceived("pending");
+                            }
+                            streamingHandler.Call(StreamingState.ToolChange, true);
                             if (!grblState.MPG)
                                 Comms.com.WriteByte(GrblConstants.CMD_TOOL_ACK);
                         }
@@ -908,7 +917,10 @@ void GrblStateChanged(GrblState newstate)
                     {
                         if (streamingState == StreamingState.Send)
                             streamingHandler.Call(StreamingState.FeedHold, false);
-                    }
+                        else
+                            btnStart.IsEnabled = false;
+                    } else
+                        btnStart.IsEnabled = true;
                     break;
 
                 case GrblStates.Alarm:
@@ -925,7 +937,14 @@ private void ResponseReceived(string response)
         {
             if (streamingHandler.Count)
             {
-                if (job.ACKPending > 0 && response != "pending")
+                //if(response == "pending")
+                //{
+                //    job.ToolChangeLine = job.PendingLine - 1;
+                //    GCode.File.Data.Rows[job.ToolChangeLine]["Sent"] = response;
+                //    return;
+                //}
+
+                if (job.ACKPending > 0)
                     job.ACKPending--;
 
                 if (!job.IsSDFile && (string)GCode.File.Data.Rows[job.PendingLine]["Sent"] == "*")
diff --git a/CNC Controls/CNC Controls/JogConfigControl.xaml b/CNC Controls/CNC Controls/JogConfigControl.xaml
index 054d2be..58563ca 100644
--- a/CNC Controls/CNC Controls/JogConfigControl.xaml	
+++ b/CNC Controls/CNC Controls/JogConfigControl.xaml	
@@ -9,18 +9,18 @@
     <UserControl.Resources>
         <local:BoolToVisibleConverter x:Key="IsVisibleConverter" />
     </UserControl.Resources>
-    <GroupBox x:Name="grpJog" Header="Keyboard jogging" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
+    <GroupBox x:Uid="grp_kbdJogging" x:Name="grpJog" Header="Keyboard jogging" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
         <StackPanel HorizontalAlignment="Left" Height="Auto" Margin="0,3,0,0" VerticalAlignment="Top" Width="235">
             <StackPanel Orientation="Horizontal" Visibility="{Binding Path=IsGrbl, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource IsVisibleConverter}}" ToolTip="Warning! - Grbl has outstanding bug(s) in jog cancel (on key up).">
-                <CheckBox Content="Enable" IsChecked="{Binding Path=Jog.KeyboardEnable, Mode=TwoWay}" Margin="90,3,0,3"/>
+                <CheckBox x:Uid="lbl_enable" Content="Enable" IsChecked="{Binding Path=Jog.KeyboardEnable, Mode=TwoWay}" Margin="90,3,0,3"/>
                 <Image HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0" Source="Resources/StatusAnnotations_Warning_16xLG_color.png"/>
             </StackPanel>
-            <local:NumericField Label="Fast feedrate:" ColonAt="90" Unit="mm/min" Format="###0" Value="{Binding Path=Jog.FastFeedrate, Mode=TwoWay}"/>
-            <local:NumericField Label="Fast distance:" ColonAt="90" Value="{Binding Path=Jog.FastDistance, Mode=TwoWay}" />
-            <local:NumericField Label="Slow feedrate:" ColonAt="90" Unit="mm/min" Format="###0" Value="{Binding Path=Jog.SlowFeedrate, Mode=TwoWay}"/>
-            <local:NumericField Label="Slow distance:" ColonAt="90" Value="{Binding Path=Jog.SlowDistance, Mode=TwoWay}" />
-            <local:NumericField Label="Step feedrate:" ColonAt="90" Unit="mm/min" Format="###0" Value="{Binding Path=Jog.StepFeedrate, Mode=TwoWay}"/>
-            <local:NumericField Label="Step distance:" ColonAt="90" Value="{Binding Path=Jog.StepDistance, Mode=TwoWay}" />
+            <local:NumericField x:Uid="fld_fastFeedrate" Label="Fast feedrate:" Localization.Attributes = "$Content (Inherit)" ColonAt="90" Unit="mm/min" Format="###0" Value="{Binding Path=Jog.FastFeedrate, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="fld_fastDistance" Label="Fast distance:" ColonAt="90" Value="{Binding Path=Jog.FastDistance, Mode=TwoWay}" />
+            <local:NumericField x:Uid="fld_slowFeedrate" Label="Slow feedrate:" ColonAt="90" Unit="mm/min" Format="###0" Value="{Binding Path=Jog.SlowFeedrate, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="fld_slowDistance" Label="Slow distance:" ColonAt="90" Value="{Binding Path=Jog.SlowDistance, Mode=TwoWay}" />
+            <local:NumericField x:Uid="fld_stepFeedrate" Label="Step feedrate:" ColonAt="90" Unit="mm/min" Format="###0" Value="{Binding Path=Jog.StepFeedrate, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="fld_stepDistance" Label="Step distance:" ColonAt="90" Value="{Binding Path=Jog.StepDistance, Mode=TwoWay}" />
         </StackPanel>
     </GroupBox>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/JogControl.xaml b/CNC Controls/CNC Controls/JogControl.xaml
index ad9272c..89b3fa0 100644
--- a/CNC Controls/CNC Controls/JogControl.xaml	
+++ b/CNC Controls/CNC Controls/JogControl.xaml	
@@ -35,7 +35,7 @@
     <Border BorderBrush="DarkGray" BorderThickness="1" CornerRadius="3" Background="#FFE5E5EA">
         <Grid>
             <StackPanel>
-                <GroupBox Header="Distance" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Height="114" Width="80">
+                <GroupBox x:Uid="grp_jogDistance" Header="Distance" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Height="114" Width="80">
                     <StackPanel>
                         <RadioButton Tag="3" Content="{Binding Path=JogData.Distance3, RelativeSource={RelativeSource AncestorType=UserControl}}" IsChecked="{Binding Path=JogData.StepSize, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=Step3}" HorizontalAlignment="Left" Margin="10,5,0,0" VerticalAlignment="Top" Click="distance_Click"/>
                         <RadioButton Tag="2" Content="{Binding Path=JogData.Distance2, RelativeSource={RelativeSource AncestorType=UserControl}}" IsChecked="{Binding Path=JogData.StepSize, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=Step2}" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top" Click="distance_Click"/>
@@ -45,7 +45,7 @@
                     </StackPanel>
                 </GroupBox>
 
-                <GroupBox Header="Feed rate" HorizontalAlignment="Left" Margin="5,0,0,4" VerticalAlignment="Top" Height="114" Width="80">
+                <GroupBox x:Uid="grp_jogFeedrate" Header="Feed rate" HorizontalAlignment="Left" Margin="5,0,0,4" VerticalAlignment="Top" Height="114" Width="80">
                     <StackPanel>
                         <RadioButton Tag="3" Content="{Binding Path=JogData.Feedrate3, RelativeSource={RelativeSource AncestorType=UserControl}}" IsChecked="{Binding Path=JogData.Feed, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=Feed3}"  HorizontalAlignment="Left" Margin="10,5,0,0" VerticalAlignment="Top" Click="feedrate_Click"/>
                         <RadioButton Tag="2" Content="{Binding Path=JogData.Feedrate2, RelativeSource={RelativeSource AncestorType=UserControl}}" IsChecked="{Binding Path=JogData.Feed, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=Feed2}" HorizontalAlignment="Left" Margin="10,3,0,0" VerticalAlignment="Top" Click="feedrate_Click"/>
diff --git a/CNC Controls/CNC Controls/JogUiConfigControl.xaml b/CNC Controls/CNC Controls/JogUiConfigControl.xaml
index e4ab6cd..6d21885 100644
--- a/CNC Controls/CNC Controls/JogUiConfigControl.xaml	
+++ b/CNC Controls/CNC Controls/JogUiConfigControl.xaml	
@@ -6,16 +6,16 @@
              xmlns:local="clr-namespace:CNC.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="250" d:DesignWidth="250">
-    <GroupBox x:Name="grpJog" Header="UI jogging" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
+    <GroupBox x:Name="grp_uiJog" Header="UI jogging" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
         <StackPanel HorizontalAlignment="Left" Height="Auto" Margin="0,3,0,0" VerticalAlignment="Top" Width="235">
-            <local:NumericField Label="Distance 3:" ColonAt="90" Unit="mm" Format="###0.0##" Value="{Binding Path=JogUiMetric.Distance3, Mode=TwoWay}"/>
-            <local:NumericField Label="Distance 2:" ColonAt="90" Unit="mm" Format="###0.0##" Value="{Binding Path=JogUiMetric.Distance2, Mode=TwoWay}"/>
-            <local:NumericField Label="Distance 1:" ColonAt="90" Unit="mm" Format="###0.0##" Value="{Binding Path=JogUiMetric.Distance1, Mode=TwoWay}"/>
-            <local:NumericField Label="Distance 0:" ColonAt="90" Unit="mm" Format="###0.0##" Value="{Binding Path=JogUiMetric.Distance0, Mode=TwoWay}"/>
-            <local:NumericField Label="Feedrate 3:" ColonAt="90" Unit="mm/min" Format="####0" Value="{Binding Path=JogUiMetric.Feedrate3, Mode=TwoWay}"/>
-            <local:NumericField Label="Feedrate 2:" ColonAt="90" Unit="mm/min" Format="####0" Value="{Binding Path=JogUiMetric.Feedrate2, Mode=TwoWay}"/>
-            <local:NumericField Label="Feedrate 1:" ColonAt="90" Unit="mm/min" Format="####0" Value="{Binding Path=JogUiMetric.Feedrate1, Mode=TwoWay}"/>
-            <local:NumericField Label="Feedrate 0:" ColonAt="90" Unit="mm/min" Format="####0" Value="{Binding Path=JogUiMetric.Feedrate0, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="lbl_distance3" Label="Distance 3:" ColonAt="90" Unit="mm" Format="###0.0##" Value="{Binding Path=JogUiMetric.Distance3, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="lbl_distance2" Label="Distance 2:" ColonAt="90" Unit="mm" Format="###0.0##" Value="{Binding Path=JogUiMetric.Distance2, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="lbl_distance1" Label="Distance 1:" ColonAt="90" Unit="mm" Format="###0.0##" Value="{Binding Path=JogUiMetric.Distance1, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="lbl_distance0" Label="Distance 0:" ColonAt="90" Unit="mm" Format="###0.0##" Value="{Binding Path=JogUiMetric.Distance0, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="lbl_feedrate3" Label="Feedrate 3:" ColonAt="90" Unit="mm/min" Format="####0" Value="{Binding Path=JogUiMetric.Feedrate3, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="lbl_feedrate2" Label="Feedrate 2:" ColonAt="90" Unit="mm/min" Format="####0" Value="{Binding Path=JogUiMetric.Feedrate2, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="lbl_feedrate1" Label="Feedrate 1:" ColonAt="90" Unit="mm/min" Format="####0" Value="{Binding Path=JogUiMetric.Feedrate1, Mode=TwoWay}"/>
+            <local:NumericField x:Uid="lbl_feedrate0" Label="Feedrate 0:" ColonAt="90" Unit="mm/min" Format="####0" Value="{Binding Path=JogUiMetric.Feedrate0, Mode=TwoWay}"/>
         </StackPanel>
     </GroupBox>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/KeypressHandler.cs b/CNC Controls/CNC Controls/KeypressHandler.cs
index e4d102b..8e9e186 100644
--- a/CNC Controls/CNC Controls/KeypressHandler.cs	
+++ b/CNC Controls/CNC Controls/KeypressHandler.cs	
@@ -1,7 +1,7 @@
 /*
  * KeypressHandler.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.30 / 2021-04-08 / Io Engineering (Terje Io)
+ * v0.35 / 2021-10-20 / Io Engineering (Terje Io)
  *
  */
 
@@ -62,7 +62,7 @@ public class KeypressHandlerFn
             public Func<Key, bool> Call;
         }
 
-        private bool fullJog = false, preCancel = false;
+        private bool fullJog = false, preCancel = false, softLimits = false;
         private volatile Key[] axisjog = new Key[3] { Key.None, Key.None, Key.None };
         private double[] jogDistance = new double[3] { 0.05, 500.0, 500.0 };
         private double[] jogSpeed = new double[3] { 100.0, 200.0, 500.0 };
@@ -125,13 +125,16 @@ private void updateConfig()
             jogSpeed[(int)JogMode.Slow] = AppConfig.Settings.Jog.SlowFeedrate;
             jogSpeed[(int)JogMode.Fast] = AppConfig.Settings.Jog.FastFeedrate;
 
-            if(!GrblInfo.IsGrblHAL)
+            softLimits = GrblSettings.GetInteger(GrblSetting.SoftLimitsEnable) == 1;
+
+            if (!GrblInfo.IsGrblHAL)
                 fullJog = AppConfig.Settings.Jog.KeyboardEnable;
         }
 
         public bool ProcessKeypress(KeyEventArgs e, bool allowJog)
         {
             bool isJogging = IsJogging;
+            double[] dist = new double[3] { 0d, 0d, 0d };
 
             if (e.IsUp && isJogging)
             {
@@ -168,33 +171,33 @@ public bool ProcessKeypress(KeyEventArgs e, bool allowJog)
                 switch (e.Key)
                 {
                     case Key.PageUp:
-                        isJogging = axisjog[2] != Key.PageUp;
-                        axisjog[2] = Key.PageUp;
+                        isJogging = axisjog[GrblConstants.Z_AXIS] != Key.PageUp;
+                        axisjog[GrblConstants.Z_AXIS] = Key.PageUp;
                         break;
 
                     case Key.PageDown:
-                        isJogging = axisjog[2] != Key.PageDown;
-                        axisjog[2] = Key.PageDown;
+                        isJogging = axisjog[GrblConstants.Z_AXIS] != Key.PageDown;
+                        axisjog[GrblConstants.Z_AXIS] = Key.PageDown;
                         break;
 
                     case Key.Left:
-                        isJogging = axisjog[0] != Key.Left;
-                        axisjog[0] = Key.Left;
+                        isJogging = axisjog[GrblConstants.X_AXIS] != Key.Left;
+                        axisjog[GrblConstants.X_AXIS] = Key.Left;
                         break;
 
                     case Key.Up:
-                        isJogging = axisjog[1] != Key.Up;
-                        axisjog[1] = Key.Up;
+                        isJogging = axisjog[GrblConstants.Y_AXIS] != Key.Up;
+                        axisjog[GrblConstants.Y_AXIS] = Key.Up;
                         break;
 
                     case Key.Right:
-                        isJogging = axisjog[0] != Key.Right;
-                        axisjog[0] = Key.Right;
+                        isJogging = axisjog[GrblConstants.X_AXIS] != Key.Right;
+                        axisjog[GrblConstants.X_AXIS] = Key.Right;
                         break;
 
                     case Key.Down:
-                        isJogging = axisjog[1] != Key.Down;
-                        axisjog[1] = Key.Down;
+                        isJogging = axisjog[GrblConstants.Y_AXIS] != Key.Down;
+                        axisjog[GrblConstants.Y_AXIS] = Key.Down;
                         break;
                 }
             }
@@ -208,46 +211,56 @@ public bool ProcessKeypress(KeyEventArgs e, bool allowJog)
                     for (int i = 0; i < 2; i++) switch (axisjog[i])
                     {
                         case Key.Left:
-                            command += "Z-{0}";
+                            dist[GrblConstants.Z_AXIS] = -1d;
+                            command += "Z-{3}";
                             break;
 
                         case Key.Up:
-                            command += "X-{0}";
+                            dist[GrblConstants.X_AXIS] = -1d;
+                            command += "X-{1}";
                             break;
 
                         case Key.Right:
-                            command += "Z{0}";
+                            dist[GrblConstants.Z_AXIS] = 1d;
+                            command += "Z{3}";
                             break;
 
                         case Key.Down:
-                            command += "X{0}";
+                            dist[GrblConstants.X_AXIS] = 1d;
+                            command += "X{1}";
                             break;
                     }
                 }
                 else for (int i = 0; i < 3; i++) switch (axisjog[i])
                 {
                     case Key.PageUp:
-                        command += "Z{0}";
+                        dist[GrblConstants.Z_AXIS] = 1d;
+                        command += "Z{3}";
                         break;
 
                     case Key.PageDown:
-                        command += "Z-{0}";
+                        dist[GrblConstants.Z_AXIS] = -1d;
+                        command += "Z-{3}";
                         break;
 
                     case Key.Left:
-                        command += "X-{0}";
+                        dist[GrblConstants.X_AXIS] = -1d;
+                        command += "X-{1}";
                         break;
 
                     case Key.Up:
-                        command += "Y{0}";
+                        dist[GrblConstants.Y_AXIS] = 1d;
+                        command += "Y{2}";
                         break;
 
                     case Key.Right:
-                        command += "X{0}";
+                        dist[GrblConstants.X_AXIS] = 1d;
+                        command += "X{1}";
                         break;
 
                     case Key.Down:
-                        command += "Y-{0}";
+                        dist[GrblConstants.Y_AXIS] = -1d;
+                        command += "Y-{2}";
                         break;
                 }
 
@@ -276,10 +289,34 @@ public bool ProcessKeypress(KeyEventArgs e, bool allowJog)
                         jogMode = JogMode.None;
                     }
 
-                    if(jogMode != JogMode.None)
-                        SendJogCommand("$J=G91" + string.Format(command + "F{1}",
-                                                        jogDistance[(int)jogMode].ToInvariantString(),
-                                                         jogSpeed[(int)jogMode].ToInvariantString()));
+                    if (jogMode != JogMode.None)
+                    {
+                        if (GrblInfo.IsGrblHAL || !softLimits)
+                        {
+                            var distance = jogDistance[(int)jogMode].ToInvariantString();
+                            SendJogCommand("$J=G91G21" + string.Format(command + "F{0}",
+                                                             jogSpeed[(int)jogMode].ToInvariantString(),
+                                                              distance, distance, distance));
+                        }
+                        else
+                        {
+                            for (int i = 0; i < 3; i++)
+                            {
+                                if (dist[i] != 0d)
+                                {
+                                    if(GrblInfo.HomingDirection.HasFlag(GrblInfo.AxisIndexToFlag(i)))
+                                        dist[i] = dist[i] < 0d ? grbl.MachinePosition.Values[i] : Math.Max(0d, GrblInfo.MaxTravel.Values[i] - grbl.MachinePosition.Values[i] - .5d);
+                                    else
+                                        dist[i] = dist[i] > 0d ? (- grbl.MachinePosition.Values[i] - .5d) : Math.Max(0d, GrblInfo.MaxTravel.Values[i] + grbl.MachinePosition.Values[i] - .5d);
+                                }
+                            }
+                            SendJogCommand("$J=G91G21" + string.Format(command + "F{0}",
+                                                             jogSpeed[(int)jogMode].ToInvariantString(),
+                                                              dist[GrblConstants.X_AXIS].ToInvariantString(),
+                                                               dist[GrblConstants.Y_AXIS].ToInvariantString(),
+                                                                dist[GrblConstants.Z_AXIS].ToInvariantString()));
+                        }
+                    }
 
                     return jogMode != JogMode.None;
                 }
diff --git a/CNC Controls/CNC Controls/LimitsControl.xaml b/CNC Controls/CNC Controls/LimitsControl.xaml
index b28d81b..85a4504 100644
--- a/CNC Controls/CNC Controls/LimitsControl.xaml	
+++ b/CNC Controls/CNC Controls/LimitsControl.xaml	
@@ -9,7 +9,7 @@
     <UserControl.Resources>
         <ResourceDictionary Source="SharedStyles.xaml"/>
     </UserControl.Resources>
-    <GroupBox x:Name="grpLimits" Header="Program limits" HorizontalAlignment="Center" VerticalAlignment="Top" Width="216">
+    <GroupBox x:Uid="grp_programLimits" x:Name="grpLimits" Header="Program limits" HorizontalAlignment="Center" VerticalAlignment="Top" Width="216">
         <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="2,5,0,5">
             <local:LimitsBaseControl x:Name="axisX" Label="X"
                 MinValue="{Binding Path=ProgramLimits.MinX, Mode=OneWay}"
diff --git a/CNC Controls/CNC Controls/MDIControl.xaml b/CNC Controls/CNC Controls/MDIControl.xaml
index 4734224..9845bd0 100644
--- a/CNC Controls/CNC Controls/MDIControl.xaml	
+++ b/CNC Controls/CNC Controls/MDIControl.xaml	
@@ -9,10 +9,10 @@
     <UserControl.Resources>
         <local:LogicalNotConverter x:Key="BooleanConverter" />
     </UserControl.Resources>
-    <GroupBox x:Name="grpMDI" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" Header="MDI" Margin="0,0" HorizontalAlignment="Center" VerticalAlignment="Top">
+    <GroupBox x:Uid="grp_mdi" x:Name="grpMDI" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" Header="MDI" Margin="0,0" HorizontalAlignment="Center" VerticalAlignment="Top">
         <StackPanel Orientation="Horizontal">
             <ComboBox x:Name="txtMDI" IsEditable="True" ItemsSource="{Binding Path=Commands, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" SelectedItem="{Binding Path=Command, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Text="{Binding Path=Command, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" IsTextSearchEnabled="False" HorizontalAlignment="Left" Height="22" Margin="3,0" VerticalAlignment="Center" Width="375" SelectionChanged="txtMDI_SelectionChanged" KeyDown="txtMDI_KeyDown" Loaded="MDIControl_Loaded"/>
-            <Button Command="{Binding MDICommand}" CommandParameter="{Binding Path=Command, RelativeSource={RelativeSource AncestorType=UserControl}}" Content="Send" Focusable="False" Grid.Column="1" HorizontalAlignment="Right" Margin="3,0" VerticalAlignment="Center" Width="42" Height="22" Click="Send_Click"/>
+            <Button x:Uid="btn_send" Command="{Binding MDICommand}" CommandParameter="{Binding Path=Command, RelativeSource={RelativeSource AncestorType=UserControl}}" Content="Send" Focusable="False" Grid.Column="1" HorizontalAlignment="Right" Margin="3,0" VerticalAlignment="Center" Width="42" Height="22" Click="Send_Click"/>
         </StackPanel>
     </GroupBox>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/MPGPending.xaml b/CNC Controls/CNC Controls/MPGPending.xaml
index c1c6d20..f2ddc80 100644
--- a/CNC Controls/CNC Controls/MPGPending.xaml	
+++ b/CNC Controls/CNC Controls/MPGPending.xaml	
@@ -8,6 +8,6 @@
         Title="Sender" Height="125" Width="460" ResizeMode="NoResize"
         Closing="Window_Closing" Icon="App.ico">
     <Grid Background="Snow">
-        <Label x:Name="label" Content="MPG mode active, waiting for it to be disabled..." HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center" FontSize="16"/>
+        <Label x:Uid="lbl_mpgModeActive" x:Name="label" Content="MPG mode active, waiting for it to be disabled..." HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center" FontSize="16"/>
     </Grid>
 </Window>
diff --git a/CNC Controls/CNC Controls/MachinePositionFlyout.xaml b/CNC Controls/CNC Controls/MachinePositionFlyout.xaml
index 34fe49c..e7ff3de 100644
--- a/CNC Controls/CNC Controls/MachinePositionFlyout.xaml	
+++ b/CNC Controls/CNC Controls/MachinePositionFlyout.xaml	
@@ -27,7 +27,7 @@
                 <local:NumericField Label="B:" Unit="" ColonAt="20" Value="{Binding Path=MachinePosition.B, Mode=OneWay}" Format="{Binding Path=FormatSigned}" IsReadOnly="True" HorizontalAlignment="Left" Margin="2,0,0,0" VerticalAlignment="Top" Style="{StaticResource BAxisVisibleStyle}"/>
                 <local:NumericField Label="C:" Unit="" ColonAt="20" Value="{Binding Path=MachinePosition.C, Mode=OneWay}" Format="{Binding Path=FormatSigned}" IsReadOnly="True" HorizontalAlignment="Left" Margin="2,0,0,0" VerticalAlignment="Top" Style="{StaticResource CAxisVisibleStyle}"/>
             </StackPanel>
-            <TextBlock Text="Machine Position" Margin="0,4,0,0"/>
+            <TextBlock x:Uid="lbl_machinePosition" Text="Machine Position" Margin="0,4,0,0"/>
             <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>
     </Border>
diff --git a/CNC Controls/CNC Controls/MacroEditor.xaml b/CNC Controls/CNC Controls/MacroEditor.xaml
index 0b737e4..02476f9 100644
--- a/CNC Controls/CNC Controls/MacroEditor.xaml	
+++ b/CNC Controls/CNC Controls/MacroEditor.xaml	
@@ -5,14 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CNC.Controls"
         mc:Ignorable="d"
+        x:Uid="dlg_macroEditor"
         Title="Macro Editor" Height="260" Width="310" Icon="App.ico" ResizeMode="NoResize" ShowInTaskbar="False"
         WindowStartupLocation="CenterOwner"
         Loaded="Window_Loaded" Closing="Window_Closing">
     <Grid Background="#FFE5E5E5">
         <ComboBox x:Name="cbxMacro" IsEditable="True" ItemsSource="{Binding Path=Macros}" DisplayMemberPath="Name" SelectedValuePath="Id" SelectedItem="{Binding Path=Macro, Mode=TwoWay}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="150"/>
-        <Button Content="Add" IsEnabled="{Binding Path=CanAdd}" HorizontalAlignment="Left" Margin="170,10,0,0" VerticalAlignment="Top" Width="45" Click="btnAdd_Click"/>
+        <Button x:Uid="btn_add" Content="Add" IsEnabled="{Binding Path=CanAdd}" HorizontalAlignment="Left" Margin="170,10,0,0" VerticalAlignment="Top" Width="45" Click="btnAdd_Click"/>
         <TextBox x:Name="textBox" IsEnabled="{Binding Path=CanEdit}" AcceptsReturn="True" HorizontalAlignment="Left" Height="145" Margin="10,37,0,0" TextWrapping="Wrap" Text="{Binding Path=Code, Mode=TwoWay}" VerticalAlignment="Top" Width="272"/>
-        <Button Content="Ok" HorizontalAlignment="Left" Margin="55,187,0,0" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
-        <Button Content="Cancel" HorizontalAlignment="Right" Margin="0,187,55,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
+        <Button x:Uid="btn_ok" Content="Ok" HorizontalAlignment="Left" Margin="55,187,0,0" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
+        <Button x:Uid="btn_cancel" Content="Cancel" HorizontalAlignment="Right" Margin="0,187,55,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
     </Grid>
 </Window>
diff --git a/CNC Controls/CNC Controls/MacroExecuteControl.xaml b/CNC Controls/CNC Controls/MacroExecuteControl.xaml
index 0e6c931..1f3a114 100644
--- a/CNC Controls/CNC Controls/MacroExecuteControl.xaml	
+++ b/CNC Controls/CNC Controls/MacroExecuteControl.xaml	
@@ -36,8 +36,8 @@
                     </ItemsPanelTemplate>
                 </ItemsControl.ItemsPanel>
             </ItemsControl>
-            <Label x:Name="label" Content="No macros defined, use Edit button to add." HorizontalContentAlignment="Center" Visibility="{Binding Path=IsMessageVisible, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalAlignment="Center" Margin="0,80,0,0" Width="280" VerticalAlignment="Top"/>
-            <Button x:Name="button" Content="Edit" Width="50" Height="25" HorizontalAlignment="Right" Margin="0,0,8,8" VerticalAlignment="Bottom" Click="button_Edit" />
+            <Label x:Uid="lbl_noMacrosDefined" x:Name="label" Content="No macros defined, use Edit button to add." HorizontalContentAlignment="Center" Visibility="{Binding Path=IsMessageVisible, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalAlignment="Center" Margin="0,80,0,0" Width="280" VerticalAlignment="Top"/>
+            <Button x:Uid="btn_edit" x:Name="button" Content="Edit" Width="50" Height="25" HorizontalAlignment="Right" Margin="0,0,8,8" VerticalAlignment="Bottom" Click="button_Edit" />
             <Button Content="×" Focusable="False" Style="{StaticResource SmallXButtonStyle}" VerticalContentAlignment="Top" HorizontalAlignment="Left" Margin="297,0,0,0" VerticalAlignment="Top" Width="14" Height="18" Click="btn_Close"/>
         </Grid>
     </Border>
diff --git a/CNC Controls/CNC Controls/OffsetView.xaml b/CNC Controls/CNC Controls/OffsetView.xaml
index 56c8414..415aaaf 100644
--- a/CNC Controls/CNC Controls/OffsetView.xaml	
+++ b/CNC Controls/CNC Controls/OffsetView.xaml	
@@ -27,7 +27,7 @@
         <DataGrid x:Name="dgrOffsets" Grid.Row="0" ItemsSource="{Binding}" Width="Auto" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow" AutoGenerateColumns="False" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"
                             CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" SelectionChanged="dgrOffsets_SelectionChanged">
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Offset" Binding="{Binding Code}" Width="50"/>
+                <DataGridTextColumn x:Uid="hdr_offset" Header="Offset" Binding="{Binding Code}" Width="50"/>
                 <DataGridTextColumn Header="X" Binding="{Binding X}" Width="70"/>
                 <DataGridTextColumn Header="Y" Binding="{Binding Y}" Width="70">
                     <DataGridTextColumn.Visibility>
@@ -93,37 +93,37 @@
         </DataGrid>
         <StackPanel Grid.Column="1" HorizontalAlignment="Left" Margin="20,15,0,0" VerticalAlignment="Top">
             <StackPanel Orientation="Horizontal">
-                <Label Content="Offset:" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Margin="29,0,0,0" VerticalAlignment="Top"/>
+                <Label x:Uid="lbl_offset" Content="Offset:" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Margin="29,0,0,0" VerticalAlignment="Top"/>
                 <TextBox Text="{Binding Path=Offset.Code, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalAlignment="Left" Height="23" TextWrapping="NoWrap" VerticalAlignment="Top" Width="40" IsReadOnly="True"/>
             </StackPanel>
-            <local:CoordValueSetControl x:Name="cvXOffset" Label="X axis:" Tag="X" Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Uid="lbl_xAxis" x:Name="cvXOffset" Label="X axis:" Tag="X" Click="cvOffset_Click"
                 Value="{Binding Path=Offset.X, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
-            <local:CoordValueSetControl x:Name="cvYOffset" Label="Y axis:" Tag="Y" Style="{StaticResource YAxisVisibleStyle}" Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Uid="lbl_yAxis" x:Name="cvYOffset" Label="Y axis:" Tag="Y" Style="{StaticResource YAxisVisibleStyle}" Click="cvOffset_Click"
                 Value="{Binding Path=Offset.Y, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
-            <local:CoordValueSetControl x:Name="cvZOffset" Label="Z axis:" Tag="Z"  Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Uid="lbl_zAxis" x:Name="cvZOffset" Label="Z axis:" Tag="Z"  Click="cvOffset_Click"
                 Value="{Binding Path=Offset.Z, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
-            <local:CoordValueSetControl x:Name="cvAOffset" Label="A axis:" Tag="A" Style="{StaticResource AAxisVisibleStyle}"  Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Uid="lbl_aAxis" x:Name="cvAOffset" Label="A axis:" Tag="A" Style="{StaticResource AAxisVisibleStyle}"  Click="cvOffset_Click"
                 Value="{Binding Path=Offset.A, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
-            <local:CoordValueSetControl x:Name="cvBOffset" Label="B axis:" Tag="B" Style="{StaticResource BAxisVisibleStyle}"  Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Uid="lbl_bAxis" x:Name="cvBOffset" Label="B axis:" Tag="B" Style="{StaticResource BAxisVisibleStyle}"  Click="cvOffset_Click"
                 Value="{Binding Path=Offset.B, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
-            <local:CoordValueSetControl x:Name="cvCOffset" Label="C axis:" Tag="C" Style="{StaticResource CAxisVisibleStyle}"  Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Uid="lbl_cAxis" x:Name="cvCOffset" Label="C axis:" Tag="C" Style="{StaticResource CAxisVisibleStyle}"  Click="cvOffset_Click"
                 Value="{Binding Path=Offset.C, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
             <StackPanel Orientation="Horizontal" Height="28" Margin="0,5">
-                <Button x:Name="btnCurrPos" Content="Get current position" IsEnabled="{Binding Path=IsPredefined, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource IsNotPredefined}}" Margin="3,0" Click="btnCurrPos_Click"/>
-                <Button x:Name="btnClear" Content="Clear all" IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}" Click="btnClearAll_Click"/>
-                <Button x:Name="btnSetAll" Content="Set all" Margin="3,0" Click="btnSetAll_Click"/>
+                <Button x:Uid="btn_currPos" x:Name="btnCurrPos" Content="Get current position" IsEnabled="{Binding Path=IsPredefined, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource IsNotPredefined}}" Margin="3,0" Click="btnCurrPos_Click"/>
+                <Button x:Uid="btn_clear" x:Name="btnClear" Content="Clear all" IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}" Click="btnClearAll_Click"/>
+                <Button x:Uid="btn_setAll" x:Name="btnSetAll" Content="Set all" Margin="3,0" Click="btnSetAll_Click"/>
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/CNC Controls/CNC Controls/OutlineFlyout.xaml b/CNC Controls/CNC Controls/OutlineFlyout.xaml
index 10608a4..169413e 100644
--- a/CNC Controls/CNC Controls/OutlineFlyout.xaml	
+++ b/CNC Controls/CNC Controls/OutlineFlyout.xaml	
@@ -24,12 +24,12 @@
     <Border BorderBrush="DarkGray" BorderThickness="1" CornerRadius="3" Background="#FFE5E5EA">
         <Grid Height="150">
             <TextBlock HorizontalAlignment="Center" Margin="0,20,0,0" Width="280" VerticalAlignment="Top">
-                <Run Text="Execute moves to outline X and Y program limits."/>
+                <Run x:Uid="txt_line1" Text="Execute moves to outline X and Y program limits."/>
                 <LineBreak/>
-                <Run Text="Ensure tool tip is clear of any obstructions!" Foreground="Red" FontWeight="Bold"/>
+                <Run x:Uid="txt_line2" Text="Ensure tool tip is clear of any obstructions!" Foreground="Red" FontWeight="Bold"/>
             </TextBlock>
-            <local:NumericField Label="Feed rate:" Value="{Binding Path=FeedRate, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}}" Unit="{Binding Path=FeedrateUnit, Mode=OneWay}" Format="###0" HorizontalAlignment="Left" Margin="5,75,0,0" VerticalAlignment="Top"/>
-            <Button Content="Go" IsEnabled="{Binding Path=IsFileLoaded}" Width="50" Height="25" HorizontalAlignment="Right" Margin="0,0,8,8" VerticalAlignment="Bottom" Click="button_Go" />
+            <local:NumericField x:Uid="lbl_feedrate" Label="Feed rate:" Value="{Binding Path=FeedRate, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=UserControl}}" Unit="{Binding Path=FeedrateUnit, Mode=OneWay}" Format="###0" HorizontalAlignment="Left" Margin="5,75,0,0" VerticalAlignment="Top"/>
+            <Button x:Uid="btn_go" Content="Go" IsEnabled="{Binding Path=IsFileLoaded}" Width="50" Height="25" HorizontalAlignment="Right" Margin="0,0,8,8" VerticalAlignment="Bottom" Click="button_Go" />
             <Button Content="×" Focusable="False" Style="{StaticResource SmallXButtonStyle}" VerticalContentAlignment="Top" HorizontalAlignment="Left" Margin="285,0,0,0" VerticalAlignment="Top" Width="14" Height="18" Click="btn_Close"/>
         </Grid>
     </Border>
diff --git a/CNC Controls/CNC Controls/OverrideControl.xaml b/CNC Controls/CNC Controls/OverrideControl.xaml
index b9e729f..56f8a5a 100644
--- a/CNC Controls/CNC Controls/OverrideControl.xaml	
+++ b/CNC Controls/CNC Controls/OverrideControl.xaml	
@@ -10,7 +10,7 @@
         <local:EncoderModeToColorConverter x:Key="EncoderModeConverter" />
     </UserControl.Resources>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Height="60" VerticalAlignment="Center" Width="180">
-        <Label x:Name="lblOverride" HorizontalContentAlignment="Right" Content="Override" VerticalAlignment="Center" Height="24" Width="56"/>
+        <Label x:Uid="lbl_override" x:Name="lblOverride" HorizontalContentAlignment="Right" Content="Override" VerticalAlignment="Center" Height="24" Width="56"/>
         <TextBox x:Name="txtOverride" TextWrapping="NoWrap" Text="100%" IsReadOnly="True" Height="24" Width="40" VerticalAlignment="Center" HorizontalContentAlignment="Right" VerticalContentAlignment="Center">
             <TextBox.Background>
                 <MultiBinding Converter="{StaticResource EncoderModeConverter}">
diff --git a/CNC Controls/CNC Controls/PortDialog.xaml b/CNC Controls/CNC Controls/PortDialog.xaml
index 6662a2c..d2db734 100644
--- a/CNC Controls/CNC Controls/PortDialog.xaml	
+++ b/CNC Controls/CNC Controls/PortDialog.xaml	
@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CNC.Controls"
         mc:Ignorable="d"
-        Title="Sender connection" Height="195" Width="270" Icon="App.ico" ResizeMode="NoResize">
+        x:Uid="dlg_connection"
+        Title="Sender connection" Height="195" Width="400" Icon="App.ico" ResizeMode="NoResize">
     <Window.Resources>
         <Style x:Key="PortErrorStyle" TargetType="local:NumericTextBox">
             <Style.Triggers>
@@ -30,19 +31,21 @@
     </Window.Resources>
     <Grid Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
         <TabControl x:Name="tab" Width="Auto" Height="120" Margin="5,0" VerticalAlignment="Top">
-            <TabItem Header="Serial">
+            <TabItem x:Uid="tab_serial" Header="Serial">
                 <StackPanel>
                     <StackPanel Orientation="Horizontal" Margin="0,5">
-                        <Label Content="Port:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80" VerticalAlignment="Center"/>
-                        <ComboBox HorizontalAlignment="Left" VerticalAlignment="Center" Width="150"
+                        <Label  x:Uid="lbl_serialPort" Content="Port:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80" VerticalAlignment="Center"/>
+                        <ComboBox HorizontalAlignment="Left" VerticalAlignment="Center" Width="285"
                             DropDownOpened="CbxPorts_DropDownOpened"
-                            ItemsSource="{Binding Path=Com.PortNames}"
+                            ItemsSource="{Binding Path=Com.Ports}"
                             SelectedValue="{Binding Path=Com.SelectedPort, Mode=TwoWay}"
+                            DisplayMemberPath="FullName"
+                            SelectedValuePath="Name" 
                          />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
-                        <Label Content="On connect:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80" VerticalAlignment="Center"/>
-                        <ComboBox HorizontalAlignment="Left" VerticalAlignment="Center" Width="150"
+                        <Label x:Uid="lbl_onConnect" Content="On connect:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80" VerticalAlignment="Center"/>
+                        <ComboBox HorizontalAlignment="Left" VerticalAlignment="Center" Width="90"
                             ItemsSource="{Binding Path=Com.ConnectModes}"
                             SelectedItem="{Binding Path=Com.SelectedMode, Mode=TwoWay}"
                             DisplayMemberPath="Name"
@@ -51,11 +54,11 @@
                     </StackPanel>
                 </StackPanel>
             </TabItem>
-            <TabItem Header="Network">
+            <TabItem x:Uid="tab_network" Header="Network">
                 <StackPanel>
-                    <CheckBox Content="WebSocket" IsChecked="{Binding Path=IsWebSocket, Mode=TwoWay}" Margin="80,5,0,0"/>
+                    <CheckBox x:Uid="lbl_websocket" Content="WebSocket" IsChecked="{Binding Path=IsWebSocket, Mode=TwoWay}" Margin="80,5,0,0"/>
                     <StackPanel Orientation="Horizontal" Margin="0,5">
-                        <Label Content="Port:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80"/>
+                        <Label x:Uid="lbl_netPort" Content="Port:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80"/>
                         <local:NumericTextBox Style="{StaticResource PortErrorStyle}" Format="####0">
                             <local:NumericTextBox.Value>
                                 <Binding Path="NetPort" Mode="TwoWay" ValidatesOnNotifyDataErrors="True" ValidatesOnDataErrors="True" NotifyOnValidationError="True" UpdateSourceTrigger="PropertyChanged">
@@ -67,7 +70,7 @@
                         </local:NumericTextBox>
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
-                        <Label Content="IP address:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80"/>
+                        <Label x:Uid="lbl_ipAddress" Content="IP address:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80"/>
                         <TextBox Style="{StaticResource Ip4ErrorStyle}" HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Bottom" Height="24" Width="95" MaxLength="15">
                             <TextBox.Text>
                                 <Binding Path="IpAddress" Mode="TwoWay" ValidatesOnNotifyDataErrors="True" ValidatesOnDataErrors="True" NotifyOnValidationError="True" UpdateSourceTrigger="PropertyChanged">
@@ -82,8 +85,8 @@
             </TabItem>
         </TabControl>
         <StackPanel Height="23" Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,110,0,5">
-            <Button x:Name="btnOk" Content="Ok" Height="23" Width="70" Click="btnOk_Click"/>
-            <Button x:Name="btnCancel" Content="Cancel" Margin="5,0,0,0" Height="23" Width="70" Click="btnCancel_Click"/>
+            <Button x:Uid="btn_ok" x:Name="btnOk" Content="Ok" Height="23" Width="70" Click="btnOk_Click"/>
+            <Button x:Uid="btn_cancel" x:Name="btnCancel" Content="Cancel" Margin="5,0,0,0" Height="23" Width="70" Click="btnCancel_Click"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/CNC Controls/CNC Controls/PortDialog.xaml.cs b/CNC Controls/CNC Controls/PortDialog.xaml.cs
index 05b3f51..9ba8b43 100644
--- a/CNC Controls/CNC Controls/PortDialog.xaml.cs	
+++ b/CNC Controls/CNC Controls/PortDialog.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * PortDialog.xaml.cs - part of CNC Controls library
  *
- * v0.33 / 2021-05-16 / Io Engineering (Terje Io)
+ * v0.35 / 2021-09-25 / Io Engineering (Terje Io)
  *
  */
 
@@ -64,8 +64,8 @@ private bool PortAvailable(string port)
         {
             bool found = false;
 
-            foreach (string p in prop.Com.PortNames)
-                found = found || p == port;
+            foreach (var p in prop.Com.Ports)
+                found = found || p.Name == port;
 
             return found;
         }
@@ -105,7 +105,7 @@ public string ShowDialog(string orgport)
                             Enum.TryParse(values[5], true, out mode);
                             if (mode != Comms.ResetMode.None)
                             {
-                                foreach (ConnectMode m in ((SerialPorts)DataContext).ConnectModes)
+                                foreach (ConnectMode m in prop.Com.ConnectModes)
                                     if (m.Mode == mode)
                                         prop.Com.SelectedMode = m;
                             }
diff --git a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs b/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs
index a3b4cee..c901d67 100644
--- a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs	
+++ b/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs	
@@ -15,6 +15,7 @@
 [assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -51,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.34.0")]
-[assembly: AssemblyFileVersion("2.0.34.0")]
+[assembly: AssemblyVersion("2.0.35.0")]
+[assembly: AssemblyFileVersion("2.0.35.0")]
diff --git a/CNC Controls/CNC Controls/SDCardView.xaml b/CNC Controls/CNC Controls/SDCardView.xaml
index ef7653f..df412dc 100644
--- a/CNC Controls/CNC Controls/SDCardView.xaml	
+++ b/CNC Controls/CNC Controls/SDCardView.xaml	
@@ -8,26 +8,26 @@
              d:DesignHeight="515" d:DesignWidth="875"
              Loaded="SDCardView_Loaded">
     <Grid>
-        <DataGrid x:Name="dgrSDCard" ItemsSource="{Binding}" IsReadOnly="True" HorizontalAlignment="Left" Margin="30,30,0,0" VerticalAlignment="Top" Height="450" Width="380"
+        <DataGrid x:Uid="dgr_sdcard" x:Name="dgrSDCard" ItemsSource="{Binding}" IsReadOnly="True" HorizontalAlignment="Left" Margin="30,30,0,0" VerticalAlignment="Top" Height="450" Width="380"
                   SelectionMode="Single" SelectionUnit="FullRow" AutoGenerateColumns="False"
                   CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" CanUserAddRows="False"
                   SelectionChanged="dgrSDCard_SelectionChanged" MouseDoubleClick="dgrSDCard_MouseDoubleClick"
                   ToolTip="Right click for menu, double click to run file.">
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="*"/>
-                <DataGridTextColumn Header="Size" Binding="{Binding Size}" Width="70"/>
+                <DataGridTextColumn x:Uid="hdr_name" Header="Name" Binding="{Binding Name}" Width="*"/>
+                <DataGridTextColumn x:Uid="hdr_size" Header="Size" Binding="{Binding Size}" Width="70"/>
                 <!--
                 <DataGridTextColumn Header="Remark" Binding="{Binding Invalid}" Width="*"/>
                 -->
             </DataGrid.Columns>
             <DataGrid.ContextMenu>
                 <ContextMenu x:Name="ctxMenu">
-                    <MenuItem Header="Run" Click="Run_Click" />
-                    <MenuItem Header="Enable rewind" IsEnabled="{Binding Path=CanRewind}" IsChecked="{Binding Path=Rewind, Mode=TwoWay}" IsCheckable="True" />
-                    <MenuItem Header="Delete" IsEnabled="{Binding Path=CanDelete}" Click="Delete_Click" />
+                    <MenuItem x:Uid="mnu_run" Header="Run" Click="Run_Click" />
+                    <MenuItem x:Uid="mnu_enableRewind" Header="Enable rewind" IsEnabled="{Binding Path=CanRewind}" IsChecked="{Binding Path=Rewind, Mode=TwoWay}" IsCheckable="True" />
+                    <MenuItem x:Uid="mnu_delete" Header="Delete" IsEnabled="{Binding Path=CanDelete}" Click="Delete_Click" />
                 </ContextMenu>
             </DataGrid.ContextMenu>
         </DataGrid>
-        <Button Content="Upload" IsEnabled="{Binding Path=CanUpload, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalAlignment="Left" Margin="428,460,0,0" VerticalAlignment="Top" Width="75" Click="Upload_Click"/>
+        <Button x:Uid="btn_upload" Content="Upload" IsEnabled="{Binding Path=CanUpload, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalAlignment="Left" Margin="428,460,0,0" VerticalAlignment="Top" Width="75" Click="Upload_Click"/>
     </Grid>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/SignalsControl.xaml b/CNC Controls/CNC Controls/SignalsControl.xaml
index d75a800..23a7365 100644
--- a/CNC Controls/CNC Controls/SignalsControl.xaml	
+++ b/CNC Controls/CNC Controls/SignalsControl.xaml	
@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:CNC.Controls"
              xmlns:core="clr-namespace:CNC.Core;assembly=CNC.Core"
              mc:Ignorable="d" 
-             d:DesignHeight="65" d:DesignWidth="216">
+             d:DesignHeight="60" d:DesignWidth="216">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -93,7 +93,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <GroupBox x:Name="grpSignals" Header="Signals" HorizontalAlignment="Left" VerticalAlignment="Top" Height="60" Width="216">
+    <GroupBox x:Uid="grp_signals" x:Name="grpSignals" Header="Signals" HorizontalAlignment="Left" VerticalAlignment="Top" Height="60" Width="216">
         <DockPanel HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="36" Width="205">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="3,0,0,0" VerticalAlignment="Center" Width="Auto" DockPanel.Dock="Left">
                 <local:SignalControl Label="X" IsSet="{Binding Path=Signals[(core:Signals)LimitX], Mode=OneWay}"/>
diff --git a/CNC Controls/CNC Controls/SpindleControl.xaml b/CNC Controls/CNC Controls/SpindleControl.xaml
index 7c419e3..fe15634 100644
--- a/CNC Controls/CNC Controls/SpindleControl.xaml	
+++ b/CNC Controls/CNC Controls/SpindleControl.xaml	
@@ -13,7 +13,7 @@
         <local:LogicalNotConverter x:Key="LogicalNotConverter" />
     </UserControl.Resources>
     <Grid>
-        <GroupBox x:Name="grpSpindle" Header="Spindle" HorizontalAlignment="Left" VerticalAlignment="Top" Height="125" Width="216">
+        <GroupBox x:Uid="grp_spindle" x:Name="grpSpindle" Header="Spindle" HorizontalAlignment="Left" VerticalAlignment="Top" Height="125" Width="216">
             <Grid HorizontalAlignment="Left" Height="105" VerticalAlignment="Top" Width="205">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="18"/>
@@ -21,12 +21,12 @@
                     <RowDefinition Height="61*"/>
                 </Grid.RowDefinitions>
                 <StackPanel IsEnabled="{Binding Path=IsSpindleStateEnabled, RelativeSource={RelativeSource AncestorType=UserControl}}" Orientation="Horizontal" Margin="5,0" Height="18">
-                    <RadioButton x:Name="rbSpindleOff" Content="Off" IsChecked="{Binding Path=SpindleState[(gcode:SpindleState)Off], Mode=TwoWay}" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16" Click="rbSpindle_Click"/>
-                    <RadioButton x:Name="rbSpindleCW" Content="CW" IsChecked="{Binding Path=SpindleState[(gcode:SpindleState)CW], Mode=TwoWay}" Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16" Click="rbSpindle_Click"/>
-                    <RadioButton x:Name="rbSpindleCCW" Content="CCW" IsChecked="{Binding Path=SpindleState[(gcode:SpindleState)CCW], Mode=TwoWay}" Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16" Click="rbSpindle_Click"/>
+                    <RadioButton x:Uid="lbl_off" x:Name="rbSpindleOff" Content="Off" IsChecked="{Binding Path=SpindleState[(gcode:SpindleState)Off], Mode=TwoWay}" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16" Click="rbSpindle_Click"/>
+                    <RadioButton x:Uid="lbl_cw" x:Name="rbSpindleCW" Content="CW" IsChecked="{Binding Path=SpindleState[(gcode:SpindleState)CW], Mode=TwoWay}" Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16" Click="rbSpindle_Click"/>
+                    <RadioButton x:Uid="lbl_ccw" x:Name="rbSpindleCCW" Content="CCW" IsChecked="{Binding Path=SpindleState[(gcode:SpindleState)CCW], Mode=TwoWay}" Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16" Click="rbSpindle_Click"/>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="5,0" Height="26" Grid.Row="1">
-                    <Label x:Name="lblRPM" Content="RPM" HorizontalContentAlignment="Right" VerticalAlignment="Center" Height="24" Width="34"/>
+                    <Label x:Uid="lbl_rpm" x:Name="lblRPM" Content="RPM" HorizontalContentAlignment="Right" VerticalAlignment="Center" Height="24" Width="34"/>
                     <local:NumericTextBox x:Name="cvRPM" Value="{Binding Path=RPM, Mode=TwoWay}" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource LogicalNotConverter}}" Format="####0" HorizontalAlignment="Left" Margin="2,0,0,0" TextWrapping="NoWrap" VerticalAlignment="Center"/>
                 </StackPanel>
                 <local:OverrideControl x:Name="overrideControl" Value="{Binding Path=RPMOverride, Mode=OneWay}" Margin="0,0,3,0" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" EncoderMode="SpindleRPM"/>
diff --git a/CNC Controls/CNC Controls/StatusControl.xaml b/CNC Controls/CNC Controls/StatusControl.xaml
index 8fe228d..61673eb 100644
--- a/CNC Controls/CNC Controls/StatusControl.xaml	
+++ b/CNC Controls/CNC Controls/StatusControl.xaml	
@@ -25,7 +25,7 @@
     </UserControl.Resources>
     <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
-            <Label x:Name="lblState" Content="State:" HorizontalContentAlignment="Right" HorizontalAlignment="Left" VerticalAlignment="Center" Height="26" Width="40"/>
+            <Label x:Uid="lbl_state" x:Name="lblState" Content="State:" HorizontalContentAlignment="Right" HorizontalAlignment="Left" VerticalAlignment="Center" Height="26" Width="40"/>
             <TextBox x:Name="txtState" HorizontalAlignment="Left" Height="24" Margin="2,0" TextWrapping="NoWrap" IsReadOnly="True" TextAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Width="74"
                      Text="{Binding Path=GrblState, Converter={StaticResource ToStringConverter}}"
                      Background="{Binding Path=GrblState, Converter={StaticResource ToColorConverter}}"
@@ -39,10 +39,10 @@
                     </MultiBinding>
                 </CheckBox.IsEnabled>
             </CheckBox>
-            <Label Content="Check" VerticalAlignment="Center" Height="26"/>
+            <Label x:Uid="lbl_check" Content="Check" VerticalAlignment="Center" Height="26"/>
         </StackPanel>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,4,0,0" VerticalAlignment="Bottom">
-            <Button x:Name="btnHome" Content="Home" ToolTip="Ctrl+H" Background="{Binding Path=HomedState, Converter={StaticResource HomedStateConverter}}" Style="{StaticResource StatusButtonStyle}" Click="btn_Click">
+            <Button x:Uid="btn_home" x:Name="btnHome" Content="Home" ToolTip="Ctrl+H" Background="{Binding Path=HomedState, Converter={StaticResource HomedStateConverter}}" Style="{StaticResource StatusButtonStyle}" Click="btn_Click">
                 <Button.IsEnabled>
                     <MultiBinding Converter="{StaticResource HomingEnabledConverter}">
                         <Binding Path="GrblState" Mode="OneWay"/>
@@ -51,10 +51,10 @@
                     </MultiBinding>
                 </Button.IsEnabled>
             </Button>
-            <Button x:Name="btnUnlock" Content="Unlock" ToolTip="Ctrl+U" Style="{StaticResource StatusButtonStyle}" Margin="5,0,0,0" Click="btn_Click"
+            <Button x:Uid="btn_unlock" x:Name="btnUnlock" Content="Unlock" ToolTip="Ctrl+U" Style="{StaticResource StatusButtonStyle}" Margin="5,0,0,0" Click="btn_Click"
                 IsEnabled="{Binding Path=IsSleepMode, Converter={StaticResource SleepEnabledConverter}, Mode=OneWay}"
             />
-            <Button x:Name="btnReset" Content="Reset" ToolTip="Ctrl+Shift+R" Style="{StaticResource StatusButtonStyle}" Margin="5,0,0,0" Background="Red" Foreground="White" Click="btn_Click" FontFamily="Segoe UI Semibold" FontSize="14"/>
+            <Button x:Uid="btn_reset" x:Name="btnReset" Content="Reset" ToolTip="Ctrl+Shift+R" Style="{StaticResource StatusButtonStyle}" Margin="5,0,0,0" Background="Red" Foreground="White" Click="btn_Click" FontFamily="Segoe UI Semibold" FontSize="14"/>
         </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/CNC Controls/CNC Controls/StripGCodeConfigControl.xaml b/CNC Controls/CNC Controls/StripGCodeConfigControl.xaml
index 0d614c2..f8d135a 100644
--- a/CNC Controls/CNC Controls/StripGCodeConfigControl.xaml	
+++ b/CNC Controls/CNC Controls/StripGCodeConfigControl.xaml	
@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:CNC.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="140" d:DesignWidth="250">
-    <GroupBox Header="GCode command stripping" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
+    <GroupBox x:Uid="grp_gcodeStrip" Header="GCode command stripping" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
         <Grid Height="116">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="60"/>
diff --git a/CNC Controls/CNC Controls/ToolView.xaml b/CNC Controls/CNC Controls/ToolView.xaml
index 90e171f..bae54eb 100644
--- a/CNC Controls/CNC Controls/ToolView.xaml	
+++ b/CNC Controls/CNC Controls/ToolView.xaml	
@@ -23,10 +23,10 @@
             <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>
         <ContentControl Visibility="Collapsed" Content="{StaticResource ProxyElement}"/>
-        <DataGrid x:Name="dgrTools" Grid.Row="0" ItemsSource="{Binding}" Width="Auto" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow" AutoGenerateColumns="False" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"
+        <DataGrid x:Uid="grd_tools" x:Name="dgrTools" Grid.Row="0" ItemsSource="{Binding}" Width="Auto" IsReadOnly="True" SelectionMode="Single" SelectionUnit="FullRow" AutoGenerateColumns="False" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top"
                             CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" CanUserAddRows="False" SelectionChanged="dgrTools_SelectionChanged">
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Tool" Binding="{Binding Code}" Width="50"/>
+                <DataGridTextColumn x:Uid="hdr_tool" Header="Tool" Binding="{Binding Code}" Width="50"/>
                 <DataGridTextColumn Header="X" Binding="{Binding X}" Width="70"/>
                 <DataGridTextColumn Header="Y" Binding="{Binding Y}" Width="70">
                     <DataGridTextColumn.Visibility>
@@ -45,17 +45,17 @@
         </DataGrid>
         <StackPanel Grid.Column="1" HorizontalAlignment="Left" Margin="20,15,0,0" VerticalAlignment="Top">
             <StackPanel Orientation="Horizontal">
-                <Label x:Name="lblTool" Content="Tool:" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Margin="37,0,0,0" VerticalAlignment="Top"/>
+                <Label x:Uid="lbl_tool" x:Name="lblTool" Content="Tool:" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Margin="37,0,0,0" VerticalAlignment="Top"/>
                 <TextBox x:Name="txtTool" HorizontalAlignment="Left" Height="23" TextWrapping="NoWrap" VerticalAlignment="Top" Width="25" IsReadOnly="True"/>
             </StackPanel>
-            <local:CoordValueSetControl x:Name="cvXOffset" Label="X axis:" Tag="X" Value="{Binding Path=offset.X, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Click="cvOffset_Click"/>
-            <local:CoordValueSetControl x:Name="cvYOffset" Label="Y axis:" Tag="Y" Value="{Binding Path=offset.Y, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Style="{StaticResource YAxisVisibleStyle}" Click="cvOffset_Click"/>
-            <local:CoordValueSetControl x:Name="cvZOffset" Label="Z axis:" Tag="Z" Value="{Binding Path=offset.Z, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Click="cvOffset_Click"/>
-            <local:CoordValueSetControl x:Name="cvTipRadius" Label="Tip radius:" Tag="R" Click="cvOffset_Click"/>
+            <local:CoordValueSetControl x:Uid="lbl_xAxis" x:Name="cvXOffset" Label="X axis:" Tag="X" Value="{Binding Path=offset.X, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Click="cvOffset_Click"/>
+            <local:CoordValueSetControl x:Uid="lbl_yAxis" x:Name="cvYOffset" Label="Y axis:" Tag="Y" Value="{Binding Path=offset.Y, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Style="{StaticResource YAxisVisibleStyle}" Click="cvOffset_Click"/>
+            <local:CoordValueSetControl x:Uid="lbl_zAxis" x:Name="cvZOffset" Label="Z axis:" Tag="Z" Value="{Binding Path=offset.Z, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Click="cvOffset_Click"/>
+            <local:CoordValueSetControl x:Uid="lbl_tipRadius" x:Name="cvTipRadius" Label="Tip radius:" Tag="R" IsEnabled="False" Click="cvOffset_Click"/>
             <StackPanel Orientation="Horizontal" Margin="5,5">
-                <Button x:Name="btnCurrPos" Content="Get current position" Margin="3,0" Click="btnCurrPos_Click"/>
-                <Button x:Name="btnClear" Content="Clear all" Click="btnClearAll_Click"/>
-                <Button x:Name="btnSetAll" Content="Set all" Margin="3,0" Click="btnSetAll_Click"/>
+                <Button x:Uid="btn_currPos" x:Name="btnCurrPos" Content="Get current position" Margin="3,0" Click="btnCurrPos_Click"/>
+                <Button x:Uid="btn_clear" x:Name="btnClear" Content="Clear all" Click="btnClearAll_Click"/>
+                <Button x:Uid="btn_setAll" x:Name="btnSetAll" Content="Set all" Margin="3,0" Click="btnSetAll_Click"/>
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/CNC Controls/CNC Controls/TrinamicView.xaml b/CNC Controls/CNC Controls/TrinamicView.xaml
index 5c78e1a..336c344 100644
--- a/CNC Controls/CNC Controls/TrinamicView.xaml	
+++ b/CNC Controls/CNC Controls/TrinamicView.xaml	
@@ -22,7 +22,7 @@
     </UserControl.Resources>
     <DockPanel Background="Transparent" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
         <DockPanel x:Name="dp" DockPanel.Dock="Left" Margin="5,5,5,0" Width="520" HorizontalAlignment="Left" VerticalAlignment="Stretch">
-            <StackPanel DockPanel.Dock="Top">
+            <StackPanel DockPanel.Dock="Top" Width="520" VerticalAlignment="Stretch">
                 <Border BorderThickness="1" BorderBrush="DarkGray" Height="258" Width="514" HorizontalAlignment="Left" VerticalAlignment="Top">
                     <Canvas x:Name="SGPlot" Background="WhiteSmoke" HorizontalAlignment="Left" Height="256" VerticalAlignment="Top" Width="512"/>
                 </Border>
@@ -35,19 +35,22 @@
                         <RadioButton Content="B" IsChecked="{Binding Path=AxisEnabled[(gcode:AxisFlags)B], RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Style="{StaticResource BAxisVisibleStyle}" Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16"/>
                         <RadioButton Content="C" IsChecked="{Binding Path=AxisEnabled[(gcode:AxisFlags)C], RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Style="{StaticResource CAxisVisibleStyle}" Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center" Height="16"/>
                     </StackPanel>
-                    <Label x:Name="lblLoad" Content="Load (SG_RESULT)" Foreground="Blue" Margin="0,0,5,0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                    <Label x:Uid="lbl_sgLoad" x:Name="lblLoad" Content="Load (SG_RESULT)" Foreground="Blue" Margin="0,0,5,0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                 </Grid>
-                <GroupBox Header="stallGuard">
+                <GroupBox x:Uid="grp_stallGuard" Header="stallGuard">
                     <StackPanel>
-                        <CheckBox IsChecked="{Binding Path=SFiltEnabled, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Content="Enable filter (SFILT)" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top"/>
+                        <CheckBox x:Uid="lbl_stallGuardEnable" IsChecked="{Binding Path=SFiltEnabled, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" Content="Enable filter (SFILT)" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top"/>
                         <StackPanel Orientation="Horizontal" Margin="0,5">
                             <Slider Value="{Binding SGValue, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" Width="169" Minimum="{Binding Path=SGValueMin, RelativeSource={RelativeSource AncestorType=UserControl}}" Maximum="{Binding Path=SGValueMax, RelativeSource={RelativeSource AncestorType=UserControl}}" TickPlacement="BottomRight" IsSnapToTickEnabled="False" LostMouseCapture="Slider_LostMouseCapture"/>
                             <TextBox Text="{Binding Path=SGValue, RelativeSource={RelativeSource AncestorType=UserControl}, StringFormat='##0'}" HorizontalContentAlignment="Right" IsReadOnly="True" Width="30" Margin="5,0,0,0" />
-                            <Button Content="Configure" Width="60" VerticalAlignment="Center" Margin="5,0" Click="btnConfigureSGVal_Click"/>
+                            <Button x:Uid="lbl_configure" Content="Configure" Width="60" VerticalAlignment="Center" Margin="5,0" Click="btnConfigureSGVal_Click"/>
                         </StackPanel>
                     </StackPanel>
                 </GroupBox>
-                <local:StatusControl x:Name="statusControl" Margin="0,5,0,0" VerticalAlignment="Bottom"/>
+                <DockPanel>
+                    <local:StatusControl DockPanel.Dock="Left" Margin="0,5,0,0" VerticalAlignment="Bottom"/>
+                    <local:SignalsControl DockPanel.Dock="Right" VerticalAlignment="Bottom" HorizontalAlignment="Right"/>
+                </DockPanel>
             </StackPanel>
             <StackPanel  HorizontalAlignment="Left" VerticalAlignment="Bottom">
                 <local:MDIControl x:Name="mdiControl"/>
@@ -68,8 +71,8 @@
             </Grid.RowDefinitions>
             <TextBox Grid.Row="0" Text="{Binding Path=DriverStatus, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=OneWay}" IsReadOnly="True" HorizontalAlignment="Stretch" TextWrapping="Wrap" VerticalAlignment="Stretch" FontSize="12" FontFamily="Global Monospace"/>
             <StackPanel Grid.Row="1" Orientation="Horizontal">
-                <Button Content="Get status" Width="130" HorizontalAlignment="Left" VerticalAlignment="Center" Click="btnGetState_Click"/>
-                <Button Content="Get status, all drivers" Width="130" Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center" Click="btnGetStateAll_Click"/>
+                <Button x:Uid="btn_getStatus" Content="Get status" Width="130" HorizontalAlignment="Left" VerticalAlignment="Center" Click="btnGetState_Click"/>
+                <Button x:Uid="btn_getStatusAll" Content="Get status, all drivers" Width="130" Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center" Click="btnGetStateAll_Click"/>
             </StackPanel>
         </Grid>
     </DockPanel>
diff --git a/CNC Controls/CNC Controls/WorkParametersControl.xaml b/CNC Controls/CNC Controls/WorkParametersControl.xaml
index 3477571..f8baa2f 100644
--- a/CNC Controls/CNC Controls/WorkParametersControl.xaml	
+++ b/CNC Controls/CNC Controls/WorkParametersControl.xaml	
@@ -10,7 +10,7 @@
         <local:LogicalNotConverter x:Key="BooleanConverter" />
         <local:BoolToVisibleConverter x:Key="IsVisibleConverter" />
     </UserControl.Resources>
-    <GroupBox x:Name="grpWorkParams" Header="Work Parameters" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="216">
+    <GroupBox x:Uid="grp_workparams" x:Name="grpWorkParams" Header="Work Parameters" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="216">
         <Grid HorizontalAlignment="Left" Height="Auto" Margin="0,4,0,0" VerticalAlignment="Top" Width="206">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="50*"/>
@@ -22,14 +22,14 @@
                 <RowDefinition Height="34"/>
                 <RowDefinition Height="24"/>
             </Grid.RowDefinitions>
-            <Label x:Name="lblOffset" Content="Offset:" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Height="26" Margin="0,7" Width="45"/>
+            <Label x:Uid="lbl_offset" x:Name="lblOffset" Content="Offset:" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Height="26" Margin="0,7" Width="45"/>
             <ComboBox x:Name="cbxOffset" Grid.Column="1" DisplayMemberPath="Code" SelectedValuePath="Code" ItemsSource="{Binding Path=CoordinateSystems}" SelectedValue="{Binding Path=WorkCoordinateSystem, Mode=OneWay}" HorizontalAlignment="Left" VerticalAlignment="Center" Width="55" Height="22" SelectionChanged="cbxOffset_SelectionChanged"/>
-            <Label x:Name="lblTool" Content="Tool:" Grid.Column="2" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Height="26" Width="36"/>
+            <Label x:Uid="lbl_tool" x:Name="lblTool" Content="Tool:" Grid.Column="2" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Height="26" Width="36"/>
             <Border x:Name="bgTool" Grid.Column="3" HorizontalAlignment="Left" VerticalAlignment="Center" CornerRadius="2" Width="60" Height="30" Margin="0,6">
                 <local:NumericComboBox x:Name="cbxTool" IsEditable="False" DisplayMemberPath="Code" SelectedValuePath="Code" ItemsSource="{Binding Path=Tools}" SelectedValue="{Binding Path=Tool, Mode=OneWay}"  Grid.Column="3" Format="##0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="56" Height="22" Margin="2,2" SelectionChanged="cbxTool_SelectionChanged"/>
             </Border>
-            <local:LEDControl Grid.Row="1" Grid.Column="1" Label="TLO" IsSet="{Binding Path=IsToolOffsetActive, Mode=OneWay}" Visibility="{Binding Path=IsParserStateLive, Converter={StaticResource IsVisibleConverter}}" Margin="10,0,0,0"/>
-            <local:LEDControl Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="2" Label="TLO ref'd" IsSet="{Binding Path=IsTloReferenceSet, Mode=OneWay}" Margin="10,0,0,0"/>
+            <local:LEDControl x:Uid="lbl_tlo" Grid.Row="1" Grid.Column="1" Label="TLO" IsSet="{Binding Path=IsToolOffsetActive, Mode=OneWay}" Visibility="{Binding Path=IsParserStateLive, Converter={StaticResource IsVisibleConverter}}" Margin="10,0,0,0"/>
+            <local:LEDControl x:Uid="lbl_tlo_refd" Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="2" Label="TLO ref'd" IsSet="{Binding Path=IsTloReferenceSet, Mode=OneWay}" Margin="10,0,0,0"/>
         </Grid>
     </GroupBox>
 </UserControl>
diff --git a/CNC Converters/CNC Converters.csproj b/CNC Converters/CNC Converters.csproj
index 2441671..589c389 100644
--- a/CNC Converters/CNC Converters.csproj	
+++ b/CNC Converters/CNC Converters.csproj	
@@ -31,6 +31,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <UICulture>en-US</UICulture>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/CNC Converters/JobParametersDialog.xaml b/CNC Converters/JobParametersDialog.xaml
index f19fbe2..bcf1fbe 100644
--- a/CNC Converters/JobParametersDialog.xaml	
+++ b/CNC Converters/JobParametersDialog.xaml	
@@ -15,34 +15,34 @@
 
     <Grid Background="#FFE5E5E5">
         <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Margin="5,5">
-            <GroupBox Header="Z positions (relative to workpiece surface)" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
+            <GroupBox x:Uid="grp_zPosition" Header="Z positions (relative to workpiece surface)" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
                 <StackPanel>
-                    <Controls:NumericField Label="Tool change:" ColonAt="90" Unit="mm" Format="-###0.###" Value="{Binding Path=ZHome, Mode=TwoWay}"/>
-                    <Controls:NumericField Label="Rapids:" ColonAt="90" Unit="mm" Format="-###0.###" Value="{Binding Path=ZRapids, Mode=TwoWay}"/>
-                    <Controls:NumericField Label="Cut depth:" ColonAt="90" Unit="mm" Format="-###0.###" Value="{Binding Path=ZMin, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_toolChange" Label="Tool change:" ColonAt="90" Unit="mm" Format="-###0.###" Value="{Binding Path=ZHome, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_rapids" Label="Rapids:" ColonAt="90" Unit="mm" Format="-###0.###" Value="{Binding Path=ZRapids, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_cutDepth" Label="Cut depth:" ColonAt="90" Unit="mm" Format="-###0.###" Value="{Binding Path=ZMin, Mode=TwoWay}"/>
                 </StackPanel>
             </GroupBox>
-            <GroupBox Header="Spindle and feed" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
+            <GroupBox x:Uid="grp_spindle_feed" Header="Spindle and feed" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
                 <StackPanel>
-                    <Controls:NumericField Label="RPM:" ColonAt="90" Unit="" Format="-###0.###" Value="{Binding Path=RPM, Mode=TwoWay}"/>
-                    <Controls:NumericField Label="Feed rate:" ColonAt="90" Unit="mm/min" Format="-###0.###" Value="{Binding Path=FeedRate, Mode=TwoWay}"/>
-                    <Controls:NumericField Label="Plunge rate:" ColonAt="90" Unit="mm/min" Format="-###0.###" Value="{Binding Path=PlungeRate, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_rpm" Label="RPM:" ColonAt="90" Unit="" Format="-###0.###" Value="{Binding Path=RPM, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_feedrate" Label="Feed rate:" ColonAt="90" Unit="mm/min" Format="-###0.###" Value="{Binding Path=FeedRate, Mode=TwoWay}"/>
+                    <Controls:NumericField x:Uid="fld_plungeRate" Label="Plunge rate:" ColonAt="90" Unit="mm/min" Format="-###0.###" Value="{Binding Path=PlungeRate, Mode=TwoWay}"/>
                 </StackPanel>
             </GroupBox>
-            <GroupBox Header="Scaling factors" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
+            <GroupBox x:Uid="grp_scalingFactors" Header="Scaling factors" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
                 <StackPanel>
                     <Controls:NumericField Label="X:" ColonAt="90" Unit="" Format="-###0.###" Value="{Binding Path=ScaleX, Mode=TwoWay}" ToolTip="A negative factor flips the output."/>
                     <Controls:NumericField Label="Y:" ColonAt="90" Unit="" Format="-###0.###" Value="{Binding Path=ScaleY, Mode=TwoWay}" ToolTip="A negative factor flips the output."/>
                 </StackPanel>
             </GroupBox>
-            <GroupBox Header="Tool" Visibility="{Binding Path=EnableToolSelection, Converter={StaticResource IsVisibleConverter}}" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
+            <GroupBox x:Uid="grp_tool" Header="Tool" Visibility="{Binding Path=EnableToolSelection, Converter={StaticResource IsVisibleConverter}}" HorizontalAlignment="Left" Margin="5,5,0,0" VerticalAlignment="Top" Height="Auto" Width="280">
                 <StackPanel>
                     <Controls:NumericField Label="Diameter:" ColonAt="90" Unit="mm" Format="##0.###" Value="{Binding Path=ToolDiameter, Mode=TwoWay}"/>
                 </StackPanel>
             </GroupBox>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Width="Auto" Margin="0,10">
-                <Button x:Name="btnOk" Content="Ok" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
-                <Button x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
+                <Button x:Uid="btn_ok" x:Name="btnOk" Content="Ok" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Click="btnOk_Click"/>
+                <Button x:Uid="bn_cancel" x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/CNC Converters/Properties/AssemblyInfo.cs b/CNC Converters/Properties/AssemblyInfo.cs
index 96be031..f6c3c1a 100644
--- a/CNC Converters/Properties/AssemblyInfo.cs	
+++ b/CNC Converters/Properties/AssemblyInfo.cs	
@@ -10,11 +10,12 @@
 [assembly: AssemblyTitle("CNC Converters")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CNC Converters")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyCompany("Io Engineering")]
+[assembly: AssemblyProduct("ioSender")]
+[assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -51,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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.35.0")]
+[assembly: AssemblyFileVersion("2.0.35.0")]
\ No newline at end of file
diff --git a/CNC Core/CNC Core/CNC Core.csproj b/CNC Core/CNC Core/CNC Core.csproj
index 385fbd2..60581e8 100644
--- a/CNC Core/CNC Core/CNC Core.csproj	
+++ b/CNC Core/CNC Core/CNC Core.csproj	
@@ -35,6 +35,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
diff --git a/CNC Core/CNC Core/GCodeJob.cs b/CNC Core/CNC Core/GCodeJob.cs
index ecd7a49..dc5261f 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.28 / 2020-10-19 / Io Engineering (Terje Io)
+ * v0.28 / 2020-10-18 / Io Engineering (Terje Io)
  *
  */
 
@@ -204,8 +204,8 @@ public void AddBlock(string block, Action action)
                         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 GCSpline)
                         BoundingBox.AddBoundingBox((cmd.Token as GCSpline).GetBoundingBox(emu.Plane, new double[] { cmd.Start.X, cmd.Start.Y, cmd.Start.Z }, emu.DistanceMode == DistanceMode.Incremental));
-                    else
-                        BoundingBox.AddPoint(cmd.End);
+                    else if(cmd.Token is GCAxisCommand6)
+                        BoundingBox.AddPoint(cmd.End, (cmd.Token as GCAxisCommand6).AxisFlags);
                 }
 
                 BoundingBox.Conclude();
@@ -387,6 +387,26 @@ public void AddPoint(Point3D point)
             Min[2] = Math.Min(Min[2], point.Z);
             Max[2] = Math.Max(Max[2], point.Z);
         }
+        public void AddPoint(Point3D point, AxisFlags axisflags)
+        {
+            if (axisflags.HasFlag(AxisFlags.X))
+            {
+                Min[0] = Math.Min(Min[0], point.X);
+                Max[0] = Math.Max(Max[0], point.X);
+            }
+
+            if (axisflags.HasFlag(AxisFlags.Y))
+            { 
+                Min[1] = Math.Min(Min[1], point.Y);
+                Max[1] = Math.Max(Max[1], point.Y);
+            }
+
+            if (axisflags.HasFlag(AxisFlags.Z))
+            {
+                Min[2] = Math.Min(Min[2], point.Z);
+                Max[2] = Math.Max(Max[2], point.Z);
+            }
+        }
 
         public void AddBoundingBox(GcodeBoundingBox bbox)
         {
diff --git a/CNC Core/CNC Core/GCodeParser.cs b/CNC Core/CNC Core/GCodeParser.cs
index a4ebcb6..a12b035 100644
--- a/CNC Core/CNC Core/GCodeParser.cs	
+++ b/CNC Core/CNC Core/GCodeParser.cs	
@@ -331,7 +331,7 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                         gcodes.Add(gcode[0] == '(' ? gcode + ')' : gcode);
                         gcode = string.Empty;
                     }
-                    if (c != ')')
+                    if (c > ' ' && c != ')')
                     {
                         inMessage = c == '(';
                         gcode += inMessage ? c : char.ToUpperInvariant(c);
diff --git a/CNC Core/CNC Core/Grbl.cs b/CNC Core/CNC Core/Grbl.cs
index 63a010f..ce65fc7 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.34 / 2021-08-20 / Io Engineering (Terje Io)
+ * v0.35 / 2021-10-20 / Io Engineering (Terje Io)
  *
  */
 
@@ -687,6 +687,7 @@ private set
             }
         }
         public static Position TravelResolution { get; private set; } = new Position();
+        public static Position MaxTravel { get; private set; } = new Position();
         public static Signals OptionalSignals { get; private set; } = Signals.Off;
         public static AxisFlags AxisFlags { get; private set; } = AxisFlags.None;
         public static int NumTools { get; private set; } = 0;
@@ -701,6 +702,7 @@ private set
         public static bool HasPIDLog { get; private set; }
         public static bool HasProbe { get; private set; } = true;
         public static bool HomingEnabled { get; internal set; } = true;
+        public static AxisFlags HomingDirection { get; internal set; } = AxisFlags.None;
         public static bool UseLegacyRTCommands { get; internal set; } = true;
         public static bool MPGMode { get; set; }
         public static bool LatheModeEnabled
@@ -821,7 +823,7 @@ public static string Startup(GrblViewModel model)
                 {
                     res = WaitFor.SingleEvent<string>(
                     cancellationToken,
-                    null,
+                    OnLegacyStartup,
                     a => model.OnResponseReceived += a,
                     a => model.OnResponseReceived -= a,
                     1500, () => Comms.com.WriteByte((byte)GrblConstants.CMD_STATUS_REPORT_LEGACY[0]));
@@ -836,9 +838,27 @@ public static string Startup(GrblViewModel model)
             return Comms.com.Reply;
         }
 
+        private static void DetectNumAxes (string rt_report)
+        {
+            var s = rt_report.Split('|');
+            if (s.Length > 1)
+            {
+                var pos = s[1].Split(':');
+                if (pos[0] == "MPos" || pos[1] == "WPos")
+                    NumAxes = pos[1].Split(',').Length;
+            }
+        }
+
         private static void OnStartup(string data)
         {
-            ExtendedProtocol = data.StartsWith("<");
+            if ((ExtendedProtocol = data.StartsWith("<")))
+                DetectNumAxes(data);
+        }
+
+        private static void OnLegacyStartup(string data)
+        {
+            if (data.StartsWith("<"))
+                DetectNumAxes(data);
         }
 
         private static void Process(string data)
@@ -1977,12 +1997,16 @@ public static bool Load(GrblViewModel model)
                 {
                     stepsmm = GetDouble(GrblSetting.TravelResolutionBase + i);
                     GrblInfo.TravelResolution.Values[i++] = 1d / stepsmm;
+                    GrblInfo.MaxTravel.Values[i++] = GetDouble(GrblSetting.MaxTravelBase + i); ;
                 } while (!double.IsNaN(stepsmm) && i < GrblInfo.TravelResolution.Values.Length);
             }
             else foreach (int i in GrblInfo.AxisFlags.ToIndices()) {
                 GrblInfo.TravelResolution.Values[i] = 1d / GetDouble(GrblSetting.TravelResolutionBase + i);
+                GrblInfo.MaxTravel.Values[i] = GetDouble(GrblSetting.MaxTravelBase + i);
             }
 
+            GrblInfo.HomingDirection = (AxisFlags)GetInteger(GrblSetting.HomingDirMask);
+
             return IsLoaded;
         }
 
diff --git a/CNC Core/CNC Core/GrblViewModel.cs b/CNC Core/CNC Core/GrblViewModel.cs
index 75c143d..4b570d6 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.34 / 2021-08-12 / Io Engineering (Terje Io)
+ * v0.35 / 2021-10-21 / Io Engineering (Terje Io)
  *
  */
 
@@ -50,7 +50,8 @@ 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, _rtState, _rtStateEx;
+        private string _mdiCommand, _fileName;
+        private string[] _rtState = new string[3];
         private bool has_wco = false, suspend = false, _hasFans = false;
         private bool _flood, _mist, _fan0, _toolChange, _reset, _isMPos, _isJobRunning, _isProbeSuccess, _pgmEnd, _isParserStateLive, _isTloRefSet;
         private bool _canReset, _isCameraVisible = false, _responseLogVerbose = false;
@@ -171,7 +172,7 @@ public void Clear()
             _streamingState = StreamingState.NoFile;
             _isMPos = _reset = _isJobRunning = _isProbeSuccess = _pgmEnd = _isTloRefSet = false;
             _canReset = true;
-            _pb_avail = _rxb_avail = _rtState = _rtStateEx = string.Empty;
+            _pb_avail = _rxb_avail = _rtState[0] = _rtState[1] = _rtState[2] = string.Empty;
             _mpg = null;
             _line = _pwm = _scrollpos = 0;
             _auxinValue = -2; // No value read (use a nullable type?)
@@ -608,8 +609,7 @@ public bool SetGRBLState(string newState, int substate, bool force)
                         break;
 
                     case GrblStates.Door:
-                        if (_grblState.Substate > 0)
-                            _grblState.Color = _grblState.Substate == 1 ? Colors.Red : Colors.LightSalmon;
+                        _grblState.Color = _grblState.Substate == 0 ? Colors.LightSalmon :(_grblState.Substate == 1 ? Colors.Red : Colors.Beige);
                         break;
 
                     case GrblStates.Home:
@@ -698,16 +698,14 @@ public void ParseHomedStatus(string data)
         public bool ParseStatus(string data)
         {
             bool changed, wco_present = data.Contains("|WCO:");
+            int rti = data.Contains("|WCO:") ? 1 : (data.Contains("|Ov:") ? 2 : 0);
 
-            if((changed = (wco_present ? _rtStateEx : _rtState) != data)) {
+            if ((changed = (_rtState[rti] != data))) {
 
                 bool pos_changed = false;
                 string[] elements = data.TrimEnd('>').Split('|');
 
-                if(wco_present)
-                    _rtStateEx = data;
-                else
-                    _rtState = data;
+                _rtState[rti] = data;
 
                 if (elements.Length > 1)
                 {
@@ -1025,7 +1023,7 @@ private bool Set(string parameter, string value)
 
         private bool DataIsEnumeration (string data)
         {
-            return data.StartsWith("[SETTING:") || data.StartsWith("[ERRORCODE:") || data.StartsWith("[ALARMCODE:") || data.StartsWith("[SETTINGGROUP:");
+            return data.StartsWith("[SETTING:") || data.StartsWith("[ERRORCODE:") || data.StartsWith("[ALARMCODE:") || data.StartsWith("[SETTINGGROUP:") || data.StartsWith("[SETTINGDESCR:");
         }
 
         public void DataReceived(string data)
@@ -1053,7 +1051,7 @@ public void DataReceived(string data)
 
                 SetGRBLState("Alarm", alarm.Length == 2 ? int.Parse(alarm[1]) : -1, false);
             }
-            else if (data.StartsWith("["))
+            else if (data.First() == '[')
             {
                 int sep = data.IndexOf(':');
                 if(sep > 1) switch (data.Substring(1, sep - 1))
diff --git a/CNC Core/CNC Core/Properties/AssemblyInfo.cs b/CNC Core/CNC Core/Properties/AssemblyInfo.cs
index 2867478..3ffb36c 100644
--- a/CNC Core/CNC Core/Properties/AssemblyInfo.cs	
+++ b/CNC Core/CNC Core/Properties/AssemblyInfo.cs	
@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -9,10 +10,12 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
-[assembly: AssemblyProduct("CNC Core")]
+[assembly: AssemblyProduct("ioSender")]
 [assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,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.34.0")]
-[assembly: AssemblyFileVersion("2.0.34.0")]
+[assembly: AssemblyVersion("2.0.35.0")]
+[assembly: AssemblyFileVersion("2.0.35.0")]
diff --git a/CNC Core/CNC Core/SerialStream.cs b/CNC Core/CNC Core/SerialStream.cs
index d21a357..a781153 100644
--- a/CNC Core/CNC Core/SerialStream.cs	
+++ b/CNC Core/CNC Core/SerialStream.cs	
@@ -1,7 +1,7 @@
 /*
  * SerialStream.cs - part of CNC Controls library
  *
- * v0.33 / 2021-05-12 / Io Engineering (Terje Io)
+ * v0.35 / 2021-09-25 / Io Engineering (Terje Io)
  *
  */
 
@@ -41,9 +41,10 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using System.IO;
 using System.IO.Ports;
+using System.Management;
 using System.Windows.Threading;
-using System.IO;
 using System.Collections.ObjectModel;
 
 namespace CNC.Core
@@ -373,18 +374,23 @@ public ConnectMode(Comms.ResetMode mode, string name)
         public string Name { get; private set; }
     }
 
+    public class ComPort
+    {
+        public string Name { get; set; }
+        public string FullName { get; set; }
+    }
+
     public class SerialPorts : ViewModelBase
     {
         string _selected = string.Empty;
-        string[] _portnames;
         private ConnectMode _mode = null;
 
         public SerialPorts()
         {
             Refresh();
 
-            if (PortNames.Length > 0)
-                _selected = PortNames[0];
+            if (Ports.Count > 0)
+                _selected = Ports[0].Name;
 
             ConnectModes.Add(new ConnectMode(Comms.ResetMode.None, "No action"));
             ConnectModes.Add(new ConnectMode(Comms.ResetMode.DTR, "Toggle DTR"));
@@ -395,12 +401,34 @@ public SerialPorts()
 
         public void Refresh ()
         {
-            string[] _portnames = SerialPort.GetPortNames();
+            var _portnames = SerialPort.GetPortNames();
             Array.Sort(_portnames);
-            PortNames = _portnames;
+
+            Ports.Clear();
+
+            using (var searcher = new ManagementObjectSearcher("SELECT * FROM Win32_PnPEntity WHERE Caption like '%(COM%'"))
+            {
+                var ports = searcher.Get().Cast<ManagementBaseObject>().ToList().Select(p => p["Caption"].ToString());
+                var portList = _portnames.Select(n => ports.FirstOrDefault(s => s.Contains('(' + n + ')'))).ToList();
+                for(int i = 0; i < portList.Count; i++)
+                {
+                    var port = new ComPort();
+                    port.Name = _portnames[i];
+
+                    if (portList[i].Contains('(' + _portnames[i] + ')'))
+                        port.FullName = _portnames[i] + " - " + portList[i].Replace('(' + _portnames[i] + ')', "").Trim();
+                    else
+                        port.FullName = "";
+
+                    Ports.Add(port);
+                }
+            }
+
+            SelectedPort = Ports[0].Name;
         }
 
-        public string[] PortNames { get { return _portnames; } private set { _portnames = value; OnPropertyChanged(); } }
+        public ObservableCollection<ComPort> Ports { get; private set; } = new ObservableCollection<ComPort>();
+        public ObservableCollection<ConnectMode> ConnectModes { get; private set; } = new ObservableCollection<ConnectMode>();
 
         public string SelectedPort
         {
@@ -415,8 +443,6 @@ public string SelectedPort
             }
         }
 
-        public ObservableCollection<ConnectMode> ConnectModes { get; private set; } = new ObservableCollection<ConnectMode>();
-
         public ConnectMode SelectedMode
         {
             get { return _mode; }
diff --git a/CNC GCodeViewer/CNC GCodeViewer/CNC GCodeViewer.csproj b/CNC GCodeViewer/CNC GCodeViewer/CNC GCodeViewer.csproj
index 52a353c..e0ab7dd 100644
--- a/CNC GCodeViewer/CNC GCodeViewer/CNC GCodeViewer.csproj	
+++ b/CNC GCodeViewer/CNC GCodeViewer/CNC GCodeViewer.csproj	
@@ -31,6 +31,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <UICulture>en-US</UICulture>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="HelixToolkit.Wpf">
       <HintPath>..\..\helix-toolkit\HelixToolkit.Wpf.dll</HintPath>
diff --git a/CNC GCodeViewer/CNC GCodeViewer/ConfigControl.xaml b/CNC GCodeViewer/CNC GCodeViewer/ConfigControl.xaml
index 8029fe0..61cb97b 100644
--- a/CNC GCodeViewer/CNC GCodeViewer/ConfigControl.xaml	
+++ b/CNC GCodeViewer/CNC GCodeViewer/ConfigControl.xaml	
@@ -8,39 +8,39 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              mc:Ignorable="d" 
              d:DesignHeight="210" d:DesignWidth="250">
-    <GroupBox x:Name="grpGCodeViewer" Header="GCode Viewer" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
+    <GroupBox x:Uid="grp_gcodeViewer" x:Name="grpGCodeViewer" Header="GCode Viewer" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="250">
         <StackPanel HorizontalAlignment="Left" Height="Auto" Margin="0,3,0,0" VerticalAlignment="Top">
-            <CheckBox Content="Enable" Margin="90,2,0,0" IsChecked="{Binding Path=GCodeViewer.IsEnabled, Mode=TwoWay}"/>
-            <Controls:NumericField Label="Arc resolution:" Unit="segments" Format="#0" ColonAt="90" Value="{Binding Path=GCodeViewer.ArcResolution, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
-            <Controls:NumericField Label="Min distance:" ColonAt="90" Value="{Binding Path=GCodeViewer.MinDistance, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
+            <CheckBox x:Uid="lbl_enable" Content="Enable" Margin="90,2,0,0" IsChecked="{Binding Path=GCodeViewer.IsEnabled, Mode=TwoWay}"/>
+            <Controls:NumericField x:Uid="fld_arcResolution" Label="Arc resolution:" Unit="segments" Format="#0" ColonAt="90" Value="{Binding Path=GCodeViewer.ArcResolution, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
+            <Controls:NumericField x:Uid="fld_minDistance" Label="Min distance:" ColonAt="90" Value="{Binding Path=GCodeViewer.MinDistance, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
             <StackPanel Orientation="Horizontal" Height="Auto">
-                <Label Content="Cut color:" Width="90" HorizontalContentAlignment="Right"/>
+                <Label x:Uid="lbl_cutColor" Content="Cut color:" Width="90" HorizontalContentAlignment="Right"/>
                 <xctk:ColorPicker x:Name="_colorPicker" SelectedColor="{Binding Path=GCodeViewer.CutMotionColor, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}" VerticalAlignment="Top" Width="100"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Height="Auto">
-                <Label Content="Rapids color:" Width="90" HorizontalContentAlignment="Right"/>
+                <Label x:Uid="lbl_rapidsColor" Content="Rapids color:" Width="90" HorizontalContentAlignment="Right"/>
                 <xctk:ColorPicker x:Name="_colorPicker1" SelectedColor="{Binding Path=GCodeViewer.RapidMotionColor, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}" VerticalAlignment="Top" Width="100"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Height="Auto">
-                <Label Content="Retract color:" Width="90" HorizontalContentAlignment="Right"/>
+                <Label x:Uid="lbl_retractColor" Content="Retract color:" Width="90" HorizontalContentAlignment="Right"/>
                 <xctk:ColorPicker x:Name="_colorPicker2" SelectedColor="{Binding Path=GCodeViewer.RetractMotionColor, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}" VerticalAlignment="Top" Width="100"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Height="Auto">
-                <Label Content="Highlight color:" Width="90" HorizontalContentAlignment="Right"/>
+                <Label x:Uid="lbl_highlightColor" Content="Highlight color:" Width="90" HorizontalContentAlignment="Right"/>
                 <xctk:ColorPicker x:Name="_colorPicker4" SelectedColor="{Binding Path=GCodeViewer.HighlightColor, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}" VerticalAlignment="Top" Width="100"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Height="Auto">
-                <Label Content="Grid color:" Width="90" HorizontalContentAlignment="Right"/>
+                <Label x:Uid="lbl_gridColor" Content="Grid color:" Width="90" HorizontalContentAlignment="Right"/>
                 <xctk:ColorPicker x:Name="_colorPicker3" SelectedColor="{Binding Path=GCodeViewer.GridColor, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}" VerticalAlignment="Top" Width="100"/>
             </StackPanel>
-            <CheckBox Content="Black background" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.BlackBackground, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
-            <CheckBox Content="Show grid" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowGrid, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
-            <CheckBox Content="Show axes" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowAxes, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
-            <CheckBox Content="Show bounding box" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowBoundingBox, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
-            <CheckBox Content="Show ViewCube" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowViewCube, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
-            <CheckBox Content="Show coordinate system" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowCoordinateSystem, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
-            <CheckBox Content="Show text overlay" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowTextOverlay, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
-            <CheckBox Content="Highlight completed cuts" Margin="5,2,0,0" IsChecked="false" IsEnabled="False"/>
+            <CheckBox x:Uid="lbl_blackBackgroud" Content="Black background" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.BlackBackground, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
+            <CheckBox x:Uid="lbl_showGrid" Content="Show grid" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowGrid, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
+            <CheckBox x:Uid="lbl_showAxes" Content="Show axes" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowAxes, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
+            <CheckBox x:Uid="lbl_showBbox" Content="Show bounding box" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowBoundingBox, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
+            <CheckBox x:Uid="lbl_showViewCube" Content="Show ViewCube" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowViewCube, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
+            <CheckBox x:Uid="lbl_showCoordSys" Content="Show coordinate system" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowCoordinateSystem, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
+            <CheckBox x:Uid="lbl_showOverlay" Content="Show text overlay" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.ShowTextOverlay, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
+            <CheckBox x:Uid="lbl_highlightCompleted" Content="Highlight completed cuts" Margin="5,2,0,0" IsChecked="false" IsEnabled="False"/>
             <!--
             <CheckBox Content="Highlight completed cuts" Margin="5,2,0,0" IsChecked="{Binding Path=GCodeViewer.RenderExecuted, Mode=TwoWay}" IsEnabled="{Binding Path=GCodeViewer.IsEnabled, Mode=OneWay}"/>
             -->
diff --git a/CNC GCodeViewer/CNC GCodeViewer/Properties/AssemblyInfo.cs b/CNC GCodeViewer/CNC GCodeViewer/Properties/AssemblyInfo.cs
index 347e06a..cffc4a4 100644
--- a/CNC GCodeViewer/CNC GCodeViewer/Properties/AssemblyInfo.cs	
+++ b/CNC GCodeViewer/CNC GCodeViewer/Properties/AssemblyInfo.cs	
@@ -11,10 +11,12 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Io Engineering")]
-[assembly: AssemblyProduct("CNC GCodeViewer")]
+[assembly: AssemblyProduct("ioSender")]
 [assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -51,5 +53,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.34.0")]
-[assembly: AssemblyFileVersion("2.0.34.0")]
+[assembly: AssemblyVersion("2.0.35.0")]
+[assembly: AssemblyFileVersion("2.0.35.0")]
diff --git a/CNC GCodeViewer/CNC GCodeViewer/RenderControl.xaml b/CNC GCodeViewer/CNC GCodeViewer/RenderControl.xaml
index ea24fc5..c2df01c 100644
--- a/CNC GCodeViewer/CNC GCodeViewer/RenderControl.xaml	
+++ b/CNC GCodeViewer/CNC GCodeViewer/RenderControl.xaml	
@@ -8,7 +8,7 @@
              d:DesignHeight="335" d:DesignWidth="400"
              Loaded="control_Loaded">
     <DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-        <Button x:Name="button" DockPanel.Dock="Bottom" Content="Reset view" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="75" Click="button_Click"/>
+        <Button x:Uid="resetView" x:Name="button" DockPanel.Dock="Bottom" Content="Reset view" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="75" Click="button_Click"/>
         <Grid DockPanel.Dock="Top">
         <local:Renderer x:Name="gcodeView"/>
         <local:TextOverlayControl x:Name="textOverlay" HorizontalAlignment="Right" Margin="5,5" VerticalAlignment="Top"/>
diff --git a/CNC GCodeViewer/CNC GCodeViewer/Renderer.xaml.cs b/CNC GCodeViewer/CNC GCodeViewer/Renderer.xaml.cs
index deef4ef..b4338b0 100644
--- a/CNC GCodeViewer/CNC GCodeViewer/Renderer.xaml.cs	
+++ b/CNC GCodeViewer/CNC GCodeViewer/Renderer.xaml.cs	
@@ -232,7 +232,7 @@ private void Renderer_IsVisibleChanged(object sender, DependencyPropertyChangedE
         private void Renderer_Loaded(object sender, RoutedEventArgs e)
         {
             model = DataContext as GrblViewModel;
-            viewport.PreviewMouseWheel += Viewport_MouseWheel;
+//            viewport.PreviewMouseWheel += Viewport_MouseWheel;
 
 //            if (!System.ComponentModel.DesignerProperties.GetIsInDesignMode(this))
 //                AppConfig.Settings.GCodeViewer.PropertyChanged += GCodeViewer_PropertyChanged;
@@ -299,7 +299,7 @@ public bool AnimateTool
             get { return _animateTool; }
             set
             {
-                if(value != _animateTool)
+                if(value != _animateTool && model != null)
                 {
                     if ((_animateTool = value))
                     {
diff --git a/CNC GCodeViewer/CNC GCodeViewer/Viewer.xaml b/CNC GCodeViewer/CNC GCodeViewer/Viewer.xaml
index 2562129..90e4efb 100644
--- a/CNC GCodeViewer/CNC GCodeViewer/Viewer.xaml	
+++ b/CNC GCodeViewer/CNC GCodeViewer/Viewer.xaml	
@@ -9,7 +9,7 @@
              d:DesignHeight="515" d:DesignWidth="875"
              Loaded="control_Loaded">
     <DockPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="WhiteSmoke">
-        <Button Content="Reset view" DockPanel.Dock="Bottom" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Bottom" Width="75" Click="button_Click"/>
+        <Button x:Uid="btn_resetView" Content="Reset view" DockPanel.Dock="Bottom" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Bottom" Width="75" Click="button_Click"/>
         <Grid DockPanel.Dock="Top" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
             <local:Renderer x:Name="gcodeView" Margin="7,10,0,0"/>
             <Controls:LimitsControl HorizontalAlignment="Left" Margin="5,5" VerticalAlignment="Top"/>
diff --git a/GCode Sender/GCode Sender/App.xaml.cs b/GCode Sender/GCode Sender/App.xaml.cs
index 6682d15..1e5e0e1 100644
--- a/GCode Sender/GCode Sender/App.xaml.cs	
+++ b/GCode Sender/GCode Sender/App.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * App.xaml.cs - part of Grbl Code Sender
  *
- * v0.02 / 2019-10-02 / Io Engineering (Terje Io)
+ * v0.35 / 2021-09-30 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019, Io Engineering (Terje Io)
+Copyright (c) 2019-2021, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -38,12 +38,10 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 */
 
 using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Globalization;
+using System.Threading;
 using System.Windows;
+using System.Windows.Markup;
 
 namespace GCode_Sender
 {
@@ -52,5 +50,30 @@ namespace GCode_Sender
     /// </summary>
     public partial class App : Application
     {
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            string[] args = Environment.GetCommandLineArgs();
+
+            int p = 0, lng = 0;
+            while (p < args.GetLength(0)) switch (args[p++])
+            {
+                case "-locale":
+                    if (p < args.GetLength(0))
+                        lng = p;
+                    break;
+            }
+
+            if (lng > 0)
+            {
+                Thread.CurrentThread.CurrentUICulture =
+                 Thread.CurrentThread.CurrentCulture =
+                  CultureInfo.DefaultThreadCurrentCulture =
+                   CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo(args[lng]); ;
+
+                FrameworkElement.LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
+            }
+
+            base.OnStartup(e);
+        }
     }
 }
diff --git a/GCode Sender/GCode Sender/GCode Sender.csproj b/GCode Sender/GCode Sender/GCode Sender.csproj
index 4299845..de19ac3 100644
--- a/GCode Sender/GCode Sender/GCode Sender.csproj	
+++ b/GCode Sender/GCode Sender/GCode Sender.csproj	
@@ -50,7 +50,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
+    <UICulture>en-US</UICulture>
     <ApplicationIcon>App.ico</ApplicationIcon>
+    <Localizable>False</Localizable>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/GCode Sender/GCode Sender/MainWindow.xaml b/GCode Sender/GCode Sender/MainWindow.xaml
index 45a848a..65fac0d 100644
--- a/GCode Sender/GCode Sender/MainWindow.xaml	
+++ b/GCode Sender/GCode Sender/MainWindow.xaml	
@@ -24,21 +24,21 @@
     </Window.DataContext>
     <DockPanel IsEnabled="{Binding Path=IsMPGActive, Converter={StaticResource BooleanConverter}}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
         <Menu IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" DockPanel.Dock="Top">
-            <MenuItem x:Name="menuFile" Header="_File">
-                <MenuItem Header="_Load" Click="fileOpenMenuItem_Click"/>
-                <MenuItem x:Name="menuSaveFile" Header="_Save" IsEnabled="false" Click="fileSaveMenuItem_Click"/>
-                <MenuItem x:Name="menuCloseFile" Header="_Close" IsEnabled="false" Click="fileCloseMenuItem_Click"/>
-                <MenuItem x:Name="menuTransform" Header="_Transform" IsEnabled="false" ItemsSource="{Binding Path=UIViewModel.TransformMenuItems, RelativeSource={RelativeSource AncestorType=Window}}"/>
-                <MenuItem x:Name="menuOpenConsole" Header="_Open Console" Click="openConsoleMenuItem_Click"/>
-                <MenuItem Header="_Exit" Click="exitMenuItem_Click"/>
+            <MenuItem x:Uid="mnu_file" x:Name="menuFile" Header="_File">
+                <MenuItem x:Uid="mnu_load" Header="_Load" Click="fileOpenMenuItem_Click"/>
+                <MenuItem x:Uid="mnu_save" x:Name="menuSaveFile" Header="_Save" IsEnabled="false" Click="fileSaveMenuItem_Click"/>
+                <MenuItem x:Uid="mnu_close" x:Name="menuCloseFile" Header="_Close" IsEnabled="false" Click="fileCloseMenuItem_Click"/>
+                <MenuItem x:Uid="mnu_transform" x:Name="menuTransform" Header="_Transform" IsEnabled="false" ItemsSource="{Binding Path=UIViewModel.TransformMenuItems, RelativeSource={RelativeSource AncestorType=Window}}"/>
+                <MenuItem x:Uid="mnu_openConsole" x:Name="menuOpenConsole" Header="_Open Console" Click="openConsoleMenuItem_Click"/>
+                <MenuItem x:Uid="mnu_exit" Header="_Exit" Click="exitMenuItem_Click"/>
             </MenuItem>
-            <MenuItem x:Name="menuCamera" Header="_Camera">
-                <MenuItem Header="_Open" Click="CameraOpen_Click"/>
+            <MenuItem x:Uid="mnu_camera" x:Name="menuCamera" Header="_Camera">
+                <MenuItem x:Uid="mnu_open" Header="_Open" Click="CameraOpen_Click"/>
             </MenuItem>
-            <MenuItem x:Name="menuHelp" Header="_Help">
-                <MenuItem Header="_Wiki" Click="aboutWikiItem_Click"/>
-                <MenuItem Header="Usage _tips" Click="tipsWikiItem_Click"/>
-                <MenuItem Header="_About" Click="aboutMenuItem_Click"/>
+            <MenuItem x:Uid="mnu_help" x:Name="menuHelp" Header="_Help">
+                <MenuItem x:Uid="mnu_wiki" Header="_Wiki" Click="aboutWikiItem_Click"/>
+                <MenuItem x:Uid="mnu_usageTips" Header="Usage _tips" Click="tipsWikiItem_Click"/>
+                <MenuItem x:Uid="mnu_about" Header="_About" Click="aboutMenuItem_Click"/>
             </MenuItem>
         </Menu>
         <ToolBarTray DockPanel.Dock="Top" IsLocked="True">
@@ -76,15 +76,15 @@
             </StatusBarItem>
             <Separator Grid.Column="1" />
             <StatusBarItem Grid.Column="2">
-                <TextBlock Text="{Binding Path=Message}" TextWrapping="NoWrap"/>
+                <TextBlock x:Uid="lbl_message" Text="{Binding Path=Message}" TextWrapping="NoWrap"/>
             </StatusBarItem>
             <Separator Grid.Column="3" />
             <StatusBarItem Grid.Column="4">
-                <TextBlock Text="{Binding Path=RunTime, StringFormat=Run time: \{0\}}" TextWrapping="NoWrap" Padding="2,0"/>
+                <TextBlock x:Uid="lbl_runtime" Text="{Binding Path=RunTime, StringFormat=Run time: \{0\}}" TextWrapping="NoWrap" Padding="2,0"/>
             </StatusBarItem>
             <Separator Grid.Column="5" />
             <StatusBarItem Grid.Column="6">
-                <TextBlock ToolTip="Distance for keyboard step jog (with &lt;CTRL&gt; modifier)." Text="{Binding Path=JogStep, StringFormat=Jog step: \{0\}}" TextWrapping="NoWrap" Margin="2,0" Width="80"/>
+                <TextBlock x:Uid="lbl_jogStep" ToolTip="Distance for keyboard step jog (with &lt;CTRL&gt; modifier)." Text="{Binding Path=JogStep, StringFormat=Jog step: \{0\}}" TextWrapping="NoWrap" Margin="2,0" Width="80"/>
             </StatusBarItem>
         </StatusBar>
         <Canvas DockPanel.Dock="Right" Width="22" VerticalAlignment="Stretch" HorizontalAlignment="Right" ClipToBounds="False" Panel.ZIndex="1">
@@ -103,43 +103,43 @@
             <cnccontrols:THCMonitorControl x:Name="thcControl" Visibility="Hidden" Canvas.Right="22" Canvas.Top="500"/>
         </Canvas>
         <TabControl Background="#FFE5E5E5" DockPanel.Dock="Left" x:Name="tabMode" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="False" SelectionChanged="TabMode_SelectionChanged">
-            <TabItem x:Name="tabGrbl" Header="Grbl" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+            <TabItem x:Uid="tab_grbl" x:Name="tabGrbl" Header="Grbl" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <local:JobView x:Name="Grbl"/>
             </TabItem>
-            <TabItem x:Name="tabViewer" Header="3D View">
+            <TabItem x:Uid="tab_3DView" x:Name="tabViewer" Header="3D View">
                 <cncviewer:Viewer x:Name="viewer"/>
             </TabItem>
-            <TabItem x:Name="tabProbing" Header="Probing">
+            <TabItem x:Uid="tab_probing" x:Name="tabProbing" Header="Probing">
                 <cncprobingcontrols:ProbingView x:Name="probingView"/>
             </TabItem>
-            <TabItem x:Name="tabSDCard" Header="SD Card">
+            <TabItem x:Uid="tab_sdCard" x:Name="tabSDCard" Header="SD Card">
                 <cnccontrols:SDCardView x:Name="SDCardView" FileSelected="SDCardView_FileSelected"/>
             </TabItem>
-            <TabItem x:Name="tabTurning" Header="Turning">
+            <TabItem x:Uid="tab_turning" x:Name="tabTurning" Header="Turning">
                 <cnclathecontrols:TurningWizard x:Name="turningWizard"/>
             </TabItem>
-            <TabItem x:Name="tabParting" Header="Parting">
+            <TabItem x:Uid="tab_parting" x:Name="tabParting" Header="Parting">
                 <cnclathecontrols:PartingWizard x:Name="partingWizard"/>
             </TabItem>
-            <TabItem x:Name="tabThreading" Header="Threading">
+            <TabItem x:Uid="tab_threading" x:Name="tabThreading" Header="Threading">
                 <cnclathecontrols:ThreadingWizard x:Name="threadingWizard"/>
             </TabItem>
-            <TabItem x:Name="tabOffsets" Header="Offsets">
+            <TabItem x:Uid="tab_offsets" x:Name="tabOffsets" Header="Offsets">
                 <cnccontrols:OffsetView x:Name="offsetControl"/>
             </TabItem>
-            <TabItem x:Name="tabTools" Header="Tools">
+            <TabItem x:Uid="tab_tools" x:Name="tabTools" Header="Tools">
                 <cnccontrols:ToolView x:Name="toolControl"/>
             </TabItem>
-            <TabItem x:Name="tabTrinamic" Header="Trinamic tuner">
+            <TabItem x:Uid="tab_trinamic" x:Name="tabTrinamic" Header="Trinamic tuner">
                 <cnccontrols:TrinamicView x:Name="toolTrinamic"/>
             </TabItem>
-            <TabItem x:Name="tabConfig" Header="Settings: Grbl">
+            <TabItem x:Uid="tab_grblConfig" x:Name="tabConfig" Header="Settings: Grbl">
                 <cnccontrols:GrblConfigView x:Name="configControl"/>
             </TabItem>
-            <TabItem x:Name="tabAppConfig" Header="Settings: App">
+            <TabItem x:Uid="tab_appConfig" x:Name="tabAppConfig" Header="Settings: App">
                 <cnccontrols:AppConfigView x:Name="appConfigControl"/>
             </TabItem>
-            <TabItem x:Name="tabPIDTuner" Header="PID Tuner">
+            <TabItem x:Uid="tab_pidTuner" x:Name="tabPIDTuner" Header="PID Tuner">
                 <cnccontrols:PIDLogView x:Name="toolPIDTuner"/>
             </TabItem>
             <!--
diff --git a/GCode Sender/GCode Sender/MainWindow.xaml.cs b/GCode Sender/GCode Sender/MainWindow.xaml.cs
index 5c33a46..7d80934 100644
--- a/GCode Sender/GCode Sender/MainWindow.xaml.cs	
+++ b/GCode Sender/GCode Sender/MainWindow.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.33 / 2021-05-16 / Io Engineering (Terje Io)
+ * v0.35 / 2021-10-26 / Io Engineering (Terje Io)
  *
  */
 
@@ -45,6 +45,8 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 using CNC.Converters;
 using System.Windows.Threading;
 using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Threading;
 #if ADD_CAMERA
 using CNC.Controls.Camera;
 #endif
@@ -54,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.34";
+        private const string version = "2.0.35";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
diff --git a/GCode Sender/GCode Sender/Properties/AssemblyInfo.cs b/GCode Sender/GCode Sender/Properties/AssemblyInfo.cs
index 08612bc..36cabd6 100644
--- a/GCode Sender/GCode Sender/Properties/AssemblyInfo.cs	
+++ b/GCode Sender/GCode Sender/Properties/AssemblyInfo.cs	
@@ -15,6 +15,7 @@
 [assembly: AssemblyCopyright("Copyright ©  2021 Io Engineering")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -51,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.34.0")]
-[assembly: AssemblyFileVersion("2.0.34.0")]
+[assembly: AssemblyVersion("2.0.35.0")]
+[assembly: AssemblyFileVersion("2.0.35.0")]
diff --git a/Grbl Config App/Grbl Config App/MainWindow.xaml b/Grbl Config App/Grbl Config App/MainWindow.xaml
index bb5f0c7..1816520 100644
--- a/Grbl Config App/Grbl Config App/MainWindow.xaml	
+++ b/Grbl Config App/Grbl Config App/MainWindow.xaml	
@@ -17,8 +17,10 @@
         <Menu DockPanel.Dock="Top">
             <MenuItem x:Name="menuFile" Header="_File">
                 <MenuItem Header="_About" Click="aboutMenuItem_Click"/>
-                <MenuItem Header="Fetch and save grbl_HAL settings info" Click="getHalSettingsItem_Click"/>
-                <MenuItem Header="Fetch and save _Grbl settings info" Click="getGrblSettingsItem_Click"/>
+                <MenuItem x:Name="halsettings"  Header="Fetch and save grbl_HAL settings info" Click="getHalSettingsItem_Click"/>
+                <MenuItem x:Name="grblsettings"  Header="Fetch and save _Grbl settings info" Click="getGrblSettingsItem_Click"/>
+                <MenuItem x:Name="grblalarms"  Header="Fetch and save Grbl a_larm info" Click="getGrblAlarmsItem_Click"/>
+                <MenuItem x:Name="grblerrors"  Header="Fetch and save Grbl e_rror info" Click="getGrblErrorsItem_Click"/>
                 <MenuItem Header="_Exit" Click="exitMenuItem_Click"/>
             </MenuItem>
         </Menu>
diff --git a/Grbl Config App/Grbl Config App/MainWindow.xaml.cs b/Grbl Config App/Grbl Config App/MainWindow.xaml.cs
index a64c663..6147e60 100644
--- a/Grbl Config App/Grbl Config App/MainWindow.xaml.cs	
+++ b/Grbl Config App/Grbl Config App/MainWindow.xaml.cs	
@@ -2,7 +2,7 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.34 / 2021-08-20 / Io Engineering (Terje Io)
+ * v0.35 / 2021-08-21 / Io Engineering (Terje Io)
  *
  */
 
@@ -52,7 +52,7 @@ namespace Grbl_Config_App
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.34";
+        private const string version = "2.0.35";
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
 
         public MainWindow()
@@ -82,6 +82,9 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
                 GrblSettings.Load();
             }
 
+            halsettings.IsEnabled = grblsettings.IsEnabled = GrblInfo.IsGrblHAL && GrblInfo.Build >= 20210819;
+            grblalarms.IsEnabled = grblerrors.IsEnabled = GrblInfo.IsGrblHAL && GrblInfo.Build >= 20210823;
+
             configView.Activate(true, ViewType.Startup);
         }
 
@@ -122,7 +125,8 @@ private void getHalSettingsItem_Click(object sender, RoutedEventArgs e)
                     Filter = "Tab separated file (*.txt)|*.txt",
                     AddExtension = true,
                     DefaultExt = ".txt",
-                    ValidateNames = true
+                    ValidateNames = true,
+                    Title = "Save setting information in grblHAL tab separated format"
                 };
 
                 if (saveDialog.ShowDialog() == true)
@@ -143,7 +147,52 @@ private void getGrblSettingsItem_Click(object sender, RoutedEventArgs e)
                     Filter = "Comma separated file (*.csv)|*.csv",
                     AddExtension = true,
                     DefaultExt = ".csv",
-                    ValidateNames = true
+                    ValidateNames = true,
+                    Title = "Save setting information in Grbl .csv format"
+                };
+
+                if (saveDialog.ShowDialog() == true)
+                    g.Backup(saveDialog.FileName);
+            }
+        }
+
+        private void getGrblAlarmsItem_Click(object sender, RoutedEventArgs e)
+        {
+            bool getExtended = GrblInfo.ExtendedProtocol && GrblInfo.Build >= 20200716;
+
+            var g = new Settings();
+
+            if (g.Load(DataContext as GrblViewModel, "$EAG"))
+            {
+                SaveFileDialog saveDialog = new SaveFileDialog()
+                {
+                    Filter = "Comma separated file (*.csv)|*.csv",
+                    AddExtension = true,
+                    DefaultExt = ".csv",
+                    ValidateNames = true,
+                    Title = "Save alarm codes in Grbl .csv format"
+                };
+
+                if (saveDialog.ShowDialog() == true)
+                    g.Backup(saveDialog.FileName);
+            }
+        }
+
+        private void getGrblErrorsItem_Click(object sender, RoutedEventArgs e)
+        {
+            bool getExtended = GrblInfo.ExtendedProtocol && GrblInfo.Build >= 20200716;
+
+            var g = new Settings();
+
+            if (g.Load(DataContext as GrblViewModel, "$EEG"))
+            {
+                SaveFileDialog saveDialog = new SaveFileDialog()
+                {
+                    Filter = "Comma separated file (*.csv)|*.csv",
+                    AddExtension = true,
+                    DefaultExt = ".csv",
+                    ValidateNames = true,
+                    Title = "Save error codes in Grbl .csv format"
                 };
 
                 if (saveDialog.ShowDialog() == true)
diff --git a/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs b/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs
index 65d2143..d185d55 100644
--- a/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs	
+++ b/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs	
@@ -51,5 +51,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.34.0")]
-[assembly: AssemblyFileVersion("2.0.34.0")]
+[assembly: AssemblyVersion("2.0.35.0")]
+[assembly: AssemblyFileVersion("2.0.35.0")]
diff --git a/Locale/ReadMe.md b/Locale/ReadMe.md
new file mode 100644
index 0000000..820410b
--- /dev/null
+++ b/Locale/ReadMe.md
@@ -0,0 +1,4 @@
+#### ioSender localization \(translation\) files, see the [Wiki](https://github.com/terjeio/ioSender/wiki/Localization) for details.
+
+---
+2021-10-26
diff --git a/Locale/en-US/ReadMe.md b/Locale/en-US/ReadMe.md
new file mode 100644
index 0000000..26b1cae
--- /dev/null
+++ b/Locale/en-US/ReadMe.md
@@ -0,0 +1,5 @@
+## ioSender locale: en-US
+
+These are the default language files. Do _not_ change!
+
+When starting a new translation create a new folder and copy the files from this folder there.
diff --git a/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv
new file mode 100644
index 0000000..c79faee
--- /dev/null
+++ b/Locale/en-US/csv/CNC.Controls.Camera.resources.en-US.csv
@@ -0,0 +1,4 @@
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get current position
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Move offset
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Camera
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Offset motion:
diff --git a/Locale/en-US/csv/CNC.Controls.DragKnife.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.DragKnife.resources.en-US.csv
new file mode 100644
index 0000000..31de6de
--- /dev/null
+++ b/Locale/en-US/csv/CNC.Controls.DragKnife.resources.en-US.csv
@@ -0,0 +1,6 @@
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,dlg_dragKnife:System.Windows.Window.Title,Title,True,True,,Drag knife parameters
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,grp_knife:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Knife
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,grp_retract:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Retract
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,lbl_retractEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Retract enable
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
new file mode 100644
index 0000000..7a209c3
--- /dev/null
+++ b/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
@@ -0,0 +1,85 @@
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Add _position
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_addProfile:System.Windows.Controls.ContentControl.Content,Button,True,True,,...
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Apply
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Apply
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set from program limits
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,Click to activate keyboard jogging
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift to activate
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_load:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Load
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_probe:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Probe
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Save
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setG92:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set offset (G92)
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_useX0Y0:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Use X0,Y0"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Z offset from current position where probing will take place
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_offset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Distance from corner to probe
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click edge, corner or center to select probing action."
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click edge, corner or center to select probing action."
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click to select probing action.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click edge to select probing action.
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,grp_action:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Action
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Camera
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_clearances:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing clearances
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_dimensions:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece dimensions
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_distanceAndSpeed:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing distances and speed
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_passes:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Passes
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_passes:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,More than one pass is usually needed to get accurate dimensions.
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_prbeProperties:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probe XY offsets
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,grp_probeConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_probeTipOrTool:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probe tip/tool
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Rotation center
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click to select rotation center relative to job, if not selected X0,Y0 is used."
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_touchOrFixture:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Touch plate/fixture height
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece offset
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
+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: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
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed rate for second slow probing move
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Lock
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Lock
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Unlock and set X or Y size to 0 to probe in one direction only.
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Pause before probing
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_probeFixture:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe fixture @ G59.3
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_profile:System.Windows.Controls.ContentControl.Content,Label,True,True,,Profile:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Feed rate for rapid moves, set to 0 to use controller setting"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed rate for initial probing move
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setCoordOrOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Set coordinate system or offset
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setRefernecOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Establish reference offset
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Set Z = 0 at X0Y0:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,with tool:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Add
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set coordinate system:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Center:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Center finder
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeExternal:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,"Edge finder, internal"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,"Edge finder, external"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_heightmap:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Height map
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Rotation:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Rotation
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_toolOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Tool length offset
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,Warning! Use with care - incorrect parameters may damage your probe!
diff --git a/Locale/en-US/csv/CNC.Controls.Viewer.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.Viewer.resources.en-US.csv
new file mode 100644
index 0000000..01e1ac1
--- /dev/null
+++ b/Locale/en-US/csv/CNC.Controls.Viewer.resources.en-US.csv
@@ -0,0 +1,17 @@
+CNC.Controls.Viewer.g.en-US.resources:viewer.baml,btn_resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset view
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,grp_gcodeViewer:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,GCode Viewer
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_blackBackgroud:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Black background
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_cutColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Cut color:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Enable
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_gridColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Grid color:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_highlightColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Highlight color:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_highlightCompleted:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Highlight completed cuts
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_rapidsColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Rapids color:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_retractColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Retract color:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showAxes:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show axes
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showBbox:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show bounding box
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showCoordSys:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show coordinate system
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showGrid:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show grid
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showOverlay:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show text overlay
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showViewCube:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show ViewCube
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset view
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
new file mode 100644
index 0000000..338d315
--- /dev/null
+++ b/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
@@ -0,0 +1,140 @@
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_add:System.Windows.Controls.ContentControl.Content,Button,True,True,,Add
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows.Controls.ContentControl.Content,Button,True,True,,Backup
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_currPos:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get current position
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_currPos:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get current position
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_cycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+R
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_cycleStart:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cycle Start
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,btn_edit:System.Windows.Controls.ContentControl.Content,Button,True,True,,Edit
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_feedHold:System.Windows.Controls.ContentControl.Content,Button,True,True,,Feed Hold
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_feedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Space
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,btn_getStatus:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get status
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,btn_getStatusAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Get status, all drivers"
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,btn_go:System.Windows.Controls.ContentControl.Content,Button,True,True,,Go
+CNC.Controls.WPF.g.en-US.resources:gotocontrol.baml,btn_gotoG28:System.Windows.Controls.ContentControl.Content,Button,True,True,,Goto position 1 (G28)
+CNC.Controls.WPF.g.en-US.resources:gotocontrol.baml,btn_gotoG30:System.Windows.Controls.ContentControl.Content,Button,True,True,,Goto position 2 (G30)
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.Controls.ContentControl.Content,Button,True,True,,Home
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+H
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reload settings from controller.
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift+R
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Windows.Controls.ContentControl.Content,Button,True,True,,Restore
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Rewind
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save settings
+CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Send
+CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+S
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,To Clipboard
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Copy grbl version information and settings to clipboard
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,Unlock
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+U
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Upload
+CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zero all
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Right click for menu, double click to run file."
+CNC.Controls.WPF.g.en-US.resources:about.baml,dlg_about:System.Windows.Window.Title,Title,True,True,,About
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,Sender connection
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,dlg_macroEditor:System.Windows.Window.Title,Title,True,True,,Macro Editor
+CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.Windows.Window.Title,Title,True,True,,Sender Console
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Sender connection
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Angle:
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,degrees
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Maximum serial buffer size utilized (limited to 90% of reported value).
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Time between status request sent to controller.
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Delay to allow controller to finish booting before communication starts.
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,grb_mainConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Main
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,grp_coolant:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Coolant
+CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,grp_dro:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,DRO
+CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,grp_feedrate:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Feed rate
+CNC.Controls.WPF.g.en-US.resources:stripgcodeconfigcontrol.baml,grp_gcodeStrip:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,GCode command stripping
+CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_jogDistance:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Distance
+CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_jogFeedrate:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Feed rate
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,grp_kbdJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Keyboard jogging
+CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,grp_mdi:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,MDI
+CNC.Controls.WPF.g.en-US.resources:limitscontrol.baml,grp_programLimits:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Program limits
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,grp_rotationCenter:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Rotation center
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,grp_rotationCenter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click to select rotation center relative to job, if not selected X0,Y0 is used."
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,grp_signals:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Signals
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,grp_spindle:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Spindle
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,stallGuard
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Work Parameters
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Block
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Data
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Name
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Offset
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_size:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Size
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,hdr_tool:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Tool
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter out realtime responses
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show all realtime responses
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_aAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,A axis:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Buffers more than one GCode block in controller for smoother execution. For grblHAL only!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Agressive buffering
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Removes superfluous gcode command elements.
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Auto-compress gcode on transforms
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_bAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,B axis:
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_cAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,C axis:
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_ccw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,CCW
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_check:System.Windows.Controls.ContentControl.Content,Label,True,True,,Check
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_configure:System.Windows.Controls.ContentControl.Content,Button,True,True,,Configure
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_cw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,CW
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Enable
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_fan:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Fan
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Feed rate:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Enable if ok responses overwhelm console logging, typically happens when sending lots of short commands."
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter &quot;ok&quot; response
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter out realtime responses
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_flood:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Flood
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_ipAddress:System.Windows.Controls.ContentControl.Content,Label,True,True,,IP address:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Buffers more than one GCode block in controller for smoother execution. For grblHAL only!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Keep MDI focus
+CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,lbl_machinePosition:System.Windows.Controls.TextBlock.Text,Text,True,True,,Machine Position
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_mist:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Mist
+CNC.Controls.WPF.g.en-US.resources:mpgpending.baml,lbl_mpgModeActive:System.Windows.Controls.ContentControl.Content,Label,True,True,,"MPG mode active, waiting for it to be disabled..."
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_netPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,Port:
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,lbl_noMacrosDefined:System.Windows.Controls.ContentControl.Content,Label,True,True,,"No macros defined, use Edit button to add."
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_off:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Off
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_offset:System.Windows.Controls.ContentControl.Content,Label,True,True,,Offset:
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_offset:System.Windows.Controls.ContentControl.Content,Label,True,True,,Offset:
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_onConnect:System.Windows.Controls.ContentControl.Content,Label,True,True,,On connect:
+CNC.Controls.WPF.g.en-US.resources:overridecontrol.baml,lbl_override:System.Windows.Controls.ContentControl.Content,Label,True,True,,Override
+CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,lbl_rapids:System.Windows.Controls.ContentControl.Content,Label,True,True,,Rapids:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Restore last window size on startup
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore window size on next startup.
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_rpm:System.Windows.Controls.ContentControl.Content,Label,True,True,,RPM
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,Port:
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_sgLoad:System.Windows.Controls.ContentControl.Content,Label,True,True,,Load (SG_RESULT)
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show all realtime responses
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_stallGuardEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Enable filter (SFILT)
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_state:System.Windows.Controls.ContentControl.Content,Label,True,True,,State:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tipRadius:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Tip radius:
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verbose
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
+CNC.Controls.WPF.g.en-US.resources:offsetview.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:offsetview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z axis:
+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_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:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Network
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Serial
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,Execute moves to outline X and Y program limits.
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,Ensure tool tip is clear of any obstructions!
diff --git a/Locale/en-US/csv/CNC.Converters.resources.en-US.csv b/Locale/en-US/csv/CNC.Converters.resources.en-US.csv
new file mode 100644
index 0000000..9aa1128
--- /dev/null
+++ b/Locale/en-US/csv/CNC.Converters.resources.en-US.csv
@@ -0,0 +1,6 @@
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,bn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cancel
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_scalingFactors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Scaling factors
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_spindle_feed:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Spindle and feed
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_tool:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Tool
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_zPosition:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Z positions (relative to workpiece surface)
diff --git a/Locale/en-US/csv/ioSender.resources.en-US.csv b/Locale/en-US/csv/ioSender.resources.en-US.csv
new file mode 100644
index 0000000..a54c202
--- /dev/null
+++ b/Locale/en-US/csv/ioSender.resources.en-US.csv
@@ -0,0 +1,27 @@
+ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Distance for keyboard step jog (with &lt;CTRL&gt; modifier).
+ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_About
+ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Camera
+ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Close
+ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Exit
+ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_File
+ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Help
+ioSender.g.en-US.resources:mainwindow.baml,mnu_load:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Load
+ioSender.g.en-US.resources:mainwindow.baml,mnu_open:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Open
+ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Open Console
+ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Save
+ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Transform
+ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Usage _tips
+ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
+ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D View
+ioSender.g.en-US.resources:mainwindow.baml,tab_appConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Settings: App
+ioSender.g.en-US.resources:mainwindow.baml,tab_grbl:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Grbl
+ioSender.g.en-US.resources:mainwindow.baml,tab_grblConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Settings: Grbl
+ioSender.g.en-US.resources:mainwindow.baml,tab_offsets:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Offsets
+ioSender.g.en-US.resources:mainwindow.baml,tab_parting:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Parting
+ioSender.g.en-US.resources:mainwindow.baml,tab_pidTuner:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,PID Tuner
+ioSender.g.en-US.resources:mainwindow.baml,tab_probing:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing
+ioSender.g.en-US.resources:mainwindow.baml,tab_sdCard:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,SD Card
+ioSender.g.en-US.resources:mainwindow.baml,tab_threading:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Threading
+ioSender.g.en-US.resources:mainwindow.baml,tab_tools:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Tools
+ioSender.g.en-US.resources:mainwindow.baml,tab_trinamic:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Trinamic tuner
+ioSender.g.en-US.resources:mainwindow.baml,tab_turning:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Turning
diff --git a/Locale/en-US/translation.txt b/Locale/en-US/translation.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8421a4699722098c31994b05305e779b05c6b0c6
GIT binary patch
literal 41302
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
TP5j?NdUkeoCo)>iVAcNv`!x-t

literal 0
HcmV?d00001

diff --git a/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
new file mode 100644
index 0000000..151c7f8
--- /dev/null
+++ b/Locale/zh-CN/csv/CNC.Controls.Camera.resources.zh-CN.csv
@@ -0,0 +1,4 @@
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get current position
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Move offset
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,相机
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Offset motion:
diff --git a/Locale/zh-CN/csv/CNC.Controls.DragKnife.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.DragKnife.resources.zh-CN.csv
new file mode 100644
index 0000000..b829630
--- /dev/null
+++ b/Locale/zh-CN/csv/CNC.Controls.DragKnife.resources.zh-CN.csv
@@ -0,0 +1,6 @@
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,dlg_dragKnife:System.Windows.Window.Title,Title,True,True,,Drag knife parameters
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,grp_knife:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Knife
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,grp_retract:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Retract
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,lbl_retractEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Retract enable
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
new file mode 100644
index 0000000..de84b69
--- /dev/null
+++ b/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
@@ -0,0 +1,85 @@
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Add _position
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_addProfile:System.Windows.Controls.ContentControl.Content,Button,True,True,,...
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Apply
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Apply
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set from program limits
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,Click to activate keyboard jogging
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift to activate
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_load:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Load
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_probe:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Probe
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Save
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setG92:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set offset (G92)
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_useX0Y0:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Use X0,Y0"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Z offset from current position where probing will take place
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_offset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Distance from corner to probe
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click edge, corner or center to select probing action."
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click edge, corner or center to select probing action."
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click to select probing action.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click edge to select probing action.
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,grp_action:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Action
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,相机
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_clearances:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing clearances
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_dimensions:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece dimensions
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_distanceAndSpeed:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing distances and speed
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_passes:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Passes
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_passes:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,More than one pass is usually needed to get accurate dimensions.
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_prbeProperties:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probe XY offsets
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,grp_probeConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_probeTipOrTool:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probe tip/tool
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Rotation center
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click to select rotation center relative to job, if not selected X0,Y0 is used."
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_touchOrFixture:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Touch plate/fixture height
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece offset
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
+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: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
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed rate for second slow probing move
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Lock
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Lock
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Unlock and set X or Y size to 0 to probe in one direction only.
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Pause before probing
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_probeFixture:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe fixture @ G59.3
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_profile:System.Windows.Controls.ContentControl.Content,Label,True,True,,轮廓:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Feed rate for rapid moves, set to 0 to use controller setting"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed rate for initial probing move
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setCoordOrOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Set coordinate system or offset
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setRefernecOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Establish reference offset
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Set Z = 0 at X0Y0:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,with tool:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Add
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Update
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set coordinate system:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Center:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Center finder
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeExternal:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,"Edge finder, internal"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,"Edge finder, external"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_heightmap:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Height map
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Rotation:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,旋转
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_toolOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Tool length offset
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,Warning! Use with care - incorrect parameters may damage your probe!
diff --git a/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv
new file mode 100644
index 0000000..8a56c26
--- /dev/null
+++ b/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv
@@ -0,0 +1,17 @@
+CNC.Controls.Viewer.g.en-US.resources:viewer.baml,btn_resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset view
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,grp_gcodeViewer:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,GCode Viewer
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_blackBackgroud:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Black background
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_cutColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Cut color:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启用
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_gridColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Grid color:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_highlightColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Highlight color:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_highlightCompleted:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Highlight completed cuts
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_rapidsColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Rapids color:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_retractColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Retract color:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showAxes:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show axes
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showBbox:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show bounding box
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showCoordSys:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show coordinate system
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showGrid:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show grid
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showOverlay:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show text overlay
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showViewCube:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show ViewCube
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset view
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
new file mode 100644
index 0000000..a3788fe
--- /dev/null
+++ b/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
@@ -0,0 +1,140 @@
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_add:System.Windows.Controls.ContentControl.Content,Button,True,True,,Add
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows.Controls.ContentControl.Content,Button,True,True,,Backup
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear all
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_currPos:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get current position
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_currPos:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get current position
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_cycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+R
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_cycleStart:System.Windows.Controls.ContentControl.Content,Button,True,True,,Cycle Start
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,btn_edit:System.Windows.Controls.ContentControl.Content,Button,True,True,,Edit
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_feedHold:System.Windows.Controls.ContentControl.Content,Button,True,True,,保持给进
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_feedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Space
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,btn_getStatus:System.Windows.Controls.ContentControl.Content,Button,True,True,,Get status
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,btn_getStatusAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,"Get status, all drivers"
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,btn_go:System.Windows.Controls.ContentControl.Content,Button,True,True,,Go
+CNC.Controls.WPF.g.en-US.resources:gotocontrol.baml,btn_gotoG28:System.Windows.Controls.ContentControl.Content,Button,True,True,,Goto position 1 (G28)
+CNC.Controls.WPF.g.en-US.resources:gotocontrol.baml,btn_gotoG30:System.Windows.Controls.ContentControl.Content,Button,True,True,,Goto position 2 (G30)
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.Controls.ContentControl.Content,Button,True,True,,起始点
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+H
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reload settings from controller.
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,复位
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift+R
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Windows.Controls.ContentControl.Content,Button,True,True,,Restore
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Rewind
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save settings
+CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Send
+CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+S
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,To Clipboard
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Copy grbl version information and settings to clipboard
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,解锁
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+U
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Upload
+CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zero all
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Right click for menu, double click to run file."
+CNC.Controls.WPF.g.en-US.resources:about.baml,dlg_about:System.Windows.Window.Title,Title,True,True,,关于
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,Sender connection
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,dlg_macroEditor:System.Windows.Window.Title,Title,True,True,,Macro Editor
+CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.Windows.Window.Title,Title,True,True,,Sender Console
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Sender connection
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,角度:
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,degrees
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Maximum serial buffer size utilized (limited to 90% of reported value).
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Time between status request sent to controller.
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Delay to allow controller to finish booting before communication starts.
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,grb_mainConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Main
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,grp_coolant:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Coolant
+CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,grp_dro:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,DRO
+CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,grp_feedrate:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,给进速率
+CNC.Controls.WPF.g.en-US.resources:stripgcodeconfigcontrol.baml,grp_gcodeStrip:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,GCode command stripping
+CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_jogDistance:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Distance
+CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_jogFeedrate:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,给进速率
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,grp_kbdJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Keyboard jogging
+CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,grp_mdi:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,MDI
+CNC.Controls.WPF.g.en-US.resources:limitscontrol.baml,grp_programLimits:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Program limits
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,grp_rotationCenter:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Rotation center
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,grp_rotationCenter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click to select rotation center relative to job, if not selected X0,Y0 is used."
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,grp_signals:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Signals
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,grp_spindle:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,主轴
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,stallGuard
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Work Parameters
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,块
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Data
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,名称
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,偏移
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_size:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Size
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,hdr_tool:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Tool
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter out realtime responses
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show all realtime responses
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_aAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,A axis:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Buffers more than one GCode block in controller for smoother execution. For grblHAL only!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Agressive buffering
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Removes superfluous gcode command elements.
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Auto-compress gcode on transforms
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_bAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,B axis:
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_cAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,C axis:
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_ccw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,逆时针
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_check:System.Windows.Controls.ContentControl.Content,Label,True,True,,Check
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_configure:System.Windows.Controls.ContentControl.Content,Button,True,True,,Configure
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_cw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,顺时针
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启用
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_fan:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Fan
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,给进速率:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Enable if ok responses overwhelm console logging, typically happens when sending lots of short commands."
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter &quot;ok&quot; response
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter out realtime responses
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_flood:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Flood
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_ipAddress:System.Windows.Controls.ContentControl.Content,Label,True,True,,IP address:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Buffers more than one GCode block in controller for smoother execution. For grblHAL only!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Keep MDI focus
+CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,lbl_machinePosition:System.Windows.Controls.TextBlock.Text,Text,True,True,,Machine Position
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_mist:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Mist
+CNC.Controls.WPF.g.en-US.resources:mpgpending.baml,lbl_mpgModeActive:System.Windows.Controls.ContentControl.Content,Label,True,True,,"MPG mode active, waiting for it to be disabled..."
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_netPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,端口:
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,lbl_noMacrosDefined:System.Windows.Controls.ContentControl.Content,Label,True,True,,"No macros defined, use Edit button to add."
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_off:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Off
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_offset:System.Windows.Controls.ContentControl.Content,Label,True,True,,偏移:
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_offset:System.Windows.Controls.ContentControl.Content,Label,True,True,,偏移:
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_onConnect:System.Windows.Controls.ContentControl.Content,Label,True,True,,On connect:
+CNC.Controls.WPF.g.en-US.resources:overridecontrol.baml,lbl_override:System.Windows.Controls.ContentControl.Content,Label,True,True,,Override
+CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,lbl_rapids:System.Windows.Controls.ContentControl.Content,Label,True,True,,Rapids:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Restore last window size on startup
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore window size on next startup.
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_rpm:System.Windows.Controls.ContentControl.Content,Label,True,True,,RPM
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,端口:
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_sgLoad:System.Windows.Controls.ContentControl.Content,Label,True,True,,Load (SG_RESULT)
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show all realtime responses
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_stallGuardEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Enable filter (SFILT)
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_state:System.Windows.Controls.ContentControl.Content,Label,True,True,,状态:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tipRadius:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Tip radius:
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verbose
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
+CNC.Controls.WPF.g.en-US.resources:offsetview.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:offsetview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z axis:
+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_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:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Network
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Serial
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,Execute moves to outline X and Y program limits.
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,Ensure tool tip is clear of any obstructions!
diff --git a/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv
new file mode 100644
index 0000000..fbe1609
--- /dev/null
+++ b/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv
@@ -0,0 +1,6 @@
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,bn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,取消
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_scalingFactors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Scaling factors
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_spindle_feed:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Spindle and feed
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_tool:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Tool
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_zPosition:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Z positions (relative to workpiece surface)
diff --git a/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv b/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
new file mode 100644
index 0000000..2a803d5
--- /dev/null
+++ b/Locale/zh-CN/csv/ioSender.resources.zh-CN.csv
@@ -0,0 +1,27 @@
+ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Distance for keyboard step jog (with &lt;CTRL&gt; modifier).
+ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_About
+ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Camera
+ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Close
+ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Exit
+ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_File
+ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Help
+ioSender.g.en-US.resources:mainwindow.baml,mnu_load:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Load
+ioSender.g.en-US.resources:mainwindow.baml,mnu_open:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Open
+ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Open Console
+ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Save
+ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Transform
+ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Usage _tips
+ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
+ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D View
+ioSender.g.en-US.resources:mainwindow.baml,tab_appConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Settings: App
+ioSender.g.en-US.resources:mainwindow.baml,tab_grbl:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Grbl
+ioSender.g.en-US.resources:mainwindow.baml,tab_grblConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Settings: Grbl
+ioSender.g.en-US.resources:mainwindow.baml,tab_offsets:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Offsets
+ioSender.g.en-US.resources:mainwindow.baml,tab_parting:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Parting
+ioSender.g.en-US.resources:mainwindow.baml,tab_pidTuner:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,PID Tuner
+ioSender.g.en-US.resources:mainwindow.baml,tab_probing:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing
+ioSender.g.en-US.resources:mainwindow.baml,tab_sdCard:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,SD Card
+ioSender.g.en-US.resources:mainwindow.baml,tab_threading:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Threading
+ioSender.g.en-US.resources:mainwindow.baml,tab_tools:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工具
+ioSender.g.en-US.resources:mainwindow.baml,tab_trinamic:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Trinamic tuner
+ioSender.g.en-US.resources:mainwindow.baml,tab_turning:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Turning
diff --git a/Locale/zh-CN/translation.txt b/Locale/zh-CN/translation.txt
new file mode 100644
index 0000000000000000000000000000000000000000..038c6382872106ff071f003733202462e8c39697
GIT binary patch
literal 41048
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

literal 0
HcmV?d00001

diff --git a/changelog.md b/changelog.md
index 45d837d..59dc9bf 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,24 @@
 
 Executable for development builds available for download [here](http://www.io-engineering.com/downloads/) if you want to participate in testing.
 
+---
+
+2021-10-26: [Release 2.0.35](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.35).
+
+* Added support for localization \(translation\) see the [Wiki](https://github.com/terjeio/ioSender/wiki/Localization) for details.
+* Added `-locale` startup parameter for overriding the default language read from the OS.
+* Added sender configuration for not checking probe state before probing @G59.3, if probe is asserted it will result in alarm that has to be cleared.
+* Added signals box to Trinamic tuner.
+* Changed keyboard jogging to always use metric mode.
+* Limit keyboard jog commands to be within machine limits if not handled by the controller.  
+__NOTES:__ Machine has to be homed for this to work properly, N_KEY rollower is not supported neither is fast tapping of keys.  
+grblHAL users should set `$40` to `1` for the best keyboard jogging functionality.
+* Added description to com ports selection drop-down.
+* Improved program limits calculation.
+* Some minor bug fixes.
+
+---
+
 2021-08-20: [Release 2.0.34](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.34).
 
 Sender:
@@ -17,6 +35,8 @@ Config app:
 * Updated for latest libraries.
 * Added fetch and save of settings information for sender use in Grbl- and grblHAL-format. Requires grblHAL controller build 20210819 or later.
 
+---
+
 2021-05-16: [Release 2.0.33](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.33).
 
 * Added _Rotation_ tab to _Probing_ and _Rotate_ submenu to _File > Transform_.
diff --git a/readme.md b/readme.md
index b3f022c..120e5ed 100644
--- a/readme.md
+++ b/readme.md
@@ -10,11 +10,11 @@ Please check out the [Wiki](https://github.com/terjeio/Grbl-GCode-Sender/wiki) f
 
 ---
 
-Second production release 2.0.33, see the [changelog](changelog.md) for details.
+Latest release is 2.0.35, 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/terjeio/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...
+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...
 
 ---
 
@@ -52,7 +52,7 @@ Lathe mode.
 
 ![Easy configuration](Media/Sender6.png)
 
-Conversational programming for Lathe Mode. Threading requires [grblHAL](https://github.com/terjeio/grblHAL) controller with driver that has spindle sync support.
+Conversational programming for Lathe Mode. Threading requires [grblHAL](https://github.com/grblHAL) controller with driver that has spindle sync support.
 
 ---
-2021-05-16
+2021-10-26