diff --git a/CHANGES.txt b/CHANGES.txt
index 4f287e3..6fcef9e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,7 @@
 This file documents changes made:
+V1.0.9.7	- 2016 Oct 12
+			- Adapt to new Gbrl 1.1a reports, etc.
+			- Added button to clear Pin states, makes them latch on even a single report
 V1.0.9.6	- 2016 Aug 27
 			- Change spacebar to control Hold/Resume Issue #62
 			- Enable use of Enter for Grbl Settings and Offsets
diff --git a/Grbl-Panel/CHANGES.txt b/Grbl-Panel/CHANGES.txt
index 4f287e3..6fcef9e 100644
--- a/Grbl-Panel/CHANGES.txt
+++ b/Grbl-Panel/CHANGES.txt
@@ -1,4 +1,7 @@
 This file documents changes made:
+V1.0.9.7	- 2016 Oct 12
+			- Adapt to new Gbrl 1.1a reports, etc.
+			- Added button to clear Pin states, makes them latch on even a single report
 V1.0.9.6	- 2016 Aug 27
 			- Change spacebar to control Hold/Resume Issue #62
 			- Enable use of Enter for Grbl Settings and Offsets
diff --git a/Grbl-Panel/GrblGcode.vb b/Grbl-Panel/GrblGcode.vb
index 7c846a2..673b857 100644
--- a/Grbl-Panel/GrblGcode.vb
+++ b/Grbl-Panel/GrblGcode.vb
@@ -104,7 +104,7 @@ Partial Class GrblGui
             _runMode = False
             gcodeview.fileMode = False
 
-            If Not (data.StartsWith("$") Or data.StartsWith("?")) Then
+            If (data.StartsWith("$J") Or Not (data.StartsWith("$") Or data.StartsWith("?"))) Then
                 ' add to display
                 ' _gui.gcodeview.Insert(data, 0)
                 With gcodeview
diff --git a/Grbl-Panel/GrblGui.vb b/Grbl-Panel/GrblGui.vb
index 38f63ff..549bc47 100644
--- a/Grbl-Panel/GrblGui.vb
+++ b/Grbl-Panel/GrblGui.vb
@@ -5,6 +5,7 @@ Imports System.Threading.Thread
 
 Public Class GrblGui
 
+    Public GrblVersion As Integer           ' 0 for 0.x, 1 for 1.x version
     Public WithEvents grblPort As GrblIF    ' Public so that the timer thread can see grblPort
     Private status As GrblStatus            ' For status polling
     Private jogging As GrblJogging          ' for jogging control
@@ -15,7 +16,7 @@ Public Class GrblGui
     Public state As GrblState              ' to track gcode state
     Public settings As GrblSettings         ' To handle Settings related ops
     Public ovrrides As GrblOverrides       ' to display overrides
-    Public pins As GrblPins                 ' to display pin states
+    Public pins As GrblPins               ' to display Pin states
 
     Private _exitClicked As Boolean = False   ' to separate Close (x) from File/Exit
 
@@ -491,7 +492,7 @@ Public Class GrblGui
                 gbSettingsPosition.Enabled = False
                 gbGrblSettings.Enabled = False
 
-                btnStatusGetParser.Enabled = False
+                btnStatusClearPins.Enabled = False
             Case "Disconnected"
                 ' We are not connected so not much you can do
                 gbJogging.Enabled = False
@@ -506,7 +507,7 @@ Public Class GrblGui
                 gbSettingsPosition.Enabled = False
                 gbGrblSettings.Enabled = False
 
-                btnStatusGetParser.Enabled = False
+                btnStatusClearPins.Enabled = False
             Case "Idle"
                 ' General use, no gcode streaming
                 gbJogging.Enabled = True
@@ -521,7 +522,7 @@ Public Class GrblGui
                 gbSettingsPosition.Enabled = True
                 gbGrblSettings.Enabled = True
 
-                btnStatusGetParser.Enabled = True
+                btnStatusClearPins.Enabled = True
         End Select
     End Sub
 
diff --git a/Grbl-Panel/GrblJogging.vb b/Grbl-Panel/GrblJogging.vb
index bbb086b..74e2056 100644
--- a/Grbl-Panel/GrblJogging.vb
+++ b/Grbl-Panel/GrblJogging.vb
@@ -71,7 +71,9 @@ Partial Class GrblGui
             Case "Z-"
                 gcode.sendGCodeLine(createJogCommand("Z-"))
         End Select
-        gcode.sendGCodeLine("G90")
+        If GrblVersion = 0 Then
+            gcode.sendGCodeLine("G90")
+        End If
     End Sub
 
     Private Sub cbSettingsMetric_CheckedChanged(sender As Object, e As EventArgs) Handles cbSettingsMetric.CheckedChanged
@@ -134,7 +136,12 @@ Partial Class GrblGui
     Public Function createJogCommand(ByVal axis As String) As String
         ' Builds a jog command from various inputs
         ' Jog in incremental mode, leave parser in absolute mode!
-        Return "G91 " + whichUnits() + " G01 " + axis + whichDistance() + " F" + whichFeedRate()
+        If GrblVersion = 0 Then
+            Return "G91 " + whichUnits() + " G01 " + axis + whichDistance() + " F" + whichFeedRate()
+        End If
+        If GrblVersion = 1 Then
+            Return "$J=G91" + whichUnits() + axis + whichDistance() + " F" + whichFeedRate()
+        End If
     End Function
     ''' <summary>
     ''' Return value of current Distance Increment
diff --git a/Grbl-Panel/GrblOverrides.vb b/Grbl-Panel/GrblOverrides.vb
index 2b3ff9c..497314c 100644
--- a/Grbl-Panel/GrblOverrides.vb
+++ b/Grbl-Panel/GrblOverrides.vb
@@ -6,9 +6,10 @@ Partial Class grblgui
     ''' Class to handle overrides related functionality
     ''' </summary>
     Public Enum overrideChars
-        CMD_SAFETY_DOOR = 132 '0x84
-        CMD_DEBUG_REPORT = 133 '0x85 ' Only When DEBUG enabled, sends debug report In '{}' braces. 
-        CMD_FEED_OVR_RESET = 144 '0x90         ' Restores feed override value To 100%.
+        CMD_SAFETY_DOOR = 132       '0x84
+        CMD_JOG_CANCEL = 133        ' 0x85
+        CMD_DEBUG_REPORT = 133      '0x86 ' Only When DEBUG enabled, sends debug report In '{}' braces. 
+        CMD_FEED_OVR_RESET = 144    '0x90         ' Restores feed override value To 100%.
         CMD_FEED_OVR_COARSE_PLUS = 145 '0x91
         CMD_FEED_OVR_COARSE_MINUS = 146 ' 0x92
         CMD_FEED_OVR_FINE_PLUS = 147 ' 0x93
@@ -17,12 +18,14 @@ Partial Class grblgui
         CMD_RAPID_OVR_MEDIUM = 150 '0x96
         CMD_RAPID_OVR_LOW = 151 ' 0x97
         ' CMD_RAPID_OVR_EXTRA_LOW 0x98 ' *Not SUPPORTED*
-        CMD_SPINDLE_OVR_RESET = 153 ' 0x99      ' Restores spindle override value To 100%.
+        CMD_SPINDLE_OVR_RESET = 153     ' 0x99      ' Restores spindle override value To 100%.
         CMD_SPINDLE_OVR_COARSE_PLUS = 154 ' 0x9A
         CMD_SPINDLE_OVR_COARSE_MINUS = 155 ' 0x9B
         CMD_SPINDLE_OVR_FINE_PLUS = 156 ' 0x9C
         CMD_SPINDLE_OVR_FINE_MINUS = 157 '0x9D
-        CMD_SPINDLE_OVR_STOP = 158 '0x9E
+        CMD_SPINDLE_OVR_STOP = 158  '0x9E aka Toogle Spindle Stop
+        CMD_TOGGLE_FLOOD = 160      ' 0xA0
+        CMD_TOGGLE_MIST = 161       ' 0xA1
     End Enum
     Public Class GrblOverrides
         Private _gui As GrblGui
@@ -58,20 +61,43 @@ Partial Class grblgui
 
     Public Sub showOverrides(ByVal data As String)
 
-        Dim _ovrIndex As Integer
-        Dim _ovr As String()
-
-        _ovrIndex = data.LastIndexOf("OVR:")
-        If _ovrIndex = -1 Then
-            Return
-        Else
-            data = data.Remove(data.Length - 3, 3) ' Remove > and vbCrLf
-            ' We have Grbl V1.0 or later so display overrides
-            _ovr = data.Substring(_ovrIndex + 4).Split(",")
-            tbFeedOvr.Text = _ovr(0) + "%"
-            tbRapidOvr.Text = _ovr(1) + "%"
-            tbSpindleOvr.Text = _ovr(2) + "%"
+        ' Process Override values, Grbl 1.x only
+        If data.Contains("Ov:") Or data.Contains("T:") Then
+            data = data.Remove(data.Length - 3, 3)
+            Dim statusMessage = Split(data, "|")
+            For Each item As String In statusMessage
+                Dim portion() As String = Split(item, ":")
+                Select Case portion(0)
+                    Case "Ov"
+                        Dim ovr = Split(portion(1), ",")
+                        tbFeedOvr.Text = ovr(0) + "%"
+                        tbRapidOvr.Text = ovr(1) + "%"
+                        tbSpindleOvr.Text = ovr(2) + "%"
+                        If Not data.Contains("T") Then
+                            btnSpindleOverride.BackColor = Color.Transparent
+                        End If
+                    Case "T"
+                        If portion(1).Contains("S") Then
+                            btnSpindleOverride.BackColor = Color.Crimson
+                        End If
+                        If portion(1).Contains("F") Then
+                            If btnFloodOverride.BackColor = Color.Crimson Then
+                                btnFloodOverride.BackColor = Color.Transparent
+                            Else
+                                btnFloodOverride.BackColor = Color.Crimson
+                            End If
+                        End If
+                        If portion(1).Contains("M") Then
+                            If btnMistOverride.BackColor = Color.Crimson Then
+                                btnMistOverride.BackColor = Color.Transparent
+                            Else
+                                btnMistOverride.BackColor = Color.Crimson
+                            End If
+                        End If
+                End Select
+            Next
         End If
+
     End Sub
     ''' <summary>
     ''' Handles the Click event of the btnFeedOverride controls.
@@ -137,9 +163,27 @@ Partial Class grblgui
                 grblPort.sendData(Chr(overrideChars.CMD_SPINDLE_OVR_RESET))
         End Select
     End Sub
+    ''' <summary>
+    ''' Handle toggle of some overrides, constrained by present state
+    ''' </summary>
+    ''' <param name="sender"></param>
+    ''' <param name="e"></param>
+    Private Sub btnToggleOverride_Click(sender As Object, e As EventArgs) Handles btnSpindleOverride.Click, btnMistOverride.Click, btnFloodOverride.Click
+        ' Spindle toggle only in Hold
+        ' Coolant and Mist in Idle,Run or Hold
+        Dim btn As Button = sender
+        Select Case DirectCast(btn.Tag, String)
+            Case "SpindleOverride"
+                grblPort.sendData(Chr(overrideChars.CMD_SPINDLE_OVR_STOP))
 
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnRapidMinus.Click
-
-        grblPort.sendData(Chr(overrideChars.CMD_DEBUG_REPORT))
+                If btnSpindleOverride.BackColor = Color.Crimson Then
+                    btnSpindleOverride.BackColor = Color.Transparent
+                End If
+            Case "FloodOverride"
+                grblPort.sendData(Chr(overrideChars.CMD_TOGGLE_FLOOD))
+            Case "MistOverride"
+                grblPort.sendData(Chr(overrideChars.CMD_TOGGLE_MIST))
+        End Select
+        ' btn colour changes based on T:SFM response handled in showOverrides()
     End Sub
 End Class
diff --git a/Grbl-Panel/GrblPins.vb b/Grbl-Panel/GrblPins.vb
index 1edae0f..d9e7022 100644
--- a/Grbl-Panel/GrblPins.vb
+++ b/Grbl-Panel/GrblPins.vb
@@ -60,6 +60,9 @@ Partial Class GrblGui
                 _gui.gbPinStatus.Visible = value
                 If value = True Then
                     With _gui
+                        .cbLimitX.Visible = True
+                        .cbLimitY.Visible = True
+                        .cbLimitZ.Visible = True
                         .cbProbePin.Visible = True
                         .cbResetAbort.Visible = True
                         .cbFeedHold.Visible = True
@@ -76,38 +79,63 @@ Partial Class GrblGui
     Public Sub showGrblPins(ByVal data As String)
         Dim pos As Integer
 
-        If data(0) = vbLf Or data(0) = vbCr Then
-            Return                  ' nothing to do
-        End If
+        If data = vbCrLf Then Return
 
-        ' Show X, Y, Z limit pin state
-        If Not pins.LimitsSeen Then
-            If data.Contains("Lim:") Or data.Contains("Pin:") Then
+        ' We are on Grbl 0.9
+        If GrblVersion = 0 And data.Contains("Lim:") Then
+            ' We need to show Limit pins
+            If Not pins.LimitsSeen Then
                 pins.LimitsSeen = True
             End If
-        End If
-
-        If Not pins.PinsSeen Then
-            If data.Contains("Pin:") Then
-                pins.PinsSeen = True
-            End If
-        End If
-
-        If data.Contains("Lim:") Or data.Contains("Pin:") Then
-            ' We need to show Limit pins
-            pos = InStr(data, "Lim:") + InStr(data, "Pin:")
+            pos = InStr(data, "Lim:")
             cbLimitZ.Checked = (data(pos + 3) = "1")
             cbLimitY.Checked = (data(pos + 4) = "1")
             cbLimitX.Checked = (data(pos + 5) = "1")
         End If
 
-        ' pos 6 and 8 are delimiters "|"
-        If data.Contains("Pin:") Then
-            ' Show other pins
-            cbProbePin.Checked = (data(pos + 7) = "0")
-            cbStartResume.Checked = (data(pos + 9) = "1")
-            cbFeedHold.Checked = (data(pos + 10) = "1")
-            cbResetAbort.Checked = (data(pos + 11) = "1")
+        ' Are we on Grbl 1.0 or later?
+        If GrblVersion = 1 And data(0) = "<" Then
+            If data.Contains("Pn:") Then
+                ' Show other pins
+                Dim pinlist As String
+                If Not pins.PinsSeen Then
+                    pins.PinsSeen = True
+                End If
+                data = data.Remove(data.Length - 3, 3)
+                Dim statusMessage = Split(data, "|")
+                For Each item As String In statusMessage
+                    Dim portion() As String = Split(item, ":")
+                    Select Case portion(0)
+                        Case "Pn"
+                            pinlist = portion(1)
+                            cbProbePin.Checked = InStr(pinlist, "P")
+                            cbDoorOpen.Checked = InStr(pinlist, "D")
+                            cbFeedHold.Checked = InStr(pinlist, "H")
+                            cbResetAbort.Checked = InStr(pinlist, "R")
+                            cbStartResume.Checked = InStr(pinlist, "S")
+
+                            cbLimitX.Checked = InStr(pinlist, "X")
+                            cbLimitY.Checked = InStr(pinlist, "Y")
+                            cbLimitZ.Checked = InStr(pinlist, "Z")
+                    End Select
+                Next
+                ' We don't clear, use the provided button. 
+                ' This makes the pin occurance latch
+            End If
         End If
     End Sub
+
+
+    Private Sub btnStatusClearPins_Click(sender As Object, e As EventArgs) Handles btnStatusClearPins.Click
+        ' Clear pins if set
+        cbProbePin.Checked = False
+        cbDoorOpen.Checked = False
+        cbFeedHold.Checked = False
+        cbResetAbort.Checked = False
+        cbStartResume.Checked = False
+
+        cbLimitX.Checked = False
+        cbLimitY.Checked = False
+        cbLimitZ.Checked = False
+    End Sub
 End Class
\ No newline at end of file
diff --git a/Grbl-Panel/GrblPosition.vb b/Grbl-Panel/GrblPosition.vb
index 7c833a5..9e00fc6 100644
--- a/Grbl-Panel/GrblPosition.vb
+++ b/Grbl-Panel/GrblPosition.vb
@@ -41,32 +41,112 @@ Partial Class GrblGui
             End If
 
         End Sub
+
+        Private _wcoX As Decimal
+        Public Property wcoX() As Decimal
+            Get
+                Return _wcoX
+            End Get
+            Set(ByVal value As Decimal)
+                _wcoX = value
+            End Set
+        End Property
+        Private _wcoY As Decimal
+        Public Property wcoY() As Decimal
+            Get
+                Return _wcoY
+            End Get
+            Set(ByVal value As Decimal)
+                _wcoY = value
+            End Set
+        End Property
+
+        Private _wcoZ As Decimal
+        Public Property wcoZ() As Decimal
+            Get
+                Return _wcoZ
+            End Get
+            Set(ByVal value As Decimal)
+                _wcoZ = value
+            End Set
+        End Property
     End Class
 
 
     Public Sub showGrblPositions(ByVal data As String)
 
         ' Show data in the Positions group (from our own thread)
-        If (data.Contains("MPos:")) Then
-            ' Lets display the values
-            data = data.Remove(data.Length - 3, 3)   ' Remove the "> " at end
-            Dim positions = Split(data, ":")
-            Dim machPos = Split(positions(1), ",")
-            Dim workPos = Split(positions(2), ",")
-
-            tbMachX.Text = machPos(0).ToString
-            tbMachY.Text = machPos(1).ToString
-            tbMachZ.Text = machPos(2).ToString
-
-            tbWorkX.Text = workPos(0).ToString
-            tbWorkY.Text = workPos(1).ToString
-            tbWorkZ.Text = workPos(2).ToString
-
-            'Set same values into the repeater view on Offsets page
-            tbOffSetsMachX.Text = machPos(0).ToString
-            tbOffSetsMachY.Text = machPos(1).ToString
-            tbOffSetsMachZ.Text = machPos(2).ToString
+        If data = vbCrLf Then Return
+
+        If GrblVersion = 0 Then
+            ' Grbl versions 0.x
+            If (data.Contains("MPos:")) Then
+                ' Lets display the values
+                data = data.Remove(data.Length - 3, 3)   ' Remove the "> " at end
+                Dim positions = Split(data, ":")
+                Dim machPos = Split(positions(1), ",")
+                Dim workPos = Split(positions(2), ",")
+
+                tbMachX.Text = machPos(0).ToString
+                tbMachY.Text = machPos(1).ToString
+                tbMachZ.Text = machPos(2).ToString
+
+                tbWorkX.Text = workPos(0).ToString
+                tbWorkY.Text = workPos(1).ToString
+                tbWorkZ.Text = workPos(2).ToString
+
+                'Set same values into the repeater view on Offsets page
+                tbOffSetsMachX.Text = machPos(0).ToString
+                tbOffSetsMachY.Text = machPos(1).ToString
+                tbOffSetsMachZ.Text = machPos(2).ToString
+            End If
+        End If
 
+        If GrblVersion = 1 Then
+            ' Grbl/Gnea versions 1.x
+            If data.StartsWith("<") Then
+                data = data.Remove(data.Length - 3, 3)
+                Dim statusMessage = Split(data, "|")
+                For Each item As String In statusMessage
+                    Dim portion() As String = Split(item, ":")
+                    ' Pn, Ov, T are handled in their respective objects
+                    Select Case portion(0)
+                        Case "WCO"
+                            ' WCO appears now and then or if it changes
+                            Dim wco = Split(portion(1), ",")
+                            position.wcoX = wco(0)
+                            position.wcoY = wco(1)
+                            position.wcoZ = wco(2)
+                        Case "MPos"
+                            ' We get Mpos but no WPos depending on $10
+                            Dim machPos = Split(portion(1), ",")
+                            tbMachX.Text = machPos(0).ToString
+                            tbMachY.Text = machPos(1).ToString
+                            tbMachZ.Text = machPos(2).ToString
+
+                            tbWorkX.Text = (machPos(0) - position.wcoX).ToString("0.000")
+                            tbWorkY.Text = (machPos(1) - position.wcoY).ToString("0.000")
+                            tbWorkZ.Text = (machPos(2) - position.wcoZ).ToString("0.000")
+
+                            'Set same values into the repeater view on Offsets page
+                            tbOffSetsMachX.Text = tbMachX.Text
+                            tbOffSetsMachY.Text = tbMachY.Text
+                            tbOffSetsMachZ.Text = tbMachZ.Text
+                        Case "WPos"
+                            ' We get WPos but no MPos depending on $10
+                            Dim workPos = Split(portion(1), ",")
+                            tbWorkX.Text = workPos(0).ToString
+                            tbWorkY.Text = workPos(1).ToString
+                            tbWorkZ.Text = workPos(2).ToString
+
+                            tbMachX.Text = (workPos(0) + position.wcoX).ToString("0.000")
+                            tbMachY.Text = (workPos(1) + position.wcoY).ToString("0.000")
+                            tbMachZ.Text = (workPos(2) + position.wcoZ).ToString("0.000")
+
+                    End Select
+                Next
+
+            End If
         End If
     End Sub
 
diff --git a/Grbl-Panel/GrblSettings.vb b/Grbl-Panel/GrblSettings.vb
index 1711e8e..bdbd2a5 100644
--- a/Grbl-Panel/GrblSettings.vb
+++ b/Grbl-Panel/GrblSettings.vb
@@ -154,7 +154,7 @@ Partial Class GrblGui
 
         ' Event template for Settings Retrieved indication
         Public Event GrblSettingsRetrieved()
-        Private newPropertyValue As String
+
         Public Sub RefreshSettings()
             _nextParam = 0
             gcode.sendGCodeLine("$$")
diff --git a/Grbl-Panel/GrblState.vb b/Grbl-Panel/GrblState.vb
index e6325e5..1c93d08 100644
--- a/Grbl-Panel/GrblState.vb
+++ b/Grbl-Panel/GrblState.vb
@@ -24,7 +24,7 @@
             End If
         End Sub
 
-        Private Sub GrblConnected(ByVal msg As String)     ' Handles GrblGui.Connected Event
+        Public Sub GrblConnected(ByVal msg As String)     ' Handles GrblGui.Connected Event
             If msg = "Connected" Then
 
                 ' We are connected to Grbl so populate the State
diff --git a/Grbl-Panel/GrblStatus.vb b/Grbl-Panel/GrblStatus.vb
index 12a4125..b629a99 100644
--- a/Grbl-Panel/GrblStatus.vb
+++ b/Grbl-Panel/GrblStatus.vb
@@ -106,13 +106,7 @@ Partial Class GrblGui
         grblPort.sendData("~")
     End Sub
 
-    Private Sub btnStatusGetParser_Click(sender As Object, e As EventArgs) Handles btnStatusGetParser.Click
-        ' Send request for Parser State, response handler picks it up and displays
-        grblPort.sendData("$G")
-    End Sub
-
     Public Sub showGrblStatus(ByVal data As String)
-
         ' TODO This needs tidying up, pre-process message to remove leading, trailing < [ , etc. so 
         ' we have a clean code flow below, create a messageType variable?
         'Console.WriteLine("showGrblStatus: " + data)
@@ -140,72 +134,156 @@ Partial Class GrblGui
             Me.lbResponses.TopIndex = Me.lbResponses.Items.Count - 1
         End If
 
-        ' Split out the Q and Buffer sizes
-        ' (Look for Buf:nn,RX:nnn)
-        If (data.Contains("Buf:")) Then
-            ' Lets display the values
-            data = data.Remove(data.Length - 3, 3)   ' Remove the "> " at end
-            Dim positions = Split(data, ":")
-            Try
-                Dim buffer = Split(positions(3), ",")
-                Dim rx = Split(positions(4), ",")
-                prgbRxBuf.Value = rx(0)
-                prgBarQ.Value = buffer(0)
-            Catch
-                ' do nothing, should have Status Report mask = 15
-            End Try
-        End If
+        If data.StartsWith("Grbl") Then
+            ' set Grbl version, 0.x or 1.x
+            GrblVersion = data.Substring(5, 1)
+            If GrblVersion = 1 Then
+                pins.PinsSeen = True      ' Show all pins
+            Else
+                pins.LimitsSeen = True      ' Show limit pins only
+            End If
 
-        ' Show status on the buttons
-        ' Extract status
-        Dim status = Split(data, ",")
-        ' Set indicators
-        If Not IsNothing(status) Then 'And status(0).StartsWith("<") Then
-            statusSetIndicators(status(0))
-        End If
+            ' Something reset the Grbl device, likely a physical Reset
+            ' Stop what we are doing and clear out for restart
+            state.GrblConnected("Connected")   ' Reset State object
+                gcode.ResetGcode(False)
 
-        ' Set button states
-        If status(0) = "<Idle" Or status(0) = "<Run" Then
-            ' Clear the button lights
-            Me.btnUnlock.BackColor = Color.Transparent
-            Me.btnHold.BackColor = Color.Transparent
-            Me.btnReset.BackColor = Color.Transparent
-            Me.btnStartResume.BackColor = Color.Transparent
-            Me.btnStartResume.Text = "Start"
-        End If
-        If data.StartsWith("<Queue") Or data.StartsWith("<Hold") Then   ' This might become Hold later when fixed in Grbl
-            Me.btnStartResume.BackColor = Color.Crimson
-            Me.btnStartResume.Text = "Resume"
-        End If
-        If status(0) = "<Alarm" Then
-            Me.btnUnlock.BackColor = Color.Crimson
-        End If
-        If status(0) = "<Alarm" Or status(0).StartsWith("ALARM") Then
-            statusSetIndicators(status(0).Substring(0, 6))       ' Messy Status messages make for messy code :(
-        End If
-        ' Major problem so cancel the file
-        ' Let GrblGcode class handle the error
-        'gcode.sendGCodeFileStop()
+            End If
+
+            ' We switch processing based on Grbl version, 1.x is quite different
+
+            If GrblVersion = 0 Then
+            ' Split out the Q and Buffer sizes
+            ' (Look for Buf:nn,RX:nnn)
+            If (data.Contains("Buf:")) Then     ' Pre Grbl 1.0
+                ' Lets display the values
+                data = data.Remove(data.Length - 3, 3)   ' Remove the "> " at end
+                Dim positions = Split(data, ":")
+                Try
+                    Dim buffer = Split(positions(3), ",")
+                    Dim rx = Split(positions(4), ",")
+                    prgbRxBuf.Value = rx(0)
+                    prgBarQ.Value = buffer(0)
+                Catch
+                    ' do nothing, should have Status Report mask = 15
+                End Try
+            End If
+
+            ' Show status on the buttons
+            ' Extract status
+            Dim status = Split(data, ",")
+            ' Set indicators
+            If Not IsNothing(status) Then 'And status(0).StartsWith("<") Then
+                statusSetIndicators(status(0))
+            End If
 
-        ' Display the Parser state if that is the message type
-        If data(0) = "[" And data.Contains("F") Then        ' we have a Parser status message
-            state.ProcessGCode(data)
+            ' Set button states
+            If status(0) = "<Idle" Or status(0) = "<Run" Then
+                ' Clear the button lights
+                Me.btnUnlock.BackColor = Color.Transparent
+                Me.btnHold.BackColor = Color.Transparent
+                Me.btnReset.BackColor = Color.Transparent
+                Me.btnStartResume.BackColor = Color.Transparent
+                Me.btnStartResume.Text = "Start"
+            End If
+            If data.StartsWith("<Queue") Or data.StartsWith("<Hold") Then   ' This might become Hold later when fixed in Grbl
+                Me.btnStartResume.BackColor = Color.Crimson
+                Me.btnStartResume.Text = "Resume"
+            End If
+            If status(0) = "<Alarm" Then
+                Me.btnUnlock.BackColor = Color.Crimson
+            End If
+            If status(0) = "<Alarm" Or status(0).StartsWith("ALARM") Then
+                statusSetIndicators(status(0).Substring(0, 6))       ' Messy Status messages make for messy code :(
+            End If
+
+            ' Display the Parser state if that is the message type
+            If data(0) = "[" And data.Contains("F") Then        ' we have a Parser status message
+                state.ProcessGCode(data)
+            End If
+        End If ' Grbl 0.x proccessing Then
+
+        If GrblVersion = 1 Then
+            If data.StartsWith("[MSG:") Then
+
+            End If
+            If data.StartsWith("[GC:") Then
+                ' Parser State message
+                state.ProcessGCode(data)
+            End If
+
+            If data.StartsWith("<") Then
+                data = data.Remove(data.Length - 3, 3)
+                Dim statusMessage = Split(data, "|")
+                For Each item As String In statusMessage
+                    Dim portion() As String = Split(item, ":")
+                    ' Pn, Ov, T are andled in their respective objects
+                    Select Case portion(0)
+                        Case "<Idle"
+                            ' Clear the button lights
+                            Me.btnUnlock.BackColor = Color.Transparent
+                            Me.btnHold.BackColor = Color.Transparent
+                            Me.btnReset.BackColor = Color.Transparent
+                            Me.btnCheckMode.BackColor = Color.Transparent
+                            Me.btnStartResume.BackColor = Color.Transparent
+                            Me.btnStartResume.Text = "Start"
+                            tbCurrentStatus.BackColor = Color.LightGreen
+                            tbCurrentStatus.Text = "IDLE"
+                        Case "<Run"
+                            Me.btnUnlock.BackColor = Color.Transparent
+                            Me.btnHold.BackColor = Color.Transparent
+                            Me.btnReset.BackColor = Color.Transparent
+                            Me.btnStartResume.BackColor = Color.Transparent
+                            Me.btnStartResume.Text = "Start"
+                            tbCurrentStatus.BackColor = Color.LightGreen
+                            tbCurrentStatus.Text = "RUN"
+                        Case "<Hold"
+                            Me.btnStartResume.BackColor = Color.Crimson
+                            Me.btnStartResume.Text = "Resume"
+
+                            tbCurrentStatus.BackColor = Color.LightGreen
+                            tbCurrentStatus.Text = "HOLD"
+                        Case "<Jog"
+                            tbCurrentStatus.BackColor = Color.LightGreen
+                            tbCurrentStatus.Text = "JOG"
+                        Case "<Door"
+                            tbCurrentStatus.BackColor = Color.LightGreen
+                            tbCurrentStatus.Text = "DOOR"
+                        Case "<Check"
+                            Me.btnCheckMode.BackColor = Color.Crimson
+
+                            tbCurrentStatus.BackColor = Color.LightGreen
+                            tbCurrentStatus.Text = "CHECK"
+                        Case "<Home"
+                            tbCurrentStatus.BackColor = Color.LightGreen
+                            tbCurrentStatus.Text = "HOME"
+                        Case "Bf"
+                            Dim values = Split(portion(1), ",")
+                            Try
+                                prgBarQ.Value = 15 - values(0)
+                                prgbRxBuf.Value = 128 - values(1)
+                            Catch
+                            End Try
+                        Case "F"
+                            ' TODO Figure out where to display Grbl's actual feedrate, if at all
+                    End Select
+                Next
+
+            End If
         End If
 
+        ' TODO Move to Settings handler
         If data(0) = "$" And IsNumeric(data(1)) Then
             ' we have a Grbl Settings response
             settings.FillSettings(data)
         End If
 
-        If data.StartsWith("Grbl") Then
-            ' Something reset the Grbl device, likely a physical Reset
-            ' Stop what we are doing and clear out for restart
-            gcode.ResetGcode(False)
-        End If
+
 
     End Sub
 
     Private Sub statusSetIndicators(ByVal status As String)
+        ' Version 0.x only
         ' Set status indicators depending on Grbl's status
         Select Case status
             Case "<Alarm", "ALARM:", "ALARM"
diff --git a/Grbl-Panel/grblgui.Designer.vb b/Grbl-Panel/grblgui.Designer.vb
index ef17ff6..9863f12 100644
--- a/Grbl-Panel/grblgui.Designer.vb
+++ b/Grbl-Panel/grblgui.Designer.vb
@@ -35,6 +35,9 @@ Partial Class GrblGui
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.tabPgInterface = New System.Windows.Forms.TabPage()
         Me.gbOverrides = New System.Windows.Forms.GroupBox()
+        Me.btnMistOverride = New System.Windows.Forms.Button()
+        Me.btnFloodOverride = New System.Windows.Forms.Button()
+        Me.btnSpindleOverride = New System.Windows.Forms.Button()
         Me.cbSpindleCoarse = New System.Windows.Forms.CheckBox()
         Me.btnSpindleOverrideReset = New System.Windows.Forms.Button()
         Me.btnRapidOverrideReset = New System.Windows.Forms.Button()
@@ -84,7 +87,7 @@ Partial Class GrblGui
         Me.Label45 = New System.Windows.Forms.Label()
         Me.Label17 = New System.Windows.Forms.Label()
         Me.cbxStateSpindle = New System.Windows.Forms.ComboBox()
-        Me.btnStatusGetParser = New System.Windows.Forms.Button()
+        Me.btnStatusClearPins = New System.Windows.Forms.Button()
         Me.gbControl = New System.Windows.Forms.GroupBox()
         Me.btnCheckMode = New System.Windows.Forms.Button()
         Me.btnReset = New System.Windows.Forms.Button()
@@ -444,6 +447,9 @@ Partial Class GrblGui
         '
         'gbOverrides
         '
+        Me.gbOverrides.Controls.Add(Me.btnMistOverride)
+        Me.gbOverrides.Controls.Add(Me.btnFloodOverride)
+        Me.gbOverrides.Controls.Add(Me.btnSpindleOverride)
         Me.gbOverrides.Controls.Add(Me.cbSpindleCoarse)
         Me.gbOverrides.Controls.Add(Me.btnSpindleOverrideReset)
         Me.gbOverrides.Controls.Add(Me.btnRapidOverrideReset)
@@ -463,19 +469,50 @@ Partial Class GrblGui
         Me.gbOverrides.Controls.Add(Me.btnFeedPlus)
         Me.gbOverrides.Location = New System.Drawing.Point(939, 412)
         Me.gbOverrides.Name = "gbOverrides"
-        Me.gbOverrides.Size = New System.Drawing.Size(190, 255)
+        Me.gbOverrides.Size = New System.Drawing.Size(190, 262)
         Me.gbOverrides.TabIndex = 37
         Me.gbOverrides.TabStop = False
         Me.gbOverrides.Text = "Overrides"
         Me.gbOverrides.Visible = False
         '
+        'btnMistOverride
+        '
+        Me.btnMistOverride.Location = New System.Drawing.Point(123, 20)
+        Me.btnMistOverride.Name = "btnMistOverride"
+        Me.btnMistOverride.Size = New System.Drawing.Size(51, 23)
+        Me.btnMistOverride.TabIndex = 29
+        Me.btnMistOverride.TabStop = False
+        Me.btnMistOverride.Tag = "MistOverride"
+        Me.btnMistOverride.Text = "Mist"
+        Me.btnMistOverride.UseVisualStyleBackColor = True
+        '
+        'btnFloodOverride
+        '
+        Me.btnFloodOverride.Location = New System.Drawing.Point(70, 20)
+        Me.btnFloodOverride.Name = "btnFloodOverride"
+        Me.btnFloodOverride.Size = New System.Drawing.Size(51, 23)
+        Me.btnFloodOverride.TabIndex = 28
+        Me.btnFloodOverride.Tag = "FloodOverride"
+        Me.btnFloodOverride.Text = "Flood"
+        Me.btnFloodOverride.UseVisualStyleBackColor = True
+        '
+        'btnSpindleOverride
+        '
+        Me.btnSpindleOverride.Location = New System.Drawing.Point(17, 20)
+        Me.btnSpindleOverride.Name = "btnSpindleOverride"
+        Me.btnSpindleOverride.Size = New System.Drawing.Size(51, 23)
+        Me.btnSpindleOverride.TabIndex = 27
+        Me.btnSpindleOverride.Tag = "SpindleOverride"
+        Me.btnSpindleOverride.Text = "Spindle"
+        Me.btnSpindleOverride.UseVisualStyleBackColor = True
+        '
         'cbSpindleCoarse
         '
         Me.cbSpindleCoarse.Appearance = System.Windows.Forms.Appearance.Button
         Me.cbSpindleCoarse.AutoSize = True
         Me.cbSpindleCoarse.Checked = True
         Me.cbSpindleCoarse.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbSpindleCoarse.Location = New System.Drawing.Point(131, 180)
+        Me.cbSpindleCoarse.Location = New System.Drawing.Point(130, 198)
         Me.cbSpindleCoarse.Name = "cbSpindleCoarse"
         Me.cbSpindleCoarse.Size = New System.Drawing.Size(50, 23)
         Me.cbSpindleCoarse.TabIndex = 26
@@ -484,7 +521,7 @@ Partial Class GrblGui
         '
         'btnSpindleOverrideReset
         '
-        Me.btnSpindleOverrideReset.Location = New System.Drawing.Point(131, 204)
+        Me.btnSpindleOverrideReset.Location = New System.Drawing.Point(130, 222)
         Me.btnSpindleOverrideReset.Name = "btnSpindleOverrideReset"
         Me.btnSpindleOverrideReset.Size = New System.Drawing.Size(49, 23)
         Me.btnSpindleOverrideReset.TabIndex = 25
@@ -494,7 +531,7 @@ Partial Class GrblGui
         '
         'btnRapidOverrideReset
         '
-        Me.btnRapidOverrideReset.Location = New System.Drawing.Point(129, 126)
+        Me.btnRapidOverrideReset.Location = New System.Drawing.Point(128, 153)
         Me.btnRapidOverrideReset.Name = "btnRapidOverrideReset"
         Me.btnRapidOverrideReset.Size = New System.Drawing.Size(49, 23)
         Me.btnRapidOverrideReset.TabIndex = 24
@@ -504,7 +541,7 @@ Partial Class GrblGui
         '
         'btnFeedOverrideReset
         '
-        Me.btnFeedOverrideReset.Location = New System.Drawing.Point(129, 47)
+        Me.btnFeedOverrideReset.Location = New System.Drawing.Point(127, 82)
         Me.btnFeedOverrideReset.Name = "btnFeedOverrideReset"
         Me.btnFeedOverrideReset.Size = New System.Drawing.Size(49, 23)
         Me.btnFeedOverrideReset.TabIndex = 23
@@ -518,7 +555,7 @@ Partial Class GrblGui
         Me.cbFeedCoarse.AutoSize = True
         Me.cbFeedCoarse.Checked = True
         Me.cbFeedCoarse.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbFeedCoarse.Location = New System.Drawing.Point(130, 24)
+        Me.cbFeedCoarse.Location = New System.Drawing.Point(128, 59)
         Me.cbFeedCoarse.Name = "cbFeedCoarse"
         Me.cbFeedCoarse.Size = New System.Drawing.Size(50, 23)
         Me.cbFeedCoarse.TabIndex = 22
@@ -528,7 +565,7 @@ Partial Class GrblGui
         'Label44
         '
         Me.Label44.AutoSize = True
-        Me.Label44.Location = New System.Drawing.Point(7, 195)
+        Me.Label44.Location = New System.Drawing.Point(6, 213)
         Me.Label44.Name = "Label44"
         Me.Label44.Size = New System.Drawing.Size(42, 13)
         Me.Label44.TabIndex = 21
@@ -537,7 +574,7 @@ Partial Class GrblGui
         'btnSpindleMinus
         '
         Me.btnSpindleMinus.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnSpindleMinus.Location = New System.Drawing.Point(88, 204)
+        Me.btnSpindleMinus.Location = New System.Drawing.Point(87, 222)
         Me.btnSpindleMinus.Name = "btnSpindleMinus"
         Me.btnSpindleMinus.Size = New System.Drawing.Size(35, 35)
         Me.btnSpindleMinus.TabIndex = 20
@@ -548,7 +585,7 @@ Partial Class GrblGui
         'btnSpindlePlus
         '
         Me.btnSpindlePlus.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnSpindlePlus.Location = New System.Drawing.Point(88, 170)
+        Me.btnSpindlePlus.Location = New System.Drawing.Point(87, 188)
         Me.btnSpindlePlus.Name = "btnSpindlePlus"
         Me.btnSpindlePlus.Size = New System.Drawing.Size(35, 42)
         Me.btnSpindlePlus.TabIndex = 19
@@ -559,7 +596,7 @@ Partial Class GrblGui
         'Label22
         '
         Me.Label22.AutoSize = True
-        Me.Label22.Location = New System.Drawing.Point(6, 117)
+        Me.Label22.Location = New System.Drawing.Point(5, 144)
         Me.Label22.Name = "Label22"
         Me.Label22.Size = New System.Drawing.Size(35, 13)
         Me.Label22.TabIndex = 15
@@ -568,7 +605,7 @@ Partial Class GrblGui
         'btnRapidMinus
         '
         Me.btnRapidMinus.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnRapidMinus.Location = New System.Drawing.Point(88, 126)
+        Me.btnRapidMinus.Location = New System.Drawing.Point(87, 153)
         Me.btnRapidMinus.Name = "btnRapidMinus"
         Me.btnRapidMinus.Size = New System.Drawing.Size(35, 35)
         Me.btnRapidMinus.TabIndex = 14
@@ -579,7 +616,7 @@ Partial Class GrblGui
         'btnRapidPlus
         '
         Me.btnRapidPlus.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnRapidPlus.Location = New System.Drawing.Point(88, 92)
+        Me.btnRapidPlus.Location = New System.Drawing.Point(87, 119)
         Me.btnRapidPlus.Name = "btnRapidPlus"
         Me.btnRapidPlus.Size = New System.Drawing.Size(35, 42)
         Me.btnRapidPlus.TabIndex = 13
@@ -590,7 +627,7 @@ Partial Class GrblGui
         'tbSpindleOvr
         '
         Me.tbSpindleOvr.Enabled = False
-        Me.tbSpindleOvr.Location = New System.Drawing.Point(52, 192)
+        Me.tbSpindleOvr.Location = New System.Drawing.Point(51, 210)
         Me.tbSpindleOvr.Name = "tbSpindleOvr"
         Me.tbSpindleOvr.Size = New System.Drawing.Size(30, 20)
         Me.tbSpindleOvr.TabIndex = 10
@@ -599,7 +636,7 @@ Partial Class GrblGui
         'tbRapidOvr
         '
         Me.tbRapidOvr.Enabled = False
-        Me.tbRapidOvr.Location = New System.Drawing.Point(53, 117)
+        Me.tbRapidOvr.Location = New System.Drawing.Point(52, 144)
         Me.tbRapidOvr.Name = "tbRapidOvr"
         Me.tbRapidOvr.Size = New System.Drawing.Size(30, 20)
         Me.tbRapidOvr.TabIndex = 9
@@ -608,7 +645,7 @@ Partial Class GrblGui
         'tbFeedOvr
         '
         Me.tbFeedOvr.Enabled = False
-        Me.tbFeedOvr.Location = New System.Drawing.Point(53, 35)
+        Me.tbFeedOvr.Location = New System.Drawing.Point(51, 70)
         Me.tbFeedOvr.Name = "tbFeedOvr"
         Me.tbFeedOvr.Size = New System.Drawing.Size(30, 20)
         Me.tbFeedOvr.TabIndex = 8
@@ -617,7 +654,7 @@ Partial Class GrblGui
         'Label46
         '
         Me.Label46.AutoSize = True
-        Me.Label46.Location = New System.Drawing.Point(7, 38)
+        Me.Label46.Location = New System.Drawing.Point(5, 73)
         Me.Label46.Name = "Label46"
         Me.Label46.Size = New System.Drawing.Size(31, 13)
         Me.Label46.TabIndex = 6
@@ -626,7 +663,7 @@ Partial Class GrblGui
         'btnFeedMinus
         '
         Me.btnFeedMinus.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnFeedMinus.Location = New System.Drawing.Point(89, 47)
+        Me.btnFeedMinus.Location = New System.Drawing.Point(87, 82)
         Me.btnFeedMinus.Name = "btnFeedMinus"
         Me.btnFeedMinus.Size = New System.Drawing.Size(35, 35)
         Me.btnFeedMinus.TabIndex = 1
@@ -637,7 +674,7 @@ Partial Class GrblGui
         'btnFeedPlus
         '
         Me.btnFeedPlus.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnFeedPlus.Location = New System.Drawing.Point(89, 13)
+        Me.btnFeedPlus.Location = New System.Drawing.Point(87, 48)
         Me.btnFeedPlus.Name = "btnFeedPlus"
         Me.btnFeedPlus.Size = New System.Drawing.Size(35, 35)
         Me.btnFeedPlus.TabIndex = 0
@@ -650,7 +687,6 @@ Partial Class GrblGui
         Me.gbState.Controls.Add(Me.gbPinStatus)
         Me.gbState.Controls.Add(Me.Panel2)
         Me.gbState.Controls.Add(Me.Panel1)
-        Me.gbState.Controls.Add(Me.btnStatusGetParser)
         Me.gbState.Location = New System.Drawing.Point(938, 3)
         Me.gbState.Name = "gbState"
         Me.gbState.Size = New System.Drawing.Size(191, 403)
@@ -663,6 +699,7 @@ Partial Class GrblGui
         Me.gbPinStatus.Controls.Add(Me.cbFeedHold)
         Me.gbPinStatus.Controls.Add(Me.cbStartResume)
         Me.gbPinStatus.Controls.Add(Me.cbResetAbort)
+        Me.gbPinStatus.Controls.Add(Me.btnStatusClearPins)
         Me.gbPinStatus.Controls.Add(Me.cbLimitX)
         Me.gbPinStatus.Controls.Add(Me.cbDoorOpen)
         Me.gbPinStatus.Controls.Add(Me.cbProbePin)
@@ -670,7 +707,7 @@ Partial Class GrblGui
         Me.gbPinStatus.Controls.Add(Me.cbLimitY)
         Me.gbPinStatus.Location = New System.Drawing.Point(12, 328)
         Me.gbPinStatus.Name = "gbPinStatus"
-        Me.gbPinStatus.Size = New System.Drawing.Size(169, 52)
+        Me.gbPinStatus.Size = New System.Drawing.Size(169, 69)
         Me.gbPinStatus.TabIndex = 46
         Me.gbPinStatus.TabStop = False
         Me.gbPinStatus.Text = "Pins"
@@ -1005,15 +1042,15 @@ Partial Class GrblGui
         Me.cbxStateSpindle.Size = New System.Drawing.Size(74, 21)
         Me.cbxStateSpindle.TabIndex = 24
         '
-        'btnStatusGetParser
+        'btnStatusClearPins
         '
-        Me.btnStatusGetParser.AutoSize = True
-        Me.btnStatusGetParser.Location = New System.Drawing.Point(0, 380)
-        Me.btnStatusGetParser.Name = "btnStatusGetParser"
-        Me.btnStatusGetParser.Size = New System.Drawing.Size(72, 23)
-        Me.btnStatusGetParser.TabIndex = 36
-        Me.btnStatusGetParser.Text = "Refresh"
-        Me.btnStatusGetParser.UseVisualStyleBackColor = True
+        Me.btnStatusClearPins.AutoSize = True
+        Me.btnStatusClearPins.Location = New System.Drawing.Point(7, 46)
+        Me.btnStatusClearPins.Name = "btnStatusClearPins"
+        Me.btnStatusClearPins.Size = New System.Drawing.Size(64, 23)
+        Me.btnStatusClearPins.TabIndex = 36
+        Me.btnStatusClearPins.Text = "Clear Pins"
+        Me.btnStatusClearPins.UseVisualStyleBackColor = True
         '
         'gbControl
         '
@@ -3500,7 +3537,6 @@ Partial Class GrblGui
         Me.gbOverrides.ResumeLayout(False)
         Me.gbOverrides.PerformLayout()
         Me.gbState.ResumeLayout(False)
-        Me.gbState.PerformLayout()
         Me.gbPinStatus.ResumeLayout(False)
         Me.gbPinStatus.PerformLayout()
         Me.Panel2.ResumeLayout(False)
@@ -3737,7 +3773,7 @@ Partial Class GrblGui
     Friend WithEvents btnYPlus As RepeatButton.RepeatButton
     Friend WithEvents Label71 As System.Windows.Forms.Label
     Friend WithEvents cbSettingsConnectOnLoad As System.Windows.Forms.CheckBox
-    Friend WithEvents btnStatusGetParser As System.Windows.Forms.Button
+    Friend WithEvents btnStatusClearPins As System.Windows.Forms.Button
     Friend WithEvents gbSettingsOffsets As System.Windows.Forms.GroupBox
     Friend WithEvents Label7 As System.Windows.Forms.Label
     Friend WithEvents tbWorkX As System.Windows.Forms.TextBox
@@ -3850,4 +3886,7 @@ Partial Class GrblGui
     Friend WithEvents lineNum As DataGridViewTextBoxColumn
     Friend WithEvents data As DataGridViewTextBoxColumn
     Friend WithEvents cbMonitorEnable As CheckBox
+    Friend WithEvents btnMistOverride As Button
+    Friend WithEvents btnFloodOverride As Button
+    Friend WithEvents btnSpindleOverride As Button
 End Class