From e2e26171ecaa8b29c350c1cb8b34b6fa7c6ab8d4 Mon Sep 17 00:00:00 2001
From: Norbert Schechner <nieson@web.de>
Date: Sat, 27 Dec 2014 17:11:02 +0100
Subject: [PATCH] gmoccapy_1_3_5_1 - updated to current version

A lot of changes , please see release_notes.txt for all details

hal_gremlin.py has been changed to send a signal if bad gcode is found.
and gmoccapy does not react to that signal.

Signed-off-by: Norbert Schechner <nieson@web.de>
---
 lib/python/gladevcp/hal_gremlin.py          |   11 +-
 src/emc/usr_intf/gmoccapy/gmoccapy.glade    | 1888 ++++++-------------
 src/emc/usr_intf/gmoccapy/gmoccapy.py       |   22 +-
 src/emc/usr_intf/gmoccapy/release_notes.txt |   23 +
 4 files changed, 615 insertions(+), 1329 deletions(-)

diff --git a/lib/python/gladevcp/hal_gremlin.py b/lib/python/gladevcp/hal_gremlin.py
index 012807cff84..f1f4fe9e0ba 100644
--- a/lib/python/gladevcp/hal_gremlin.py
+++ b/lib/python/gladevcp/hal_gremlin.py
@@ -37,8 +37,10 @@
 class HAL_Gremlin(gremlin.Gremlin, _EMC_ActionBase):
     __gtype_name__ = "HAL_Gremlin"
     __gsignals__ = {
-        'line-clicked': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_INT,))
+        'line-clicked': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_INT,)),
+        'gcode_error': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_STRING,)),
     }
+
     __gproperties__ = {
         'view' : ( gobject.TYPE_STRING, 'View type', 'Default view: p, x, y, y2, z, z2',
                     'p', gobject.PARAM_READWRITE | gobject.PARAM_CONSTRUCT),
@@ -243,8 +245,9 @@ def realize(self, widget):
     def _load(self, filename):
         return self.load(filename)
 
-    # TODO fix this so it doesn't print twice and it should probably pop up a dialog
     def report_gcode_error(self, result, seq, filename):
         error_str = gcode.strerror(result)
-        print("G-Code error in " + os.path.basename(filename) + "\n" + "Near line "
-                     + str(seq) + " of\n" + filename + "\n" + error_str + "\n")
+        errortext = "G-Code error in " + os.path.basename(filename) + "\n" + "Near line " \
+                     + str(seq) + " of\n" + filename + "\n" + error_str + "\n"
+        print(errortext)
+        self.emit("gcode-error", errortext)
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.glade b/src/emc/usr_intf/gmoccapy/gmoccapy.glade
index da521a2686d..7582f67aeaf 100644
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.glade
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.glade
@@ -1,157 +1,155 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gladevcp 0.0 -->
   <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gladevcp 0.0 -->
   <!-- interface-naming-policy project-wide -->
-  <object class="EMC_Action_Stop" id="hal_action_stop"/>
-  <object class="EMC_ToggleAction_Pause" id="hal_tgl_pause"/>
   <object class="GtkAdjustment" id="adf_probe_vel">
-    <property name="upper">100</property>
     <property name="value">10</property>
+    <property name="upper">100</property>
     <property name="step_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adj_dro_size">
+    <property name="value">28</property>
     <property name="lower">20</property>
     <property name="upper">56</property>
-    <property name="value">28</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_dro_size_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_dro_size_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_feed">
-    <property name="upper">200</property>
     <property name="value">100</property>
+    <property name="upper">200</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_feed_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_feed_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_grid_size">
     <property name="upper">100</property>
     <property name="step_increment">0.10000000000000001</property>
   </object>
   <object class="GtkAdjustment" id="adj_height">
+    <property name="value">750</property>
     <property name="lower">750</property>
     <property name="upper">2000</property>
-    <property name="value">750</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_height_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_height_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_jog_vel">
-    <property name="upper">10500</property>
     <property name="value">1500</property>
+    <property name="upper">10500</property>
     <property name="step_increment">50</property>
-    <signal name="value-changed" handler="on_adj_jog_vel_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_jog_vel_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_max_messages">
+    <property name="value">10</property>
     <property name="lower">1</property>
     <property name="upper">25</property>
-    <property name="value">10</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_max_messages_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_max_messages_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_max_vel">
-    <property name="upper">8500</property>
     <property name="value">1800</property>
+    <property name="upper">8500</property>
     <property name="step_increment">100</property>
-    <signal name="value-changed" handler="on_adj_max_vel_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_max_vel_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_probe_height">
-    <property name="upper">100</property>
     <property name="value">32.429000000000002</property>
+    <property name="upper">100</property>
     <property name="step_increment">0.001</property>
   </object>
   <object class="GtkAdjustment" id="adj_scale_feed_override">
+    <property name="value">1</property>
     <property name="lower">0.10000000000000001</property>
     <property name="upper">10</property>
-    <property name="value">1</property>
     <property name="step_increment">0.10000000000000001</property>
-    <signal name="value-changed" handler="on_adj_scale_feed_override_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_scale_feed_override_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_scale_jog_vel">
+    <property name="value">1</property>
     <property name="lower">0.10000000000000001</property>
     <property name="upper">1000</property>
-    <property name="value">1</property>
     <property name="step_increment">0.10000000000000001</property>
-    <signal name="value-changed" handler="on_adj_scale_jog_vel_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_scale_jog_vel_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_scale_max_vel">
+    <property name="value">1</property>
     <property name="lower">0.10000000000000001</property>
     <property name="upper">1000</property>
-    <property name="value">1</property>
     <property name="step_increment">0.10000000000000001</property>
-    <signal name="value-changed" handler="on_adj_scale_max_vel_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_scale_max_vel_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_scale_spindle_override">
+    <property name="value">1</property>
     <property name="lower">0.10000000000000001</property>
     <property name="upper">10</property>
-    <property name="value">1</property>
     <property name="step_increment">0.10000000000000001</property>
-    <signal name="value-changed" handler="on_adj_scale_spindle_override_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_scale_spindle_override_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_search_vel">
-    <property name="upper">10000</property>
     <property name="value">100</property>
+    <property name="upper">10000</property>
     <property name="step_increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adj_spindle">
-    <property name="upper">150</property>
     <property name="value">100</property>
+    <property name="upper">150</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_spindle_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_spindle_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_spindle_bar_max">
-    <property name="upper">100000</property>
     <property name="value">6000</property>
+    <property name="upper">100000</property>
     <property name="step_increment">50</property>
-    <signal name="value-changed" handler="on_adj_spindle_bar_max_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_spindle_bar_max_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_spindle_bar_min">
     <property name="upper">10000</property>
     <property name="step_increment">50</property>
-    <signal name="value-changed" handler="on_adj_spindle_bar_min_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_spindle_bar_min_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_start_spindle_RPM">
+    <property name="value">300</property>
     <property name="lower">50</property>
     <property name="upper">10000</property>
-    <property name="value">300</property>
     <property name="step_increment">25</property>
-    <signal name="value-changed" handler="on_adj_start_spindle_RPM_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_start_spindle_RPM_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_width">
+    <property name="value">979</property>
     <property name="lower">979</property>
     <property name="upper">1280</property>
-    <property name="value">979</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_width_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_width_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_width_popup">
+    <property name="value">200</property>
     <property name="lower">100</property>
     <property name="upper">1280</property>
-    <property name="value">200</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_width_popup_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_width_popup_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_x_pos">
-    <property name="upper">1024</property>
     <property name="value">40</property>
+    <property name="upper">1024</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_x_pos_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_x_pos_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_x_pos_popup">
-    <property name="upper">2000</property>
     <property name="value">30</property>
+    <property name="upper">2000</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_x_pos_popup_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_x_pos_popup_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_y_pos">
-    <property name="upper">768</property>
     <property name="value">30</property>
+    <property name="upper">768</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_y_pos_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_y_pos_value_changed"/>
   </object>
   <object class="GtkAdjustment" id="adj_y_pos_popup">
-    <property name="upper">2000</property>
     <property name="value">55</property>
+    <property name="upper">2000</property>
     <property name="step_increment">1</property>
-    <signal name="value-changed" handler="on_adj_y_pos_popup_value_changed" swapped="no"/>
+    <signal name="value_changed" handler="on_adj_y_pos_popup_value_changed"/>
   </object>
   <object class="GtkTextBuffer" id="alarm_buffer"/>
   <object class="GtkFileFilter" id="ff_file_to_load"/>
@@ -165,288 +163,237 @@
     <property name="textview">gcode_view</property>
   </object>
   <object class="EMC_Stat" id="hal_status">
-    <signal name="mode-manual" handler="on_hal_status_mode_manual" swapped="no"/>
-    <signal name="all-homed" handler="on_hal_status_all_homed" swapped="no"/>
-    <signal name="not-all-homed" handler="on_hal_status_not_all_homed" swapped="no"/>
-    <signal name="state-on" handler="on_hal_status_state_on" swapped="no"/>
-    <signal name="file-loaded" handler="on_hal_status_file_loaded" swapped="no"/>
-    <signal name="mode-mdi" handler="on_hal_status_mode_mdi" swapped="no"/>
-    <signal name="homed" handler="on_hal_status_homed" swapped="no"/>
-    <signal name="state-estop" handler="on_hal_status_state_estop" swapped="no"/>
-    <signal name="state-estop-reset" handler="on_hal_status_state_estop_reset" swapped="no"/>
-    <signal name="mode-auto" handler="on_hal_status_mode_auto" swapped="no"/>
-    <signal name="tool-in-spindle-changed" handler="on_hal_status_tool_in_spindle_changed" swapped="no"/>
-    <signal name="interp-idle" handler="on_hal_status_interp_idle" swapped="no"/>
-    <signal name="state-off" handler="on_hal_status_state_off" swapped="no"/>
-    <signal name="interp-run" handler="on_hal_status_interp_run" swapped="no"/>
+    <signal name="state_off" handler="on_hal_status_state_off"/>
+    <signal name="interp_run" handler="on_hal_status_interp_run"/>
+    <signal name="state_estop_reset" handler="on_hal_status_state_estop_reset"/>
+    <signal name="not_all_homed" handler="on_hal_status_not_all_homed"/>
+    <signal name="mode_manual" handler="on_hal_status_mode_manual"/>
+    <signal name="homed" handler="on_hal_status_homed"/>
+    <signal name="mode_mdi" handler="on_hal_status_mode_mdi"/>
+    <signal name="state_on" handler="on_hal_status_state_on"/>
+    <signal name="mode_auto" handler="on_hal_status_mode_auto"/>
+    <signal name="file_loaded" handler="on_hal_status_file_loaded"/>
+    <signal name="all_homed" handler="on_hal_status_all_homed"/>
+    <signal name="interp_idle" handler="on_hal_status_interp_idle"/>
+    <signal name="state_estop" handler="on_hal_status_state_estop"/>
+    <signal name="tool_in_spindle_changed" handler="on_hal_status_tool_in_spindle_changed"/>
   </object>
   <object class="GtkImage" id="img_auto">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/auto_mode.png</property>
   </object>
   <object class="GtkImage" id="img_back_file_load">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="icon_name">edit-undo</property>
   </object>
   <object class="GtkImage" id="img_back_ref">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="icon_name">edit-undo</property>
   </object>
   <object class="GtkImage" id="img_back_tool">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="icon_name">edit-undo</property>
   </object>
   <object class="GtkImage" id="img_back_zero">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="icon_name">edit-undo</property>
   </object>
   <object class="GtkImage" id="img_back_zero1">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="ypad">3</property>
     <property name="icon_name">edit-undo</property>
   </object>
   <object class="GtkImage" id="img_brake_macro">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/stop.png</property>
   </object>
   <object class="GtkImage" id="img_close">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/exit_application.png</property>
   </object>
   <object class="GtkImage" id="img_close1">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/exit_application.png</property>
   </object>
   <object class="GtkImage" id="img_coolant_off">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/coolant_off.png</property>
   </object>
   <object class="GtkImage" id="img_coolant_on">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/coolant_on.gif</property>
   </object>
   <object class="GtkImage" id="img_dir_up">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="icon_name">go-up</property>
   </object>
   <object class="GtkImage" id="img_editor">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/editor.png</property>
   </object>
   <object class="GtkImage" id="img_emergency_off">
     <property name="width_request">48</property>
     <property name="height_request">48</property>
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/E-Stop.gif</property>
   </object>
   <object class="GtkImage" id="img_forward">
     <property name="width_request">48</property>
     <property name="height_request">48</property>
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/forward.png</property>
   </object>
   <object class="GtkImage" id="img_forward_on">
     <property name="width_request">48</property>
     <property name="height_request">48</property>
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/forward_on.gif</property>
   </object>
   <object class="GtkImage" id="img_fullsize_preview">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/fullscreen_preview.png</property>
   </object>
   <object class="GtkImage" id="img_fullsize_preview1">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/fullscreen_preview.png</property>
   </object>
   <object class="GtkImage" id="img_hom_all">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/refall.png</property>
   </object>
   <object class="GtkImage" id="img_home">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="stock">gtk-home</property>
   </object>
   <object class="GtkImage" id="img_home_b">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/refb.png</property>
   </object>
   <object class="GtkImage" id="img_home_c">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/refc.png</property>
   </object>
   <object class="GtkImage" id="img_home_u">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/refu.png</property>
   </object>
   <object class="GtkImage" id="img_home_v">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/refv.png</property>
   </object>
   <object class="GtkImage" id="img_home_w">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/refw.png</property>
   </object>
   <object class="GtkImage" id="img_jump_to">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="stock">gtk-jump-to</property>
   </object>
   <object class="GtkImage" id="img_machine_on">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/machine_on.png</property>
   </object>
   <object class="GtkImage" id="img_manual">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/manual_mode.png</property>
   </object>
   <object class="GtkImage" id="img_mdi">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/mdi_mode.png</property>
   </object>
   <object class="GtkImage" id="img_mist_off">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/mist_off.png</property>
   </object>
   <object class="GtkImage" id="img_mist_on">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/mist_on.gif</property>
   </object>
   <object class="GtkImage" id="img_open">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="stock">gtk-open</property>
   </object>
   <object class="GtkImage" id="img_ref_al">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/refall.png</property>
   </object>
   <object class="GtkImage" id="img_reverse_on">
     <property name="width_request">48</property>
     <property name="height_request">48</property>
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/reverse_on.gif</property>
   </object>
   <object class="GtkImage" id="img_run">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/start.png</property>
   </object>
   <object class="GtkImage" id="img_run_from">
     <property name="visible">True</property>
     <property name="sensitive">False</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/runfrom.png</property>
   </object>
   <object class="GtkImage" id="img_sel_next">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="stock">gtk-go-forward</property>
   </object>
   <object class="GtkImage" id="img_sel_prev">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="stock">gtk-go-back</property>
   </object>
   <object class="GtkImage" id="img_select">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="stock">gtk-ok</property>
   </object>
   <object class="GtkImage" id="img_sstop">
     <property name="width_request">48</property>
     <property name="height_request">48</property>
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/stop_on.gif</property>
   </object>
   <object class="GtkImage" id="img_step">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/step.png</property>
   </object>
   <object class="GtkImage" id="img_stop">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/stop.png</property>
   </object>
   <object class="GtkImage" id="img_stop_on">
     <property name="width_request">48</property>
     <property name="height_request">48</property>
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/stop.gif</property>
   </object>
   <object class="GtkImage" id="img_toolchange">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/toolchange.png</property>
   </object>
   <object class="GtkImage" id="img_toolchange1">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/toolchange.png</property>
   </object>
   <object class="GtkImage" id="img_touch_off">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/touchoffwz.png</property>
   </object>
   <object class="GtkImage" id="img_touch_off_z">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/touchoffwz.png</property>
   </object>
   <object class="GtkImage" id="img_unhome">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/unhome.png</property>
   </object>
   <object class="GtkImage" id="img_user_tabs">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/user_tabs.png</property>
   </object>
   <object class="GtkImage" id="img_zoom_in">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/zoom-in.png</property>
   </object>
   <object class="GtkImage" id="img_zoom_out">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="pixbuf">images/zoom-out.png</property>
   </object>
   <object class="GtkListStore" id="lst_button_mode">
@@ -500,30 +447,25 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">979</property>
     <property name="height_request">750</property>
-    <property name="can_focus">False</property>
     <property name="title">gmoccapy</property>
     <property name="icon">images/Logo.png</property>
-    <signal name="destroy" handler="on_window1_destroy" swapped="no"/>
-    <signal name="show" handler="on_window1_show" swapped="no"/>
+    <signal name="destroy" handler="on_window1_destroy"/>
+    <signal name="show" handler="on_window1_show"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkHBox" id="box_left">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -532,56 +474,47 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="show_tabs">False</property>
-                <signal name="switch-page" handler="on_ntb_main_switch_page" swapped="no"/>
+                <signal name="switch_page" handler="on_ntb_main_switch_page"/>
                 <child>
                   <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkVBox" id="vbox14">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkNotebook" id="ntb_preview">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="show_tabs">False</property>
                                 <property name="homogeneous">True</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox15">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkEventBox" id="eventbox_gremlin">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <child>
                                           <object class="HAL_Gremlin" id="gremlin">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="double_buffered">False</property>
-                                            <property name="enable_dro">False</property>
                                             <property name="show_dtg">False</property>
+                                            <property name="enable_dro">False</property>
                                             <property name="use_commanded">False</property>
-                                            <signal name="button-press-event" handler="on_gremlin_button_press_event" swapped="no"/>
-                                            <signal name="line-clicked" handler="on_gremlin_line_clicked" swapped="no"/>
+                                            <signal name="button_press_event" handler="on_gremlin_button_press_event"/>
+                                            <signal name="line_clicked" handler="on_gremlin_line_clicked"/>
+                                            <signal name="gcode_error" handler="on_gremlin_gcode_error"/>
                                           </object>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkTable" id="tbl_gremlin_button">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="n_columns">13</property>
                                         <property name="column_spacing">5</property>
                                         <child>
@@ -592,12 +525,10 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
                                             <property name="tooltip_text" translatable="yes">clear plot</property>
-                                            <property name="use_action_appearance">False</property>
-                                            <signal name="clicked" handler="on_btn_delete_view_clicked" swapped="no"/>
+                                            <signal name="clicked" handler="on_btn_delete_view_clicked"/>
                                             <child>
                                               <object class="GtkImage" id="img_tool_clear">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="pixbuf">images/clear.png</property>
                                               </object>
                                             </child>
@@ -617,9 +548,8 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
                                             <property name="tooltip_text" translatable="yes">Zoom in</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="image">img_zoom_in</property>
-                                            <signal name="clicked" handler="on_btn_zoom_in_clicked" swapped="no"/>
+                                            <signal name="clicked" handler="on_btn_zoom_in_clicked"/>
                                           </object>
                                           <packing>
                                             <property name="left_attach">8</property>
@@ -636,9 +566,8 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
                                             <property name="tooltip_text" translatable="yes">Zoom out</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="image">img_zoom_out</property>
-                                            <signal name="clicked" handler="on_btn_zoom_out_clicked" swapped="no"/>
+                                            <signal name="clicked" handler="on_btn_zoom_out_clicked"/>
                                           </object>
                                           <packing>
                                             <property name="left_attach">9</property>
@@ -655,14 +584,12 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="tooltip_text" translatable="yes">view perspective</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="active">True</property>
                                             <property name="draw_indicator">False</property>
-                                            <signal name="toggled" handler="on_rbt_view_p_toggled" swapped="no"/>
+                                            <signal name="toggled" handler="on_rbt_view_p_toggled"/>
                                             <child>
                                               <object class="GtkImage" id="img_view_p">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="pixbuf">images/toolaxisp.png</property>
                                               </object>
                                             </child>
@@ -680,14 +607,12 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="tooltip_text" translatable="yes">view along the X axis from positive to negative</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="draw_indicator">False</property>
                                             <property name="group">rbt_view_p</property>
-                                            <signal name="toggled" handler="on_rbt_view_x_toggled" swapped="no"/>
+                                            <signal name="toggled" handler="on_rbt_view_x_toggled"/>
                                             <child>
                                               <object class="GtkImage" id="img_view_x">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="pixbuf">images/toolaxisx.png</property>
                                               </object>
                                             </child>
@@ -707,14 +632,12 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="tooltip_text" translatable="yes">view along the Y axis from positive to negative</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="draw_indicator">False</property>
                                             <property name="group">rbt_view_p</property>
-                                            <signal name="toggled" handler="on_rbt_view_y_toggled" swapped="no"/>
+                                            <signal name="toggled" handler="on_rbt_view_y_toggled"/>
                                             <child>
                                               <object class="GtkImage" id="img_view_y">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="pixbuf">images/toolaxisy.png</property>
                                               </object>
                                             </child>
@@ -734,16 +657,14 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="tooltip_text" translatable="yes">view along the Z axis from positive to negative</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="draw_indicator">False</property>
                                             <property name="group">rbt_view_p</property>
-                                            <signal name="toggled" handler="on_rbt_view_z_toggled" swapped="no"/>
+                                            <signal name="toggled" handler="on_rbt_view_z_toggled"/>
                                             <child>
                                               <object class="GtkImage" id="img_view_z">
                                                 <property name="width_request">48</property>
                                                 <property name="height_request">48</property>
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="pixbuf">images/toolaxisz.png</property>
                                               </object>
                                             </child>
@@ -763,12 +684,10 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
                                             <property name="tooltip_text" translatable="yes">Show or hide tool path</property>
-                                            <property name="use_action_appearance">False</property>
-                                            <signal name="toggled" handler="on_tbtn_view_tool_path_toggled" swapped="no"/>
+                                            <signal name="toggled" handler="on_tbtn_view_tool_path_toggled"/>
                                             <child>
                                               <object class="GtkImage" id="imimg_toll_path">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="pixbuf">images/toolpath.png</property>
                                               </object>
                                             </child>
@@ -788,12 +707,10 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
                                             <property name="tooltip_text" translatable="yes">Show or hide dimensions</property>
-                                            <property name="use_action_appearance">False</property>
-                                            <signal name="toggled" handler="on_tbtn_view_dimension_toggled" swapped="no"/>
+                                            <signal name="toggled" handler="on_tbtn_view_dimension_toggled"/>
                                             <child>
                                               <object class="GtkImage" id="img_dimensions">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="pixbuf">images/dimensions.png</property>
                                               </object>
                                             </child>
@@ -813,16 +730,14 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="tooltip_text" translatable="yes">view along the Y axis from positive to negative as viewn for a back tool lathe</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="draw_indicator">False</property>
                                             <property name="group">rbt_view_p</property>
-                                            <signal name="toggled" handler="on_rbt_view_y2_toggled" swapped="no"/>
+                                            <signal name="toggled" handler="on_rbt_view_y2_toggled"/>
                                             <child>
                                               <object class="GtkImage" id="img_view_y2">
                                                 <property name="width_request">48</property>
                                                 <property name="height_request">48</property>
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="pixbuf">images/toolaxisy2.png</property>
                                               </object>
                                             </child>
@@ -846,7 +761,6 @@
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -855,7 +769,6 @@
                                 <child type="tab">
                                   <object class="GtkLabel" id="lbl_preview">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Preview</property>
                                   </object>
                                   <packing>
@@ -865,10 +778,9 @@
                                 <child>
                                   <object class="OffsetPage" id="offsetpage1">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="foreground_color">#ffff00000000</property>
                                     <property name="highlight_color">#adadd8d8e6e6</property>
-                                    <signal name="selection-changed" handler="on_offsetpage1_selection_changed" swapped="no"/>
+                                    <property name="foreground_color">#ffff00000000</property>
+                                    <signal name="selection_changed" handler="on_offsetpage1_selection_changed"/>
                                   </object>
                                   <packing>
                                     <property name="position">1</property>
@@ -877,7 +789,6 @@
                                 <child type="tab">
                                   <object class="GtkLabel" id="lbl_frm_preview_offset_page">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Offset Page</property>
                                   </object>
                                   <packing>
@@ -888,7 +799,6 @@
                                 <child>
                                   <object class="ToolEdit" id="tooledit1">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                   </object>
                                   <packing>
                                     <property name="position">2</property>
@@ -897,7 +807,6 @@
                                 <child type="tab">
                                   <object class="GtkLabel" id="lbl_frm_preview_tooledit">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">Tooledit</property>
                                   </object>
                                   <packing>
@@ -908,10 +817,9 @@
                                 <child>
                                   <object class="IconFileSelection" id="IconFileSelection1">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="filetypes">ngc,py,bmp</property>
-                                    <signal name="selected" handler="on_IconFileSelection1_selected" swapped="no"/>
-                                    <signal name="exit" handler="on_IconFileSelection1_exit" swapped="no"/>
+                                    <signal name="selected" handler="on_IconFileSelection1_selected"/>
+                                    <signal name="exit" handler="on_IconFileSelection1_exit"/>
                                   </object>
                                   <packing>
                                     <property name="position">3</property>
@@ -920,7 +828,6 @@
                                 <child type="tab">
                                   <object class="GtkLabel" id="lbl_ntb_preview_file_sel">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label" translatable="yes">File Selection</property>
                                   </object>
                                   <packing>
@@ -930,16 +837,12 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
                                 <property name="padding">2</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -947,16 +850,13 @@
                           <object class="GtkVBox" id="vbx_jog">
                             <property name="width_request">360</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" id="hbox_dro">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="spacing">1</property>
                                 <child>
                                   <object class="GtkTable" id="tbl_dro_button">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="n_rows">3</property>
                                     <child>
                                       <object class="GtkToggleButton" id="tbtn_units">
@@ -967,8 +867,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="tooltip_text" translatable="yes">Toggle between metric and imperial units</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <signal name="toggled" handler="on_tbtn_units_toggled" swapped="no"/>
+                                        <signal name="toggled" handler="on_tbtn_units_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="top_attach">2</property>
@@ -986,8 +885,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="tooltip_text" translatable="yes">Switch DRO to DTG mode</property>
-                                        <property name="use_action_appearance">False</property>
-                                        <signal name="toggled" handler="on_tbtn_dtg_toggled" swapped="no"/>
+                                        <signal name="toggled" handler="on_tbtn_dtg_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="top_attach">1</property>
@@ -1005,9 +903,8 @@
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="tooltip_text" translatable="yes">Toggle between machine and relative coordinates</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="active">True</property>
-                                        <signal name="toggled" handler="on_tbtn_rel_toggled" swapped="no"/>
+                                        <signal name="toggled" handler="on_tbtn_rel_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="x_options">GTK_SHRINK</property>
@@ -1024,128 +921,106 @@
                                 <child>
                                   <object class="GtkVBox" id="vbox_dro">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="spacing">1</property>
                                     <child>
                                       <object class="Combi_DRO" id="Combi_DRO_x">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
+                                        <property name="font_size">28</property>
+                                        <property name="unhomed_color">#ffff00000000</property>
                                         <property name="abs_color">#00000000ffff</property>
                                         <property name="dtg_color">#ffffffff0000</property>
-                                        <property name="font_size">28</property>
-                                        <property name="homed_color">#0000ffff0000</property>
                                         <property name="rel_color">#000000000000</property>
-                                        <property name="unhomed_color">#ffff00000000</property>
-                                        <signal name="system-changed" handler="on_Combi_DRO_system_changed" swapped="no"/>
-                                        <signal name="units-changed" handler="on_Combi_DRO_units_changed" swapped="no"/>
-                                        <signal name="clicked" handler="on_Combi_DRO_clicked" swapped="no"/>
+                                        <property name="homed_color">#0000ffff0000</property>
+                                        <signal name="system_changed" handler="on_Combi_DRO_system_changed"/>
+                                        <signal name="units_changed" handler="on_Combi_DRO_units_changed"/>
+                                        <signal name="clicked" handler="on_Combi_DRO_clicked"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="Combi_DRO" id="Combi_DRO_y">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
-                                        <property name="abs_color">#00000000ffff</property>
-                                        <property name="dtg_color">#ffffffff0000</property>
                                         <property name="font_size">28</property>
-                                        <property name="homed_color">#0000ffff0000</property>
+                                        <property name="unhomed_color">#ffff00000000</property>
                                         <property name="joint_number">1</property>
+                                        <property name="abs_color">#00000000ffff</property>
+                                        <property name="dtg_color">#ffffffff0000</property>
                                         <property name="rel_color">#000000000000</property>
-                                        <property name="unhomed_color">#ffff00000000</property>
-                                        <signal name="clicked" handler="on_Combi_DRO_clicked" swapped="no"/>
+                                        <property name="homed_color">#0000ffff0000</property>
+                                        <signal name="clicked" handler="on_Combi_DRO_clicked"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="Combi_DRO" id="Combi_DRO_z">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
-                                        <property name="abs_color">#00000000ffff</property>
-                                        <property name="dtg_color">#ffffffff0000</property>
                                         <property name="font_size">28</property>
-                                        <property name="homed_color">#0000ffff0000</property>
+                                        <property name="unhomed_color">#ffff00000000</property>
                                         <property name="joint_number">2</property>
+                                        <property name="abs_color">#00000000ffff</property>
+                                        <property name="dtg_color">#ffffffff0000</property>
                                         <property name="rel_color">#000000000000</property>
-                                        <property name="unhomed_color">#ffff00000000</property>
-                                        <signal name="clicked" handler="on_Combi_DRO_clicked" swapped="no"/>
+                                        <property name="homed_color">#0000ffff0000</property>
+                                        <signal name="clicked" handler="on_Combi_DRO_clicked"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="Combi_DRO" id="Combi_DRO_4">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
-                                        <property name="abs_color">#00000000ffff</property>
-                                        <property name="dtg_color">#ffffffff0000</property>
                                         <property name="font_size">28</property>
-                                        <property name="homed_color">#0000ffff0000</property>
+                                        <property name="unhomed_color">#ffff00000000</property>
                                         <property name="joint_number">3</property>
+                                        <property name="abs_color">#00000000ffff</property>
+                                        <property name="dtg_color">#ffffffff0000</property>
                                         <property name="rel_color">#000000000000</property>
-                                        <property name="unhomed_color">#ffff00000000</property>
-                                        <signal name="clicked" handler="on_Combi_DRO_clicked" swapped="no"/>
+                                        <property name="homed_color">#0000ffff0000</property>
+                                        <signal name="clicked" handler="on_Combi_DRO_clicked"/>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="pack_type">end</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkNotebook" id="ntb_jog">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="show_tabs">False</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox_jog">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkHBox" id="hbox_jog_vel">
                                         <property name="height_request">50</property>
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" id="lbl_jog_vel">
                                             <property name="width_request">85</property>
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">Jog. Vel.</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
-                                            <property name="fill">True</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
@@ -1157,92 +1032,29 @@
                                             <property name="digits">0</property>
                                           </object>
                                           <packing>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" id="hbox_jog">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <child>
-                                          <object class="GtkFrame" id="frm_jog_rates">
-                                            <property name="width_request">120</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label_xalign">0.5</property>
-                                            <child>
-                                              <object class="GtkAlignment" id="ali_jog_rates">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="top_padding">5</property>
-                                                <property name="bottom_padding">5</property>
-                                                <property name="left_padding">5</property>
-                                                <property name="right_padding">5</property>
-                                                <child>
-                                                  <object class="GtkVButtonBox" id="vbuttonbox2">
-                                                    <property name="width_request">50</property>
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="spacing">3</property>
-                                                    <child>
-                                                      <placeholder/>
-                                                    </child>
-                                                    <child>
-                                                      <placeholder/>
-                                                    </child>
-                                                    <child>
-                                                      <placeholder/>
-                                                    </child>
-                                                    <child>
-                                                      <placeholder/>
-                                                    </child>
-                                                    <child>
-                                                      <placeholder/>
-                                                    </child>
-                                                  </object>
-                                                </child>
-                                              </object>
-                                            </child>
-                                            <child type="label">
-                                              <object class="GtkLabel" id="lbl_steps">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="label" translatable="yes">&lt;b&gt;Jog Rates&lt;/b&gt;</property>
-                                                <property name="use_markup">True</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="padding">2</property>
-                                            <property name="pack_type">end</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
                                         <child>
                                           <object class="GtkVBox" id="vbox_jog_button">
                                             <property name="width_request">240</property>
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <child>
                                               <object class="GtkFrame" id="frm_jog_button">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="label_xalign">0.5</property>
                                                 <child>
                                                   <object class="GtkAlignment" id="ali_jog_button">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="top_padding">5</property>
                                                     <property name="bottom_padding">5</property>
                                                     <property name="left_padding">5</property>
@@ -1250,7 +1062,6 @@
                                                     <child>
                                                       <object class="GtkTable" id="tbl_jog_btn">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="border_width">5</property>
                                                         <property name="n_rows">3</property>
                                                         <property name="n_columns">4</property>
@@ -1265,9 +1076,8 @@
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <signal name="pressed" handler="on_btn_jog_pressed" swapped="no"/>
-                                                            <signal name="released" handler="on_btn_jog_released" swapped="no"/>
+                                                            <signal name="pressed" handler="on_btn_jog_pressed"/>
+                                                            <signal name="released" handler="on_btn_jog_released"/>
                                                           </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
@@ -1284,9 +1094,8 @@
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <signal name="pressed" handler="on_btn_jog_pressed" swapped="no"/>
-                                                            <signal name="released" handler="on_btn_jog_released" swapped="no"/>
+                                                            <signal name="pressed" handler="on_btn_jog_pressed"/>
+                                                            <signal name="released" handler="on_btn_jog_released"/>
                                                           </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
@@ -1305,9 +1114,8 @@
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <signal name="pressed" handler="on_btn_jog_pressed" swapped="no"/>
-                                                            <signal name="released" handler="on_btn_jog_released" swapped="no"/>
+                                                            <signal name="pressed" handler="on_btn_jog_pressed"/>
+                                                            <signal name="released" handler="on_btn_jog_released"/>
                                                           </object>
                                                           <packing>
                                                             <property name="top_attach">1</property>
@@ -1324,9 +1132,8 @@
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <signal name="pressed" handler="on_btn_jog_pressed" swapped="no"/>
-                                                            <signal name="released" handler="on_btn_jog_released" swapped="no"/>
+                                                            <signal name="pressed" handler="on_btn_jog_pressed"/>
+                                                            <signal name="released" handler="on_btn_jog_released"/>
                                                           </object>
                                                           <packing>
                                                             <property name="left_attach">2</property>
@@ -1345,9 +1152,8 @@
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <signal name="pressed" handler="on_btn_jog_pressed" swapped="no"/>
-                                                            <signal name="released" handler="on_btn_jog_released" swapped="no"/>
+                                                            <signal name="pressed" handler="on_btn_jog_pressed"/>
+                                                            <signal name="released" handler="on_btn_jog_released"/>
                                                           </object>
                                                           <packing>
                                                             <property name="left_attach">3</property>
@@ -1363,9 +1169,8 @@
                                                             <property name="height_request">50</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <signal name="pressed" handler="on_btn_jog_pressed" swapped="no"/>
-                                                            <signal name="released" handler="on_btn_jog_released" swapped="no"/>
+                                                            <signal name="pressed" handler="on_btn_jog_pressed"/>
+                                                            <signal name="released" handler="on_btn_jog_released"/>
                                                           </object>
                                                           <packing>
                                                             <property name="left_attach">2</property>
@@ -1382,9 +1187,8 @@
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <signal name="pressed" handler="on_btn_jog_pressed" swapped="no"/>
-                                                            <signal name="released" handler="on_btn_jog_released" swapped="no"/>
+                                                            <signal name="pressed" handler="on_btn_jog_pressed"/>
+                                                            <signal name="released" handler="on_btn_jog_released"/>
                                                           </object>
                                                           <packing>
                                                             <property name="left_attach">3</property>
@@ -1402,10 +1206,9 @@
                                                             <property name="height_request">50</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
                                                             <property name="xalign">0.47999998927116394</property>
-                                                            <signal name="pressed" handler="on_btn_jog_pressed" swapped="no"/>
-                                                            <signal name="released" handler="on_btn_jog_released" swapped="no"/>
+                                                            <signal name="pressed" handler="on_btn_jog_pressed"/>
+                                                            <signal name="released" handler="on_btn_jog_released"/>
                                                           </object>
                                                           <packing>
                                                             <property name="left_attach">2</property>
@@ -1435,29 +1238,73 @@
                                                 <child type="label">
                                                   <object class="GtkLabel" id="lbl_jogging">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">&lt;b&gt;Jogging&lt;/b&gt;</property>
                                                     <property name="use_markup">True</property>
                                                   </object>
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
                                           </object>
                                           <packing>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkFrame" id="frm_jog_rates">
+                                            <property name="width_request">120</property>
+                                            <property name="visible">True</property>
+                                            <property name="label_xalign">0.5</property>
+                                            <child>
+                                              <object class="GtkAlignment" id="ali_jog_rates">
+                                                <property name="visible">True</property>
+                                                <property name="top_padding">5</property>
+                                                <property name="bottom_padding">5</property>
+                                                <property name="left_padding">5</property>
+                                                <property name="right_padding">5</property>
+                                                <child>
+                                                  <object class="GtkVButtonBox" id="vbuttonbox2">
+                                                    <property name="width_request">50</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="spacing">3</property>
+                                                    <child>
+                                                      <placeholder/>
+                                                    </child>
+                                                    <child>
+                                                      <placeholder/>
+                                                    </child>
+                                                    <child>
+                                                      <placeholder/>
+                                                    </child>
+                                                    <child>
+                                                      <placeholder/>
+                                                    </child>
+                                                    <child>
+                                                      <placeholder/>
+                                                    </child>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                            <child type="label">
+                                              <object class="GtkLabel" id="lbl_steps">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">&lt;b&gt;Jog Rates&lt;/b&gt;</property>
+                                                <property name="use_markup">True</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="padding">2</property>
+                                            <property name="pack_type">end</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -1467,9 +1314,8 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal name="toggled" handler="on_chk_ignore_limits_toggled" swapped="no"/>
+                                        <signal name="toggled" handler="on_chk_ignore_limits_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1479,12 +1325,9 @@
                                     </child>
                                     <child>
                                       <object class="GtkImage" id="img_logo">
-                                        <property name="can_focus">False</property>
                                         <property name="pixbuf">images/Logo.png</property>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -1493,7 +1336,6 @@
                                 <child type="tab">
                                   <object class="GtkLabel" id="label4">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label">Manuell</property>
                                   </object>
                                   <packing>
@@ -1503,7 +1345,6 @@
                                 <child>
                                   <object class="EMC_MDIHistory" id="hal_mdihistory">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <placeholder/>
                                     </child>
@@ -1515,7 +1356,6 @@
                                 <child type="tab">
                                   <object class="GtkLabel" id="label5">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label">MDI</property>
                                   </object>
                                   <packing>
@@ -1552,7 +1392,6 @@
                                 <child type="tab">
                                   <object class="GtkLabel" id="label6">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label">Auto</property>
                                   </object>
                                   <packing>
@@ -1562,8 +1401,6 @@
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
                                 <property name="padding">2</property>
                                 <property name="position">1</property>
                               </packing>
@@ -1571,14 +1408,11 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -1586,32 +1420,27 @@
                       <object class="GtkVBox" id="box_info">
                         <property name="height_request">200</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkNotebook" id="ntb_info">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="show_tabs">False</property>
-                            <signal name="switch-page" handler="on_ntb_info_switch_page" swapped="no"/>
+                            <signal name="switch_page" handler="on_ntb_info_switch_page"/>
                             <child>
                               <object class="GtkHBox" id="hbox_main_info">
                                 <property name="height_request">200</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkVBox" id="box_tool_and_code_info">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkFrame" id="frm_tool_info">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="tooltip_text" translatable="yes">Information over the tool in spindle</property>
                                         <property name="label_xalign">0.5</property>
                                         <child>
                                           <object class="GtkAlignment" id="ali_tool_info">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="top_padding">5</property>
                                             <property name="bottom_padding">5</property>
                                             <property name="left_padding">5</property>
@@ -1619,14 +1448,12 @@
                                             <child>
                                               <object class="GtkTable" id="tbl_tool_info">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="n_rows">3</property>
                                                 <property name="n_columns">4</property>
                                                 <property name="homogeneous">True</property>
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_tool">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Tool no.</property>
                                                     <property name="width_chars">8</property>
                                                     <attributes>
@@ -1637,7 +1464,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_tool_no">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label">0</property>
                                                     <property name="justify">center</property>
                                                     <property name="width_chars">8</property>
@@ -1654,7 +1480,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_diameter">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">Diameter</property>
                                                     <property name="width_chars">8</property>
                                                   </object>
@@ -1666,7 +1491,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_tool_dia">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label">0</property>
                                                     <property name="justify">center</property>
                                                     <property name="width_chars">8</property>
@@ -1685,7 +1509,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_offset_z">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">offset z</property>
                                                     <property name="width_chars">8</property>
                                                   </object>
@@ -1697,7 +1520,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_tool_offset_z">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label">0</property>
                                                     <property name="justify">center</property>
                                                     <property name="width_chars">8</property>
@@ -1716,7 +1538,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_offset_x">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">offset x</property>
                                                     <property name="width_chars">8</property>
                                                   </object>
@@ -1728,7 +1549,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_tool_offset_x">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label">0</property>
                                                     <property name="justify">center</property>
                                                     <property name="width_chars">8</property>
@@ -1747,7 +1567,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_tool_name">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">No tool description available</property>
                                                     <attributes>
                                                       <attribute name="style" value="normal"/>
@@ -1767,67 +1586,23 @@
                                         <child type="label">
                                           <object class="GtkLabel" id="lbl_frm_tool_info">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">&lt;b&gt;Tool information&lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
                                           </object>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
-                                    <child>
-                                      <object class="GtkFrame" id="frm_program">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="tooltip_text" translatable="yes">The name and location of the loaded program</property>
-                                        <property name="label_xalign">0.5</property>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment10">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="top_padding">5</property>
-                                            <property name="bottom_padding">5</property>
-                                            <property name="left_padding">5</property>
-                                            <property name="right_padding">5</property>
-                                            <child>
-                                              <object class="GtkLabel" id="lbl_program">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="label" translatable="yes">No Program loaded</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="lbl_frame_program">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">&lt;b&gt;Program&lt;/b&gt;</property>
-                                            <property name="use_markup">True</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="pack_type">end</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
                                     <child>
                                       <object class="GtkFrame" id="frm_gcode">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="tooltip_text" translatable="yes">G and M code information as well as speed and feed</property>
                                         <property name="label_xalign">0.5</property>
                                         <child>
                                           <object class="GtkAlignment" id="alignment9">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="top_padding">5</property>
                                             <property name="bottom_padding">5</property>
                                             <property name="left_padding">5</property>
@@ -1835,15 +1610,12 @@
                                             <child>
                                               <object class="GtkVBox" id="vbox13">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkHBox" id="hbox5">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" id="active_mcodes_label">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">active_mcodes_label</property>
                                                         <attributes>
@@ -1852,15 +1624,12 @@
                                                         </attributes>
                                                       </object>
                                                       <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
                                                         <property name="position">0</property>
                                                       </packing>
                                                     </child>
                                                     <child>
                                                       <object class="GtkLabel" id="lbl_feed">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="xalign">1</property>
                                                         <property name="label">F </property>
                                                         <attributes>
@@ -1869,8 +1638,6 @@
                                                         </attributes>
                                                       </object>
                                                       <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
                                                         <property name="position">1</property>
                                                       </packing>
                                                     </child>
@@ -1878,7 +1645,6 @@
                                                       <object class="GtkLabel" id="lbl_active_feed">
                                                         <property name="width_request">50</property>
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="xalign">1</property>
                                                         <property name="label">10000</property>
                                                         <attributes>
@@ -1888,25 +1654,20 @@
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
-                                                        <property name="fill">True</property>
                                                         <property name="position">2</property>
                                                       </packing>
                                                     </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
                                                     <property name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkHBox" id="hbox10">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" id="active_gcodes_label">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="xalign">0</property>
                                                         <property name="label" translatable="yes">active_gcodes_label</property>
                                                         <attributes>
@@ -1915,15 +1676,12 @@
                                                         </attributes>
                                                       </object>
                                                       <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
                                                         <property name="position">0</property>
                                                       </packing>
                                                     </child>
                                                     <child>
                                                       <object class="GtkLabel" id="lbl_speed">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="xalign">1</property>
                                                         <property name="ypad">3</property>
                                                         <property name="label">S </property>
@@ -1933,8 +1691,6 @@
                                                         </attributes>
                                                       </object>
                                                       <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
                                                         <property name="position">1</property>
                                                       </packing>
                                                     </child>
@@ -1942,7 +1698,6 @@
                                                       <object class="GtkLabel" id="active_speed_label">
                                                         <property name="width_request">50</property>
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="xalign">1</property>
                                                         <property name="ypad">3</property>
                                                         <property name="label">10000</property>
@@ -1953,14 +1708,11 @@
                                                       </object>
                                                       <packing>
                                                         <property name="expand">False</property>
-                                                        <property name="fill">True</property>
                                                         <property name="position">2</property>
                                                       </packing>
                                                     </child>
                                                   </object>
                                                   <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
                                                     <property name="position">1</property>
                                                   </packing>
                                                 </child>
@@ -1971,44 +1723,271 @@
                                         <child type="label">
                                           <object class="GtkLabel" id="lbl_frame_code">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">&lt;b&gt;G-Code&lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
                                           </object>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="pack_type">end</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
+                                    <child>
+                                      <object class="GtkFrame" id="frm_program">
+                                        <property name="visible">True</property>
+                                        <property name="tooltip_text" translatable="yes">The name and location of the loaded program</property>
+                                        <property name="label_xalign">0.5</property>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment10">
+                                            <property name="visible">True</property>
+                                            <property name="top_padding">5</property>
+                                            <property name="bottom_padding">5</property>
+                                            <property name="left_padding">5</property>
+                                            <property name="right_padding">5</property>
+                                            <child>
+                                              <object class="GtkLabel" id="lbl_program">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">No Program loaded</property>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="lbl_frame_program">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">&lt;b&gt;Program&lt;/b&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkHBox" id="box_custom_1">
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkVBox" id="box_vel_info">
+                                    <property name="width_request">175</property>
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <object class="GtkFrame" id="frm_max_vel">
+                                        <property name="visible">True</property>
+                                        <property name="label_xalign">0.5</property>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment6">
+                                            <property name="visible">True</property>
+                                            <property name="top_padding">5</property>
+                                            <property name="bottom_padding">5</property>
+                                            <property name="left_padding">5</property>
+                                            <property name="right_padding">5</property>
+                                            <child>
+                                              <object class="GtkVBox" id="vbox10">
+                                                <property name="visible">True</property>
+                                                <child>
+                                                  <object class="GtkHBox" id="hbox9">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="lbl_vel">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">Vel.</property>
+                                                        <attributes>
+                                                          <attribute name="style" value="normal"/>
+                                                          <attribute name="weight" value="bold"/>
+                                                          <attribute name="scale" value="1.500000"/>
+                                                        </attributes>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">0</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkLabel" id="lbl_current_vel">
+                                                        <property name="visible">True</property>
+                                                        <property name="tooltip_text" translatable="yes">Displays the current velocity</property>
+                                                        <property name="xpad">5</property>
+                                                        <property name="ypad">5</property>
+                                                        <property name="label">10000</property>
+                                                        <property name="justify">center</property>
+                                                        <attributes>
+                                                          <attribute name="style" value="normal"/>
+                                                          <attribute name="weight" value="bold"/>
+                                                          <attribute name="scale" value="1.500000"/>
+                                                        </attributes>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkHScale" id="scl_max_vel">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="tooltip_text" translatable="yes">adjust max vel of machine</property>
+                                                    <property name="adjustment">adj_max_vel</property>
+                                                    <property name="show_fill_level">True</property>
+                                                    <property name="digits">0</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="lbl_frame_max_speed">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">&lt;b&gt;Max. Velocity&lt;/b&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkFrame" id="frm_feed_override">
+                                        <property name="width_request">200</property>
+                                        <property name="visible">True</property>
+                                        <property name="label_xalign">0.5</property>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment5">
+                                            <property name="visible">True</property>
+                                            <property name="top_padding">5</property>
+                                            <property name="bottom_padding">5</property>
+                                            <property name="left_padding">5</property>
+                                            <property name="right_padding">5</property>
+                                            <child>
+                                              <object class="GtkVBox" id="vbox9">
+                                                <property name="visible">True</property>
+                                                <child>
+                                                  <object class="GtkHBox" id="hbox8">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <object class="GtkLabel" id="lbl_feed_act">
+                                                        <property name="visible">True</property>
+                                                        <property name="tooltip_text" translatable="yes">Displayes the programmed feed rate</property>
+                                                        <property name="label">F 275</property>
+                                                        <attributes>
+                                                          <attribute name="weight" value="bold"/>
+                                                          <attribute name="scale" value="1.500000"/>
+                                                        </attributes>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="position">0</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <object class="GtkButton" id="btn_feed_100">
+                                                        <property name="label">100%</property>
+                                                        <property name="width_request">48</property>
+                                                        <property name="height_request">48</property>
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="receives_default">True</property>
+                                                        <property name="tooltip_text" translatable="yes">reset feed override to 100 %</property>
+                                                        <signal name="clicked" handler="on_btn_feed_100_clicked"/>
+                                                      </object>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkHScale" id="scl_feed">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="tooltip_text" translatable="yes">adjust feed override</property>
+                                                    <property name="adjustment">adj_feed</property>
+                                                    <property name="lower_stepper_sensitivity">on</property>
+                                                    <property name="upper_stepper_sensitivity">on</property>
+                                                    <property name="show_fill_level">True</property>
+                                                    <property name="restrict_to_fill_level">False</property>
+                                                    <property name="digits">0</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkLabel" id="lbl_feed_override">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">&lt;b&gt;Feed Override [%]&lt;/b&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </object>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="pack_type">end</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" id="box_custom_2">
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">4</property>
+                                  </packing>
+                                </child>
                                 <child>
                                   <object class="GtkHBox" id="box_coolant_and_spindle">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkHBox" id="box_cooling">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <child>
                                           <object class="GtkFrame" id="frm_cooling">
                                             <property name="width_request">100</property>
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="label_xalign">0.5</property>
                                             <child>
                                               <object class="GtkAlignment" id="alignment3">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xscale">0</property>
                                                 <property name="yscale">0</property>
                                                 <property name="top_padding">5</property>
@@ -2018,7 +1997,6 @@
                                                 <child>
                                                   <object class="GtkTable" id="tbl_cooling">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="n_rows">2</property>
                                                     <property name="homogeneous">True</property>
                                                     <child>
@@ -2028,9 +2006,8 @@
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
-                                                        <property name="use_action_appearance">False</property>
                                                         <property name="image">img_coolant_off</property>
-                                                        <signal name="toggled" handler="on_tbtn_flood_toggled" swapped="no"/>
+                                                        <signal name="toggled" handler="on_tbtn_flood_toggled"/>
                                                       </object>
                                                       <packing>
                                                         <property name="x_options">GTK_SHRINK</property>
@@ -2045,9 +2022,8 @@
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="receives_default">True</property>
-                                                        <property name="use_action_appearance">False</property>
                                                         <property name="image">img_mist_off</property>
-                                                        <signal name="toggled" handler="on_tbtn_mist_toggled" swapped="no"/>
+                                                        <signal name="toggled" handler="on_tbtn_mist_toggled"/>
                                                       </object>
                                                       <packing>
                                                         <property name="top_attach">1</property>
@@ -2064,7 +2040,6 @@
                                             <child type="label">
                                               <object class="GtkLabel" id="lbl_frame_coolant">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="label" translatable="yes">&lt;b&gt;Cooling&lt;/b&gt;</property>
                                                 <property name="use_markup">True</property>
                                               </object>
@@ -2078,38 +2053,31 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" id="box_custom_3">
-                                        <property name="can_focus">False</property>
                                         <child>
                                           <placeholder/>
                                         </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" id="box_spindle">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <child>
                                           <object class="GtkFrame" id="frm_spindle">
                                             <property name="width_request">200</property>
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="label_xalign">0.5</property>
                                             <child>
                                               <object class="GtkAlignment" id="alignment4">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="top_padding">5</property>
                                                 <property name="bottom_padding">5</property>
                                                 <property name="left_padding">5</property>
@@ -2117,28 +2085,22 @@
                                                 <child>
                                                   <object class="GtkVBox" id="vbox8">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkVBox" id="vbox16">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <child>
                                                           <object class="GtkHBox" id="hbox6">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_spindle_act">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="label">S 3500</property>
                                                             <attributes>
                                                             <attribute name="weight" value="bold"/>
-                                                            <attribute name="scale" value="1.5"/>
+                                                            <attribute name="scale" value="1.500000"/>
                                                             </attributes>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">True</property>
-                                                            <property name="fill">True</property>
                                                             <property name="position">0</property>
                                                             </packing>
                                                             </child>
@@ -2150,8 +2112,7 @@
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
-                                                            <property name="use_action_appearance">False</property>
-                                                            <signal name="clicked" handler="on_btn_spindle_100_clicked" swapped="no"/>
+                                                            <signal name="clicked" handler="on_btn_spindle_100_clicked"/>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -2161,7 +2122,6 @@
                                                             </child>
                                                           </object>
                                                           <packing>
-                                                            <property name="expand">True</property>
                                                             <property name="fill">False</property>
                                                             <property name="position">0</property>
                                                           </packing>
@@ -2174,7 +2134,6 @@
                                                             <property name="digits">0</property>
                                                           </object>
                                                           <packing>
-                                                            <property name="expand">True</property>
                                                             <property name="fill">False</property>
                                                             <property name="position">1</property>
                                                           </packing>
@@ -2189,12 +2148,10 @@
                                                     <child>
                                                       <object class="GtkVBox" id="vbox_spindle_button">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="spacing">2</property>
                                                         <child>
                                                           <object class="GtkTable" id="tbl_spindle_button">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="n_columns">3</property>
                                                             <property name="column_spacing">8</property>
                                                             <property name="homogeneous">True</property>
@@ -2205,16 +2162,14 @@
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">False</property>
-                                                            <property name="use_action_appearance">False</property>
                                                             <property name="draw_indicator">False</property>
                                                             <property name="group">rbt_stop</property>
-                                                            <signal name="clicked" handler="on_rbt_reverse_clicked" swapped="no"/>
+                                                            <signal name="clicked" handler="on_rbt_reverse_clicked"/>
                                                             <child>
                                                             <object class="GtkImage" id="img_reverse">
                                                             <property name="width_request">48</property>
                                                             <property name="height_request">48</property>
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="pixbuf">images/reverse.png</property>
                                                             </object>
                                                             </child>
@@ -2231,16 +2186,14 @@
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">False</property>
-                                                            <property name="use_action_appearance">False</property>
                                                             <property name="draw_indicator">False</property>
                                                             <property name="group">rbt_stop</property>
-                                                            <signal name="clicked" handler="on_rbt_forward_clicked" swapped="no"/>
+                                                            <signal name="clicked" handler="on_rbt_forward_clicked"/>
                                                             <child>
                                                             <object class="GtkImage" id="img_spindle_forward">
                                                             <property name="width_request">48</property>
                                                             <property name="height_request">48</property>
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="pixbuf">images/forward.png</property>
                                                             </object>
                                                             </child>
@@ -2259,16 +2212,14 @@
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">False</property>
-                                                            <property name="use_action_appearance">False</property>
                                                             <property name="active">True</property>
                                                             <property name="draw_indicator">False</property>
-                                                            <signal name="clicked" handler="on_rbt_stop_clicked" swapped="no"/>
+                                                            <signal name="clicked" handler="on_rbt_stop_clicked"/>
                                                             <child>
                                                             <object class="GtkImage" id="img_spindle_stop">
                                                             <property name="width_request">48</property>
                                                             <property name="height_request">48</property>
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="pixbuf">images/stop.gif</property>
                                                             </object>
                                                             </child>
@@ -2282,7 +2233,6 @@
                                                             </child>
                                                           </object>
                                                           <packing>
-                                                            <property name="expand">True</property>
                                                             <property name="fill">False</property>
                                                             <property name="padding">5</property>
                                                             <property name="position">0</property>
@@ -2291,34 +2241,28 @@
                                                         <child>
                                                           <object class="GtkHBox" id="hbox_spindle_bar">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <child>
                                                             <object class="HAL_HBar" id="spindle_feedback_bar">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="bg_color">#bebebebebebe</property>
                                                             <property name="max">6000</property>
+                                                            <property name="z1_color">#0000ffff0000</property>
+                                                            <property name="z1_border">0.80000001192092896</property>
+                                                            <property name="z2_color">#0000ffff0000</property>
                                                             <property name="target_color">#0000ffff0000</property>
-                                                            <property name="target_value">-0.039999999105930328</property>
-                                                            <property name="text_template">%i</property>
                                                             <property name="z0_border">0.40000000596046448</property>
+                                                            <property name="target_value">-0.039999999105930328</property>
                                                             <property name="z0_color">#0000ffff0000</property>
-                                                            <property name="z1_border">0.80000001192092896</property>
-                                                            <property name="z1_color">#0000ffff0000</property>
-                                                            <property name="z2_color">#0000ffff0000</property>
+                                                            <property name="text_template">%i</property>
                                                             </object>
                                                             <packing>
-                                                            <property name="expand">True</property>
-                                                            <property name="fill">True</property>
                                                             <property name="position">0</property>
                                                             </packing>
                                                             </child>
                                                             <child>
                                                             <object class="HAL_LED" id="spindle_at_speed_led">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="led_blink_rate">0</property>
-                                                            <property name="on_color">green</property>
                                                             </object>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -2329,7 +2273,6 @@
                                                             </child>
                                                           </object>
                                                           <packing>
-                                                            <property name="expand">True</property>
                                                             <property name="fill">False</property>
                                                             <property name="padding">2</property>
                                                             <property name="position">1</property>
@@ -2337,8 +2280,6 @@
                                                         </child>
                                                       </object>
                                                       <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
                                                         <property name="position">1</property>
                                                       </packing>
                                                     </child>
@@ -2349,7 +2290,6 @@
                                             <child type="label">
                                               <object class="GtkLabel" id="label17">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="label" translatable="yes">&lt;b&gt;Spindle [rpm]&lt;/b&gt;</property>
                                                 <property name="use_markup">True</property>
                                               </object>
@@ -2357,28 +2297,23 @@
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
-                                            <property name="fill">True</property>
                                             <property name="pack_type">end</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkHBox" id="box_custom_4">
-                                        <property name="can_focus">False</property>
                                         <child>
                                           <placeholder/>
                                         </child>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="fill">True</property>
                                         <property name="position">3</property>
                                       </packing>
                                     </child>
@@ -2390,253 +2325,11 @@
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkHBox" id="box_custom_1">
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVBox" id="box_vel_info">
-                                    <property name="width_request">175</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkFrame" id="frm_feed_override">
-                                        <property name="width_request">200</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label_xalign">0.5</property>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment5">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="top_padding">5</property>
-                                            <property name="bottom_padding">5</property>
-                                            <property name="left_padding">5</property>
-                                            <property name="right_padding">5</property>
-                                            <child>
-                                              <object class="GtkVBox" id="vbox9">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <child>
-                                                  <object class="GtkHBox" id="hbox8">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <child>
-                                                      <object class="GtkLabel" id="lbl_feed_act">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="tooltip_text" translatable="yes">Displayes the programmed feed rate</property>
-                                                        <property name="label">F 275</property>
-                                                        <attributes>
-                                                          <attribute name="weight" value="bold"/>
-                                                          <attribute name="scale" value="1.5"/>
-                                                        </attributes>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">0</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkButton" id="btn_feed_100">
-                                                        <property name="label">100%</property>
-                                                        <property name="width_request">48</property>
-                                                        <property name="height_request">48</property>
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">True</property>
-                                                        <property name="receives_default">True</property>
-                                                        <property name="tooltip_text" translatable="yes">reset feed override to 100 %</property>
-                                                        <property name="use_action_appearance">False</property>
-                                                        <signal name="clicked" handler="on_btn_feed_100_clicked" swapped="no"/>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">False</property>
-                                                        <property name="fill">False</property>
-                                                        <property name="position">1</property>
-                                                      </packing>
-                                                    </child>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkHScale" id="scl_feed">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="tooltip_text" translatable="yes">adjust feed override</property>
-                                                    <property name="adjustment">adj_feed</property>
-                                                    <property name="lower_stepper_sensitivity">on</property>
-                                                    <property name="upper_stepper_sensitivity">on</property>
-                                                    <property name="show_fill_level">True</property>
-                                                    <property name="restrict_to_fill_level">False</property>
-                                                    <property name="digits">0</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="lbl_feed_override">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">&lt;b&gt;Feed Override [%]&lt;/b&gt;</property>
-                                            <property name="use_markup">True</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="pack_type">end</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkFrame" id="frm_max_vel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label_xalign">0.5</property>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment6">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="top_padding">5</property>
-                                            <property name="bottom_padding">5</property>
-                                            <property name="left_padding">5</property>
-                                            <property name="right_padding">5</property>
-                                            <child>
-                                              <object class="GtkVBox" id="vbox10">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <child>
-                                                  <object class="GtkHBox" id="hbox9">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <child>
-                                                      <object class="GtkLabel" id="lbl_vel">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="label" translatable="yes">Vel.</property>
-                                                        <attributes>
-                                                          <attribute name="style" value="normal"/>
-                                                          <attribute name="weight" value="bold"/>
-                                                          <attribute name="scale" value="1.5"/>
-                                                        </attributes>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">0</property>
-                                                      </packing>
-                                                    </child>
-                                                    <child>
-                                                      <object class="GtkLabel" id="lbl_current_vel">
-                                                        <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
-                                                        <property name="tooltip_text" translatable="yes">Displays the current velocity</property>
-                                                        <property name="xpad">5</property>
-                                                        <property name="ypad">5</property>
-                                                        <property name="label">10000</property>
-                                                        <property name="justify">center</property>
-                                                        <attributes>
-                                                          <attribute name="style" value="normal"/>
-                                                          <attribute name="weight" value="bold"/>
-                                                          <attribute name="scale" value="1.5"/>
-                                                        </attributes>
-                                                      </object>
-                                                      <packing>
-                                                        <property name="expand">True</property>
-                                                        <property name="fill">True</property>
-                                                        <property name="position">1</property>
-                                                      </packing>
-                                                    </child>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkHScale" id="scl_max_vel">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="tooltip_text" translatable="yes">adjust max vel of machine</property>
-                                                    <property name="adjustment">adj_max_vel</property>
-                                                    <property name="show_fill_level">True</property>
-                                                    <property name="digits">0</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="lbl_frame_max_speed">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">&lt;b&gt;Max. Velocity&lt;/b&gt;</property>
-                                            <property name="use_markup">True</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="pack_type">end</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkHBox" id="box_custom_2">
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">4</property>
-                                  </packing>
-                                </child>
                               </object>
                             </child>
                             <child type="tab">
                               <object class="GtkLabel" id="lbl_ntb_info_info">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="label">Info</property>
                               </object>
                               <packing>
@@ -2646,7 +2339,6 @@
                             <child>
                               <object class="GtkHBox" id="key_box">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <placeholder/>
                                 </child>
@@ -2658,7 +2350,6 @@
                             <child type="tab">
                               <object class="GtkLabel" id="lbl_frm_info_emb_keyb">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="label">Embeded keyboard</property>
                               </object>
                               <packing>
@@ -2668,15 +2359,12 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkTable" id="tbl_search">
                             <property name="height_request">50</property>
-                            <property name="can_focus">False</property>
                             <property name="n_columns">16</property>
                             <child>
                               <object class="GtkButton" id="btn_undo">
@@ -2685,8 +2373,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <signal name="clicked" handler="on_btn_undo_clicked" swapped="no"/>
+                                <signal name="clicked" handler="on_btn_undo_clicked"/>
                               </object>
                               <packing>
                                 <property name="x_options">GTK_SHRINK</property>
@@ -2701,8 +2388,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <signal name="clicked" handler="on_btn_search_back_clicked" swapped="no"/>
+                                <signal name="clicked" handler="on_btn_search_back_clicked"/>
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
@@ -2719,8 +2405,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <signal name="clicked" handler="on_btn_search_forward_clicked" swapped="no"/>
+                                <signal name="clicked" handler="on_btn_search_forward_clicked"/>
                               </object>
                               <packing>
                                 <property name="left_attach">10</property>
@@ -2736,8 +2421,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <signal name="clicked" handler="on_btn_redo_clicked" swapped="no"/>
+                                <signal name="clicked" handler="on_btn_redo_clicked"/>
                               </object>
                               <packing>
                                 <property name="left_attach">15</property>
@@ -2749,7 +2433,6 @@
                             <child>
                               <object class="GtkLabel" id="lbl_space">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -2759,7 +2442,6 @@
                             <child>
                               <object class="GtkLabel" id="lbl_spac">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">6</property>
@@ -2769,7 +2451,6 @@
                             <child>
                               <object class="GtkLabel" id="lbl_replace_text">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Replace
   Text:</property>
                               </object>
@@ -2785,7 +2466,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -2800,7 +2480,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -2812,7 +2491,6 @@
                             <child>
                               <object class="GtkLabel" id="lbl_spac1">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">9</property>
@@ -2825,8 +2503,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
-                                <signal name="clicked" handler="on_btn_replace_clicked" swapped="no"/>
+                                <signal name="clicked" handler="on_btn_replace_clicked"/>
                               </object>
                               <packing>
                                 <property name="left_attach">13</property>
@@ -2838,7 +2515,6 @@
                             <child>
                               <object class="GtkLabel" id="lbl_search_text">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Search
   Text:</property>
                               </object>
@@ -2850,7 +2526,6 @@
                             <child>
                               <object class="GtkLabel" id="lbl_spac2">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">3</property>
@@ -2860,7 +2535,6 @@
                             <child>
                               <object class="GtkLabel" id="lbl_spac3">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                               </object>
                               <packing>
                                 <property name="left_attach">14</property>
@@ -2871,9 +2545,7 @@
                               <object class="GtkEntry" id="search_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
-                                <property name="primary_icon_activatable">False</property>
-                                <property name="secondary_icon_activatable">False</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="primary_icon_sensitive">True</property>
                                 <property name="secondary_icon_sensitive">True</property>
                               </object>
@@ -2886,9 +2558,7 @@
                               <object class="GtkEntry" id="replace_entry">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
-                                <property name="primary_icon_activatable">False</property>
-                                <property name="secondary_icon_activatable">False</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="primary_icon_sensitive">True</property>
                                 <property name="secondary_icon_sensitive">True</property>
                               </object>
@@ -2900,14 +2570,12 @@
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -2916,7 +2584,6 @@
                 <child type="tab">
                   <object class="GtkLabel" id="lbl_ntb_main_main">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Main</property>
                   </object>
                   <packing>
@@ -2941,7 +2608,6 @@
                     <child type="tab">
                       <object class="GtkLabel" id="lbl_ntb_setup_debug">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Debug</property>
                       </object>
                       <packing>
@@ -2960,20 +2626,16 @@
                         <child>
                           <object class="GtkHBox" id="hbox_setup_apear">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkVBox" id="vbox_window">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkFrame" id="frm_main_window">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_main_window">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -2981,21 +2643,18 @@
                                         <child>
                                           <object class="GtkVBox" id="vbox_main_window">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <child>
                                               <object class="GtkRadioButton" id="rbtn_fullscreen">
                                                 <property name="label" translatable="yes">Start as fullscreen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_rbtn_fullscreen_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_rbtn_fullscreen_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
@@ -3005,14 +2664,12 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="draw_indicator">True</property>
                                                 <property name="group">rbtn_fullscreen</property>
-                                                <signal name="toggled" handler="on_rbtn_maximized_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_rbtn_maximized_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -3022,27 +2679,23 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="draw_indicator">True</property>
                                                 <property name="group">rbtn_fullscreen</property>
-                                                <signal name="toggled" handler="on_rbtn_window_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_rbtn_window_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">2</property>
                                               </packing>
                                             </child>
                                             <child>
                                               <object class="GtkTable" id="tbl_main_window">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="n_rows">4</property>
                                                 <property name="n_columns">2</property>
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_x_pos">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="ypad">5</property>
@@ -3056,7 +2709,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_y_pos">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="ypad">5</property>
@@ -3072,7 +2724,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_width">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="ypad">5</property>
@@ -3088,7 +2739,6 @@
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_height">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="ypad">5</property>
@@ -3106,10 +2756,8 @@
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="invisible_char">●</property>
+                                                    <property name="invisible_char">&#x25CF;</property>
                                                     <property name="xalign">1</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
                                                     <property name="primary_icon_sensitive">True</property>
                                                     <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adj_x_pos</property>
@@ -3127,10 +2775,8 @@
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="invisible_char">●</property>
+                                                    <property name="invisible_char">&#x25CF;</property>
                                                     <property name="xalign">1</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
                                                     <property name="primary_icon_sensitive">True</property>
                                                     <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adj_y_pos</property>
@@ -3150,10 +2796,8 @@
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="invisible_char">●</property>
+                                                    <property name="invisible_char">&#x25CF;</property>
                                                     <property name="xalign">1</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
                                                     <property name="primary_icon_sensitive">True</property>
                                                     <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adj_width</property>
@@ -3173,10 +2817,8 @@
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="invisible_char">●</property>
+                                                    <property name="invisible_char">&#x25CF;</property>
                                                     <property name="xalign">1</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
                                                     <property name="primary_icon_sensitive">True</property>
                                                     <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adj_height</property>
@@ -3193,8 +2835,6 @@
                                                 </child>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">3</property>
                                               </packing>
                                             </child>
@@ -3204,13 +2844,10 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_hide_cursor_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_hide_cursor_toggled"/>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="padding">10</property>
                                                 <property name="position">4</property>
                                               </packing>
@@ -3222,7 +2859,6 @@
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_main_window">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;Main Window&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -3237,12 +2873,10 @@
                                 <child>
                                   <object class="GtkFrame" id="frm_keyboard">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_keyboard">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -3250,21 +2884,17 @@
                                         <child>
                                           <object class="GtkVBox" id="vbox_keyboard">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <child>
                                               <object class="GtkCheckButton" id="chk_use_kb_on_offset">
                                                 <property name="label" translatable="yes">Show keyboard on offset</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_use_kb_on_offset_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_use_kb_on_offset_toggled"/>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
@@ -3274,14 +2904,11 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_use_kb_on_tooledit_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_use_kb_on_tooledit_toggled"/>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -3291,14 +2918,11 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_use_kb_on_mdi_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_use_kb_on_mdi_toggled"/>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">2</property>
                                               </packing>
                                             </child>
@@ -3308,14 +2932,11 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_use_kb_on_edit_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_use_kb_on_edit_toggled"/>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">3</property>
                                               </packing>
                                             </child>
@@ -3325,13 +2946,10 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_use_kb_on_file_selection_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_use_kb_on_file_selection_toggled"/>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">4</property>
                                               </packing>
                                             </child>
@@ -3342,7 +2960,6 @@
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_keyboard">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;Keyboard&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -3358,12 +2975,10 @@
                                 <child>
                                   <object class="GtkFrame" id="frm_ntb_preview">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_keyboard1">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -3371,21 +2986,17 @@
                                         <child>
                                           <object class="GtkVBox" id="vbox_keyboard1">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <child>
                                               <object class="GtkRadioButton" id="rbtn_show_preview">
                                                 <property name="label" translatable="yes">show preview</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_rbtn_show_preview_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_rbtn_show_preview_toggled"/>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
@@ -3395,13 +3006,10 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="draw_indicator">True</property>
                                                 <property name="group">rbtn_show_preview</property>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -3412,7 +3020,6 @@
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_ntb_preview">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;On Touch off&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -3428,12 +3035,10 @@
                                 <child>
                                   <object class="GtkFrame" id="frm_gremlin_gridsize">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_gremlin_gridsize">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -3441,17 +3046,13 @@
                                         <child>
                                           <object class="GtkHBox" id="hbox16">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <child>
                                               <object class="GtkLabel" id="label8">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Grid size</property>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
@@ -3459,19 +3060,15 @@
                                               <object class="GtkSpinButton" id="grid_size">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="invisible_char">●</property>
+                                                <property name="invisible_char">&#x25CF;</property>
                                                 <property name="xalign">1</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
                                                 <property name="primary_icon_sensitive">True</property>
                                                 <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adj_grid_size</property>
                                                 <property name="digits">3</property>
-                                                <signal name="value-changed" handler="on_grid_size_value_changed" swapped="no"/>
+                                                <signal name="value_changed" handler="on_grid_size_value_changed"/>
                                               </object>
                                               <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -3482,7 +3079,6 @@
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_gremlin_grid_size">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -3503,8 +3099,7 @@ Aux Screen</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <signal name="toggled" handler="on_tbtn_use_screen2_toggled" swapped="no"/>
+                                    <signal name="toggled" handler="on_tbtn_use_screen2_toggled"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -3523,16 +3118,13 @@ Aux Screen</property>
                             <child>
                               <object class="GtkVBox" id="vbox_dro_settings">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkFrame" id="frm_dro">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_dro">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -3540,14 +3132,12 @@ Aux Screen</property>
                                         <child>
                                           <object class="GtkTable" id="tbl_frm_dro">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="n_rows">9</property>
                                             <property name="n_columns">2</property>
                                             <property name="row_spacing">3</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_rel_color">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Relative Color</property>
                                               </object>
@@ -3562,9 +3152,8 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="color">#000000000000</property>
-                                                <signal name="color-set" handler="on_rel_colorbutton_color_set" swapped="no"/>
+                                                <signal name="color_set" handler="on_rel_colorbutton_color_set"/>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
@@ -3576,7 +3165,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_abs_color">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Absolute Color</property>
                                               </object>
@@ -3593,9 +3181,8 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="color">#00000000ffff</property>
-                                                <signal name="color-set" handler="on_abs_colorbutton_color_set" swapped="no"/>
+                                                <signal name="color_set" handler="on_abs_colorbutton_color_set"/>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
@@ -3609,7 +3196,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_dtg_color">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">DTG Color</property>
                                               </object>
@@ -3626,9 +3212,8 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="color">#ffffffff0000</property>
-                                                <signal name="color-set" handler="on_dtg_colorbutton_color_set" swapped="no"/>
+                                                <signal name="color_set" handler="on_dtg_colorbutton_color_set"/>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
@@ -3645,11 +3230,10 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="xalign">1</property>
                                                 <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_auto_units_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_auto_units_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="right_attach">2</property>
@@ -3666,10 +3250,9 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="xalign">1</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_show_dro_btn_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_show_dro_btn_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="right_attach">2</property>
@@ -3683,7 +3266,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkHSeparator" id="hseparator1">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                               </object>
                                               <packing>
                                                 <property name="right_attach">2</property>
@@ -3694,7 +3276,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="label7">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Homed color</property>
                                               </object>
@@ -3709,7 +3290,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="label11">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Unhomed color</property>
                                               </object>
@@ -3726,9 +3306,8 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="color">#0000ffff0000</property>
-                                                <signal name="color-set" handler="on_homed_colorbtn_color_set" swapped="no"/>
+                                                <signal name="color_set" handler="on_homed_colorbtn_color_set"/>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
@@ -3744,9 +3323,8 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="color">#ffff00000000</property>
-                                                <signal name="color-set" handler="on_unhomed_colorbtn_color_set" swapped="no"/>
+                                                <signal name="color_set" handler="on_unhomed_colorbtn_color_set"/>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
@@ -3760,11 +3338,9 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkHBox" id="hbox_dro_size">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_dro_size">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="ypad">5</property>
@@ -3772,7 +3348,6 @@ Aux Screen</property>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
-                                                    <property name="fill">True</property>
                                                     <property name="padding">3</property>
                                                     <property name="position">0</property>
                                                   </packing>
@@ -3781,10 +3356,8 @@ Aux Screen</property>
                                                   <object class="GtkSpinButton" id="spbtn_dro_size">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="invisible_char">●</property>
+                                                    <property name="invisible_char">&#x25CF;</property>
                                                     <property name="xalign">1</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
                                                     <property name="primary_icon_sensitive">True</property>
                                                     <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adj_dro_size</property>
@@ -3792,8 +3365,6 @@ Aux Screen</property>
                                                     <property name="numeric">True</property>
                                                   </object>
                                                   <packing>
-                                                    <property name="expand">True</property>
-                                                    <property name="fill">True</property>
                                                     <property name="position">1</property>
                                                   </packing>
                                                 </child>
@@ -3811,7 +3382,6 @@ Aux Screen</property>
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_dro">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;DRO&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -3826,12 +3396,10 @@ Aux Screen</property>
                                 <child>
                                   <object class="GtkFrame" id="frm_preview">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_preview">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">5</property>
@@ -3839,20 +3407,17 @@ Aux Screen</property>
                                         <child>
                                           <object class="GtkVBox" id="vbox_preview">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <child>
                                               <object class="GtkCheckButton" id="chk_show_offsets">
                                                 <property name="label" translatable="yes">Show offsets</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_show_offsets_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_show_offsets_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
@@ -3862,13 +3427,11 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_show_dro_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_show_dro_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -3878,32 +3441,27 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="xalign">1</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_chk_show_dtg_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_chk_show_dtg_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">2</property>
                                               </packing>
                                             </child>
                                             <child>
                                               <object class="GtkHSeparator" id="hseparator2">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
-                                                <property name="fill">True</property>
                                                 <property name="position">3</property>
                                               </packing>
                                             </child>
                                             <child>
                                               <object class="GtkLabel" id="lbl_mouse_mode">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="label" translatable="yes">&lt;b&gt;Mouse Button mode&lt;/b&gt;</property>
                                                 <property name="use_markup">True</property>
                                               </object>
@@ -3916,20 +3474,9 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkComboBoxEntry" id="cmb_mouse_button_mode">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="model">lst_button_mode</property>
-                                                <property name="active">4</property>
                                                 <property name="text_column">1</property>
-                                                <signal name="changed" handler="on_cmb_mouse_button_mode_changed" swapped="no"/>
-                                                <child internal-child="entry">
-                                                  <object class="GtkEntry" id="comboboxentry-entry2">
-                                                    <property name="can_focus">False</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
-                                                    <property name="primary_icon_sensitive">True</property>
-                                                    <property name="secondary_icon_sensitive">True</property>
-                                                  </object>
-                                                </child>
+                                                <signal name="changed" handler="on_cmb_mouse_button_mode_changed"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -3944,7 +3491,6 @@ Aux Screen</property>
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_preview">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;Preview&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -3967,16 +3513,13 @@ Aux Screen</property>
                             <child>
                               <object class="GtkVBox" id="vbox_file">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkFrame" id="frm_file_to_load">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_file_to_load">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -3984,13 +3527,11 @@ Aux Screen</property>
                                         <child>
                                           <object class="GtkVBox" id="vbox_file_to_load">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <child>
                                               <object class="GtkFileChooserButton" id="file_to_load_chooser">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="filter">ff_file_to_load</property>
-                                                <signal name="file-set" handler="on_file_to_load_chooser_file_set" swapped="no"/>
+                                                <signal name="file_set" handler="on_file_to_load_chooser_file_set"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -4001,7 +3542,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkHButtonBox" id="hbtb_file_to_load">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkButton" id="btn_use_current">
                                                     <property name="label" translatable="yes">current
@@ -4011,8 +3551,7 @@ Aux Screen</property>
                                                     <property name="sensitive">False</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">True</property>
-                                                    <property name="use_action_appearance">False</property>
-                                                    <signal name="clicked" handler="on_btn_use_current_clicked" swapped="no"/>
+                                                    <signal name="clicked" handler="on_btn_use_current_clicked"/>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -4027,8 +3566,7 @@ Aux Screen</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">True</property>
-                                                    <property name="use_action_appearance">False</property>
-                                                    <signal name="clicked" handler="on_btn_none_clicked" swapped="no"/>
+                                                    <signal name="clicked" handler="on_btn_none_clicked"/>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -4052,7 +3590,6 @@ Aux Screen</property>
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_file_to_load">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;File to load on start&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -4067,12 +3604,10 @@ Aux Screen</property>
                                 <child>
                                   <object class="GtkFrame" id="frm_select_jump_to_dir">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_jump_to_dir">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -4080,10 +3615,9 @@ Aux Screen</property>
                                         <child>
                                           <object class="GtkFileChooserButton" id="jump_to_dir_chooser">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="action">select-folder</property>
                                             <property name="title" translatable="yes">Select user dir</property>
-                                            <signal name="file-set" handler="on_jump_to_dir_chooser_file_set" swapped="no"/>
+                                            <signal name="file_set" handler="on_jump_to_dir_chooser_file_set"/>
                                           </object>
                                         </child>
                                       </object>
@@ -4091,7 +3625,6 @@ Aux Screen</property>
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_select_jump_to_dir">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;Select jump to dir&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -4107,12 +3640,10 @@ Aux Screen</property>
                                 <child>
                                   <object class="GtkFrame" id="frm_themes">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_themes">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -4120,13 +3651,11 @@ Aux Screen</property>
                                         <child>
                                           <object class="GtkTable" id="table1">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="n_rows">4</property>
                                             <property name="n_columns">2</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_themes">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="label" translatable="yes">Themes</property>
                                               </object>
                                               <packing>
@@ -4138,9 +3667,8 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkComboBox" id="theme_choice">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="model">lstst_themes</property>
-                                                <signal name="changed" handler="on_theme_choice_changed" swapped="no"/>
+                                                <signal name="changed" handler="on_theme_choice_changed"/>
                                                 <child>
                                                   <object class="GtkCellRendererText" id="cellrenderertext1"/>
                                                   <attributes>
@@ -4159,7 +3687,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="label25">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Warning Audio</property>
                                               </object>
@@ -4173,7 +3700,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="label27">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Alert Audio</property>
                                               </object>
@@ -4187,8 +3713,7 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkFileChooserButton" id="audio_error_chooser">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <signal name="file-set" handler="on_change_sound" swapped="no"/>
+                                                <signal name="file_set" handler="on_change_sound"/>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
@@ -4202,8 +3727,7 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkFileChooserButton" id="audio_alert_chooser">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <signal name="file-set" handler="on_change_sound" swapped="no"/>
+                                                <signal name="file_set" handler="on_change_sound"/>
                                               </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
@@ -4221,7 +3745,6 @@ Aux Screen</property>
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_themes">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;Themes and sound&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -4237,18 +3760,14 @@ Aux Screen</property>
                                 <child>
                                   <object class="GtkLabel" id="lbl_spa">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
                                 <property name="padding">3</property>
                                 <property name="position">2</property>
                               </packing>
@@ -4258,7 +3777,6 @@ Aux Screen</property>
                         <child type="tab">
                           <object class="GtkLabel" id="lbl_ntb_setup_pages_apearance">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Apearance</property>
                           </object>
                           <packing>
@@ -4268,20 +3786,16 @@ Aux Screen</property>
                         <child>
                           <object class="GtkHBox" id="hbox_hardware">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkVBox" id="vbox21">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkFrame" id="frm_mpg_scale">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_mpg_scale">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -4289,14 +3803,12 @@ Aux Screen</property>
                                         <child>
                                           <object class="GtkTable" id="tbl_mpg_scale">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="tooltip_text" translatable="yes">You can select a scale for the MPG to be applied, as default a value of (MAX - MIN) / 100 will be used</property>
                                             <property name="n_rows">4</property>
                                             <property name="n_columns">2</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_scale_max_vel">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="ypad">5</property>
@@ -4310,7 +3822,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_scale_jog_vel">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="ypad">5</property>
@@ -4326,7 +3837,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_feed_overid">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="ypad">5</property>
@@ -4342,7 +3852,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_spindle_override">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="ypad">5</property>
@@ -4359,10 +3868,8 @@ Aux Screen</property>
                                               <object class="GtkSpinButton" id="spbtn_scale_max_vel">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="invisible_char">●</property>
+                                                <property name="invisible_char">&#x25CF;</property>
                                                 <property name="xalign">1</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
                                                 <property name="primary_icon_sensitive">True</property>
                                                 <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adj_scale_max_vel</property>
@@ -4379,10 +3886,8 @@ Aux Screen</property>
                                               <object class="GtkSpinButton" id="spbtn_scale_jog_vel">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="invisible_char">●</property>
+                                                <property name="invisible_char">&#x25CF;</property>
                                                 <property name="xalign">1</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
                                                 <property name="primary_icon_sensitive">True</property>
                                                 <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adj_scale_jog_vel</property>
@@ -4401,10 +3906,8 @@ Aux Screen</property>
                                               <object class="GtkSpinButton" id="spbtn_scale_feed_override">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="invisible_char">●</property>
+                                                <property name="invisible_char">&#x25CF;</property>
                                                 <property name="xalign">1</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
                                                 <property name="primary_icon_sensitive">True</property>
                                                 <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adj_scale_feed_override</property>
@@ -4423,10 +3926,8 @@ Aux Screen</property>
                                               <object class="GtkSpinButton" id="spbtn_scale_spindle_override">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="invisible_char">●</property>
+                                                <property name="invisible_char">&#x25CF;</property>
                                                 <property name="xalign">1</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
                                                 <property name="primary_icon_sensitive">True</property>
                                                 <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adj_scale_spindle_override</property>
@@ -4448,7 +3949,6 @@ Aux Screen</property>
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_mpg_scale">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;Hardware MPG Scale&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -4463,12 +3963,10 @@ Aux Screen</property>
                                 <child>
                                   <object class="GtkFrame" id="frm_kb_shortcuts">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_kb_shortcuts">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -4480,9 +3978,8 @@ Aux Screen</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="tooltip_text" translatable="yes">Do you want to use keyboard shortcuts to control the machine?</property>
-                                            <property name="use_action_appearance">False</property>
                                             <property name="draw_indicator">True</property>
-                                            <signal name="toggled" handler="on_chk_use_kb_shortcuts_toggled" swapped="no"/>
+                                            <signal name="toggled" handler="on_chk_use_kb_shortcuts_toggled"/>
                                           </object>
                                         </child>
                                       </object>
@@ -4490,7 +3987,6 @@ Aux Screen</property>
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_kb_shortcuts">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;Keyboard shortcuts&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -4505,13 +4001,11 @@ Aux Screen</property>
                                 <child>
                                   <object class="GtkFrame" id="frm_unlock">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="tooltip_text" translatable="yes">Select the way to unlock the settings page</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_unlock_settings">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -4519,17 +4013,15 @@ Aux Screen</property>
                                         <child>
                                           <object class="GtkVBox" id="vbox_unlock_settings">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <child>
                                               <object class="GtkRadioButton" id="rbt_use_unlock">
                                                 <property name="label" translatable="yes">Use unlock code</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="active">True</property>
                                                 <property name="draw_indicator">True</property>
-                                                <signal name="toggled" handler="on_rbt_unlock_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_rbt_unlock_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -4543,10 +4035,9 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="draw_indicator">True</property>
                                                 <property name="group">rbt_use_unlock</property>
-                                                <signal name="toggled" handler="on_rbt_unlock_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_rbt_unlock_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -4560,10 +4051,9 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="use_action_appearance">False</property>
                                                 <property name="draw_indicator">True</property>
                                                 <property name="group">rbt_use_unlock</property>
-                                                <signal name="toggled" handler="on_rbt_unlock_toggled" swapped="no"/>
+                                                <signal name="toggled" handler="on_rbt_unlock_toggled"/>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -4578,7 +4068,6 @@ Aux Screen</property>
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_unlock">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;Unlock settings&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -4594,12 +4083,10 @@ Aux Screen</property>
                                 <child>
                                   <object class="GtkFrame" id="frm_spindle_settings">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <property name="label_xalign">0.5</property>
                                     <child>
                                       <object class="GtkAlignment" id="ali_spindle">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="top_padding">5</property>
                                         <property name="bottom_padding">5</property>
                                         <property name="left_padding">3</property>
@@ -4607,13 +4094,11 @@ Aux Screen</property>
                                         <child>
                                           <object class="GtkTable" id="tbl_spindle">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="n_rows">3</property>
                                             <property name="n_columns">2</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_start_rpm">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Starting RPM</property>
                                               </object>
@@ -4628,12 +4113,10 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="tooltip_text" translatable="yes">Select the speed to start the spindle with, when no spindle speed has been given.</property>
-                                                <property name="invisible_char">●</property>
+                                                <property name="invisible_char">&#x25CF;</property>
                                                 <property name="activates_default">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="shadow_type">etched-in</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
                                                 <property name="primary_icon_sensitive">True</property>
                                                 <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adj_start_spindle_RPM</property>
@@ -4652,12 +4135,10 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="tooltip_text" translatable="yes">Set the Min limit of the spindle feedback bar, this settings will not afect the INI values.</property>
-                                                <property name="invisible_char">●</property>
+                                                <property name="invisible_char">&#x25CF;</property>
                                                 <property name="activates_default">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="shadow_type">etched-in</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
                                                 <property name="primary_icon_sensitive">True</property>
                                                 <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adj_spindle_bar_min</property>
@@ -4678,12 +4159,10 @@ Aux Screen</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="tooltip_text" translatable="yes">Set the Max limit of the spindle feedback bar, this settings will not afect the INI values.</property>
-                                                <property name="invisible_char">●</property>
+                                                <property name="invisible_char">&#x25CF;</property>
                                                 <property name="activates_default">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="shadow_type">etched-in</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
                                                 <property name="primary_icon_sensitive">True</property>
                                                 <property name="secondary_icon_sensitive">True</property>
                                                 <property name="adjustment">adj_spindle_bar_max</property>
@@ -4702,7 +4181,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_spindle_min_rpm">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Spindle bar min</property>
                                               </object>
@@ -4717,7 +4195,6 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkLabel" id="lbl_spindle_max_rpm">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Spindle bar max</property>
                                               </object>
@@ -4736,7 +4213,6 @@ Aux Screen</property>
                                     <child type="label">
                                       <object class="GtkLabel" id="lbl_frm_spindle">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label" translatable="yes">&lt;b&gt;Spindle&lt;/b&gt;</property>
                                         <property name="use_markup">True</property>
                                       </object>
@@ -4744,7 +4220,6 @@ Aux Screen</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
@@ -4762,7 +4237,6 @@ Aux Screen</property>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
                                 <property name="fill">False</property>
                                 <property name="position">0</property>
                               </packing>
@@ -4770,11 +4244,8 @@ Aux Screen</property>
                             <child>
                               <object class="GtkLabel" id="label1">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -4786,7 +4257,6 @@ Aux Screen</property>
                         <child type="tab">
                           <object class="GtkLabel" id="lbl_ntb_setup_pages_hardware">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Hardware</property>
                           </object>
                           <packing>
@@ -4797,24 +4267,19 @@ Aux Screen</property>
                         <child>
                           <object class="GtkHBox" id="hbox_advanced_settings">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" id="hbox_advanced">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox4">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkFrame" id="frm_tool_change">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label_xalign">0.5</property>
                                         <child>
                                           <object class="GtkAlignment" id="ali_tool_change">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="top_padding">5</property>
                                             <property name="bottom_padding">5</property>
                                             <property name="left_padding">3</property>
@@ -4822,16 +4287,14 @@ Aux Screen</property>
                                             <child>
                                               <object class="GtkVBox" id="vbox_tool_measurement">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkCheckButton" id="chk_use_tool_measurement">
                                                     <property name="label" translatable="yes">Use auto tool measurement</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
-                                                    <property name="use_action_appearance">False</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal name="toggled" handler="on_chk_use_tool_measurement_toggled" swapped="no"/>
+                                                    <signal name="toggled" handler="on_chk_use_tool_measurement_toggled"/>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -4843,12 +4306,10 @@ Aux Screen</property>
                                                   <object class="GtkFrame" id="frm_probe_pos">
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label_xalign">0.5</property>
                                                     <child>
                                                       <object class="GtkAlignment" id="ali_probe_pos">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="top_padding">5</property>
                                                         <property name="bottom_padding">5</property>
                                                         <property name="left_padding">3</property>
@@ -4856,13 +4317,11 @@ Aux Screen</property>
                                                         <child>
                                                           <object class="GtkTable" id="tbl_probe_pos">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="n_rows">5</property>
                                                             <property name="n_columns">2</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_pos_x">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">0</property>
                                                             <property name="label" translatable="yes">X Pos.</property>
                                                             </object>
@@ -4874,7 +4333,6 @@ Aux Screen</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_pos_y">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">0</property>
                                                             <property name="label" translatable="yes">Y Pos.</property>
                                                             </object>
@@ -4888,7 +4346,6 @@ Aux Screen</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_probe_height">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">0</property>
                                                             <property name="label" translatable="yes">Probe Height</property>
                                                             </object>
@@ -4903,15 +4360,13 @@ Aux Screen</property>
                                                             <object class="GtkSpinButton" id="spbtn_probe_height">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
-                                                            <property name="invisible_char">●</property>
+                                                            <property name="invisible_char">&#x25CF;</property>
                                                             <property name="xalign">1</property>
-                                                            <property name="primary_icon_activatable">False</property>
-                                                            <property name="secondary_icon_activatable">False</property>
                                                             <property name="primary_icon_sensitive">True</property>
                                                             <property name="secondary_icon_sensitive">True</property>
                                                             <property name="adjustment">adj_probe_height</property>
                                                             <property name="digits">3</property>
-                                                            <signal name="value-changed" handler="on_spbtn_probe_height_value_changed" swapped="no"/>
+                                                            <signal name="value_changed" handler="on_spbtn_probe_height_value_changed"/>
                                                             </object>
                                                             <packing>
                                                             <property name="left_attach">1</property>
@@ -4926,7 +4381,6 @@ Aux Screen</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_x_probe">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes">0.000</property>
                                                             </object>
@@ -4940,7 +4394,6 @@ Aux Screen</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_y_probe">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes">0.000</property>
                                                             </object>
@@ -4957,7 +4410,6 @@ Aux Screen</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_pos_z">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">0</property>
                                                             <property name="label" translatable="yes">Z Pos.</property>
                                                             </object>
@@ -4971,7 +4423,6 @@ Aux Screen</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_z_probe">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes">0.000</property>
                                                             </object>
@@ -4988,7 +4439,6 @@ Aux Screen</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_max_probe">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">0</property>
                                                             <property name="label" translatable="yes">Max. Probe</property>
                                                             </object>
@@ -5002,7 +4452,6 @@ Aux Screen</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_maxprobe">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes">0.000</property>
                                                             </object>
@@ -5023,7 +4472,6 @@ Aux Screen</property>
                                                     <child type="label">
                                                       <object class="GtkLabel" id="lbl_frm_probe">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="label" translatable="yes">&lt;b&gt;Probe Informations&lt;/b&gt;</property>
                                                         <property name="use_markup">True</property>
                                                       </object>
@@ -5039,12 +4487,10 @@ Aux Screen</property>
                                                   <object class="GtkFrame" id="frm_probe_vel">
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label_xalign">0.5</property>
                                                     <child>
                                                       <object class="GtkAlignment" id="ali_probe_vel">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="top_padding">5</property>
                                                         <property name="bottom_padding">5</property>
                                                         <property name="left_padding">3</property>
@@ -5052,13 +4498,11 @@ Aux Screen</property>
                                                         <child>
                                                           <object class="GtkTable" id="tbl_probe_vel">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="n_rows">2</property>
                                                             <property name="n_columns">2</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_search_vel">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">0</property>
                                                             <property name="label" translatable="yes">Search Vel.</property>
                                                             </object>
@@ -5070,7 +4514,6 @@ Aux Screen</property>
                                                             <child>
                                                             <object class="GtkLabel" id="lbl_latch_vel">
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
                                                             <property name="xalign">0</property>
                                                             <property name="label" translatable="yes">Probe Vel.</property>
                                                             </object>
@@ -5085,14 +4528,12 @@ Aux Screen</property>
                                                             <object class="GtkSpinButton" id="spbtn_search_vel">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
-                                                            <property name="invisible_char">●</property>
+                                                            <property name="invisible_char">&#x25CF;</property>
                                                             <property name="xalign">1</property>
-                                                            <property name="primary_icon_activatable">False</property>
-                                                            <property name="secondary_icon_activatable">False</property>
                                                             <property name="primary_icon_sensitive">True</property>
                                                             <property name="secondary_icon_sensitive">True</property>
                                                             <property name="adjustment">adj_search_vel</property>
-                                                            <signal name="value-changed" handler="on_spbtn_search_vel_value_changed" swapped="no"/>
+                                                            <signal name="value_changed" handler="on_spbtn_search_vel_value_changed"/>
                                                             </object>
                                                             <packing>
                                                             <property name="left_attach">1</property>
@@ -5106,14 +4547,12 @@ Aux Screen</property>
                                                             <object class="GtkSpinButton" id="spbtn_probe_vel">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
-                                                            <property name="invisible_char">●</property>
+                                                            <property name="invisible_char">&#x25CF;</property>
                                                             <property name="xalign">1</property>
-                                                            <property name="primary_icon_activatable">False</property>
-                                                            <property name="secondary_icon_activatable">False</property>
                                                             <property name="primary_icon_sensitive">True</property>
                                                             <property name="secondary_icon_sensitive">True</property>
                                                             <property name="adjustment">adf_probe_vel</property>
-                                                            <signal name="value-changed" handler="on_spbtn_probe_vel_value_changed" swapped="no"/>
+                                                            <signal name="value_changed" handler="on_spbtn_probe_vel_value_changed"/>
                                                             </object>
                                                             <packing>
                                                             <property name="left_attach">1</property>
@@ -5132,7 +4571,6 @@ Aux Screen</property>
                                                     <child type="label">
                                                       <object class="GtkLabel" id="lbl_frm_probe_vel">
                                                         <property name="visible">True</property>
-                                                        <property name="can_focus">False</property>
                                                         <property name="label" translatable="yes">&lt;b&gt;Probe velocitys&lt;/b&gt;</property>
                                                         <property name="use_markup">True</property>
                                                       </object>
@@ -5147,7 +4585,6 @@ Aux Screen</property>
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_tool_measurement">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="label" translatable="yes">No valid configuration
 found in your INI file,
 please take a look at 
@@ -5168,7 +4605,6 @@ to configure the settings.</property>
                                         <child type="label">
                                           <object class="GtkLabel" id="lbl_frm_tool_measur">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">&lt;b&gt;Tool Measurement&lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
                                           </object>
@@ -5183,12 +4619,10 @@ to configure the settings.</property>
                                     <child>
                                       <object class="GtkFrame" id="frm_tool_changer">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label_xalign">0.5</property>
                                         <child>
                                           <object class="GtkAlignment" id="ali_tool_changer">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="top_padding">5</property>
                                             <property name="bottom_padding">5</property>
                                             <property name="left_padding">3</property>
@@ -5196,11 +4630,9 @@ to configure the settings.</property>
                                             <child>
                                               <object class="GtkVBox" id="vbox_hide_axis_4">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_hide_axis_4">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">If the 4'th axis is used
 for a tool changer, you
@@ -5208,7 +4640,6 @@ hide the DRO and
 jog buttons.</property>
                                                   </object>
                                                   <packing>
-                                                    <property name="expand">True</property>
                                                     <property name="fill">False</property>
                                                     <property name="position">0</property>
                                                   </packing>
@@ -5219,12 +4650,10 @@ jog buttons.</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
-                                                    <property name="use_action_appearance">False</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal name="toggled" handler="on_chk_hide_axis_4_toggled" swapped="no"/>
+                                                    <signal name="toggled" handler="on_chk_hide_axis_4_toggled"/>
                                                   </object>
                                                   <packing>
-                                                    <property name="expand">True</property>
                                                     <property name="fill">False</property>
                                                     <property name="padding">10</property>
                                                     <property name="position">1</property>
@@ -5237,7 +4666,6 @@ jog buttons.</property>
                                         <child type="label">
                                           <object class="GtkLabel" id="lbl:frm_tool_changer">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">&lt;b&gt;Tool Changer&lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
                                           </object>
@@ -5253,23 +4681,19 @@ jog buttons.</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkVBox" id="vbox_error_handling">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkFrame" id="frm_message_position">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="label_xalign">0.5</property>
                                         <child>
                                           <object class="GtkAlignment" id="ali_message_style">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="top_padding">5</property>
                                             <property name="bottom_padding">5</property>
                                             <property name="left_padding">5</property>
@@ -5277,7 +4701,6 @@ jog buttons.</property>
                                             <child>
                                               <object class="GtkTable" id="table2">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <property name="n_rows">7</property>
                                                 <property name="n_columns">2</property>
                                                 <child>
@@ -5286,9 +4709,8 @@ jog buttons.</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
-                                                    <property name="use_action_appearance">False</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal name="toggled" handler="on_chk_use_frames_toggled" swapped="no"/>
+                                                    <signal name="toggled" handler="on_chk_use_frames_toggled"/>
                                                   </object>
                                                   <packing>
                                                     <property name="right_attach">2</property>
@@ -5299,7 +4721,6 @@ jog buttons.</property>
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_font_popup">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="ypad">5</property>
@@ -5313,7 +4734,6 @@ jog buttons.</property>
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_max_popup">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="ypad">5</property>
@@ -5329,7 +4749,6 @@ jog buttons.</property>
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_width_popup">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="ypad">5</property>
@@ -5347,9 +4766,8 @@ jog buttons.</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">True</property>
-                                                    <property name="use_action_appearance">False</property>
                                                     <property name="font_name">Sans 10</property>
-                                                    <signal name="font-set" handler="on_fontbutton_popup_font_set" swapped="no"/>
+                                                    <signal name="font_set" handler="on_fontbutton_popup_font_set"/>
                                                   </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
@@ -5362,10 +4780,8 @@ jog buttons.</property>
                                                   <object class="GtkSpinButton" id="spbtn_max_popup">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="invisible_char">●</property>
+                                                    <property name="invisible_char">&#x25CF;</property>
                                                     <property name="xalign">1</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
                                                     <property name="primary_icon_sensitive">True</property>
                                                     <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adj_max_messages</property>
@@ -5385,11 +4801,9 @@ jog buttons.</property>
                                                   <object class="GtkSpinButton" id="spbtn_width_popup">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="invisible_char">●</property>
+                                                    <property name="invisible_char">&#x25CF;</property>
                                                     <property name="xalign">1</property>
                                                     <property name="progress_fraction">0.0099999997764825821</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
                                                     <property name="primary_icon_sensitive">True</property>
                                                     <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adj_width_popup</property>
@@ -5408,7 +4822,6 @@ jog buttons.</property>
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_y_pos_popup">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="ypad">5</property>
@@ -5424,7 +4837,6 @@ jog buttons.</property>
                                                 <child>
                                                   <object class="GtkLabel" id="lbl_x_pos_popup">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="ypad">5</property>
@@ -5439,10 +4851,8 @@ jog buttons.</property>
                                                   <object class="GtkSpinButton" id="spbtn_x_pos_popup">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="invisible_char">●</property>
+                                                    <property name="invisible_char">&#x25CF;</property>
                                                     <property name="xalign">1</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
                                                     <property name="primary_icon_sensitive">True</property>
                                                     <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adj_x_pos_popup</property>
@@ -5460,10 +4870,8 @@ jog buttons.</property>
                                                   <object class="GtkSpinButton" id="spbtn_y_pos_popup">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
-                                                    <property name="invisible_char">●</property>
+                                                    <property name="invisible_char">&#x25CF;</property>
                                                     <property name="xalign">1</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
                                                     <property name="primary_icon_sensitive">True</property>
                                                     <property name="secondary_icon_sensitive">True</property>
                                                     <property name="adjustment">adj_y_pos_popup</property>
@@ -5485,8 +4893,7 @@ jog buttons.</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">True</property>
-                                                    <property name="use_action_appearance">False</property>
-                                                    <signal name="pressed" handler="on_btn_launch_test_message_pressed" swapped="no"/>
+                                                    <signal name="pressed" handler="on_btn_launch_test_message_pressed"/>
                                                   </object>
                                                   <packing>
                                                     <property name="right_attach">2</property>
@@ -5501,7 +4908,6 @@ jog buttons.</property>
                                         <child type="label">
                                           <object class="GtkLabel" id="lbl_frm_message_style">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">&lt;b&gt;      gmoccapy message
  behavior and appearance &lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
@@ -5516,7 +4922,6 @@ jog buttons.</property>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
                                     <property name="fill">False</property>
                                     <property name="padding">5</property>
                                     <property name="position">1</property>
@@ -5525,17 +4930,14 @@ jog buttons.</property>
                                 <child>
                                   <object class="GtkVBox" id="vbox20">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkFrame" id="frm_run_from_line">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <property name="tooltip_text" translatable="yes">Select if you want to use the "Run from line" option. This is not recommended at all! It is very dangerous, because LinucCNC will not take aware of any settings before that line. No offsets, no coordinate system change of feed or spindle speed changes will be noticed.</property>
                                         <property name="label_xalign">0.5</property>
                                         <child>
                                           <object class="GtkAlignment" id="ali_run_from_line">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="top_padding">5</property>
                                             <property name="bottom_padding">5</property>
                                             <property name="left_padding">5</property>
@@ -5543,17 +4945,15 @@ jog buttons.</property>
                                             <child>
                                               <object class="GtkVBox" id="vbox_run_from_line">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkRadioButton" id="rbtn_no_run_from_line">
                                                     <property name="label" translatable="yes">Do not use run from line</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
-                                                    <property name="use_action_appearance">False</property>
                                                     <property name="active">True</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal name="toggled" handler="on_rbtn_run_from_line_toggled" swapped="no"/>
+                                                    <signal name="toggled" handler="on_rbtn_run_from_line_toggled"/>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -5567,10 +4967,9 @@ jog buttons.</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
-                                                    <property name="use_action_appearance">False</property>
                                                     <property name="draw_indicator">True</property>
                                                     <property name="group">rbtn_no_run_from_line</property>
-                                                    <signal name="toggled" handler="on_rbtn_run_from_line_toggled" swapped="no"/>
+                                                    <signal name="toggled" handler="on_rbtn_run_from_line_toggled"/>
                                                   </object>
                                                   <packing>
                                                     <property name="expand">False</property>
@@ -5585,7 +4984,6 @@ jog buttons.</property>
                                         <child type="label">
                                           <object class="GtkLabel" id="lbl_frm_run_from_line">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">&lt;b&gt;Run from line&lt;/b&gt;</property>
                                             <property name="use_markup">True</property>
                                           </object>
@@ -5601,7 +4999,6 @@ jog buttons.</property>
                                     <child>
                                       <object class="GtkHButtonBox" id="hbuttonbox1">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
                                         <child>
                                           <object class="GtkToggleButton" id="tbtn_log_actions">
                                             <property name="label" translatable="yes">  Log
@@ -5612,8 +5009,7 @@ actions</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
                                             <property name="tooltip_text" translatable="yes">Log all actions to the history board, this is very usefull for debugging.</property>
-                                            <property name="use_action_appearance">False</property>
-                                            <signal name="toggled" handler="on_tbtn_log_actions_toggled" swapped="no"/>
+                                            <signal name="toggled" handler="on_tbtn_log_actions_toggled"/>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -5631,15 +5027,12 @@ actions</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="fill">True</property>
                                     <property name="padding">5</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
                                 <property name="padding">5</property>
                                 <property name="position">0</property>
                               </packing>
@@ -5652,7 +5045,6 @@ actions</property>
                         <child type="tab">
                           <object class="GtkLabel" id="lbl_ntb_setup_pages_advanced">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Advanced
  Settings</property>
                           </object>
@@ -5670,7 +5062,6 @@ actions</property>
                     <child type="tab">
                       <object class="GtkLabel" id="lbl_ntb_setup_settings">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Settings</property>
                       </object>
                       <packing>
@@ -5701,7 +5092,6 @@ actions</property>
                     <child type="tab">
                       <object class="GtkLabel" id="lbl_ntb_setup_alarm_history">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Alarm History</property>
                       </object>
                       <packing>
@@ -5717,7 +5107,6 @@ actions</property>
                 <child type="tab">
                   <object class="GtkLabel" id="lbl_ntb_main_settings">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Settings</property>
                   </object>
                   <packing>
@@ -5732,7 +5121,6 @@ actions</property>
                     <child>
                       <object class="GtkEventBox" id="eventbox1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -5741,7 +5129,6 @@ actions</property>
                     <child type="tab">
                       <object class="GtkLabel" id="lbl_ntb_user_tab">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">User tab 1</property>
                       </object>
                       <packing>
@@ -5756,7 +5143,6 @@ actions</property>
                 <child type="tab">
                   <object class="GtkLabel" id="lbl_user_tabs">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">User tabs</property>
                   </object>
                   <packing>
@@ -5766,22 +5152,18 @@ actions</property>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkHBox" id="box_right">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <placeholder/>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -5789,7 +5171,6 @@ actions</property>
               <object class="GtkVButtonBox" id="vbtb_main">
                 <property name="width_request">100</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="spacing">3</property>
                 <property name="homogeneous">True</property>
                 <property name="layout_style">spread</property>
@@ -5801,12 +5182,10 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Estop the machine</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="toggled" handler="on_tbtn_estop_toggled" swapped="no"/>
+                    <signal name="toggled" handler="on_tbtn_estop_toggled"/>
                     <child>
                       <object class="GtkImage" id="img_emergency">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/estopred.png</property>
                       </object>
                     </child>
@@ -5825,12 +5204,10 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Turn the machine on/off</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="toggled" handler="on_tbtn_on_toggled" swapped="no"/>
+                    <signal name="toggled" handler="on_tbtn_on_toggled"/>
                     <child>
                       <object class="GtkImage" id="img_machine_off">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/machine_off.png</property>
                       </object>
                     </child>
@@ -5849,12 +5226,11 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">enter manual mode to jog axis by hand or touch off</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_manual</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">False</property>
                     <property name="group">rbt_auto</property>
-                    <signal name="pressed" handler="on_rbt_manual_pressed" swapped="no"/>
+                    <signal name="pressed" handler="on_rbt_manual_pressed"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -5870,11 +5246,10 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">enter MDI mode to launch g-code commands</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_mdi</property>
                     <property name="draw_indicator">False</property>
                     <property name="group">rbt_auto</property>
-                    <signal name="pressed" handler="on_rbt_mdi_pressed" swapped="no"/>
+                    <signal name="pressed" handler="on_rbt_mdi_pressed"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -5890,10 +5265,9 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">enter auto mode to run programs</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_auto</property>
                     <property name="draw_indicator">False</property>
-                    <signal name="pressed" handler="on_rbt_auto_pressed" swapped="no"/>
+                    <signal name="pressed" handler="on_rbt_auto_pressed"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -5909,12 +5283,10 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Enter the settings page, the default code is "123"</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="toggled" handler="on_tbtn_setup_toggled" swapped="no"/>
+                    <signal name="toggled" handler="on_tbtn_setup_toggled"/>
                     <child>
                       <object class="GtkImage" id="img_settings">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/configure-2.png</property>
                       </object>
                     </child>
@@ -5933,9 +5305,8 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">show user tabs</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_user_tabs</property>
-                    <signal name="toggled" handler="on_tbtn_user_tabs_toggled" swapped="no"/>
+                    <signal name="toggled" handler="on_tbtn_user_tabs_toggled"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -5946,28 +5317,23 @@ actions</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">3</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkNotebook" id="ntb_button">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="show_tabs">False</property>
             <property name="show_border">False</property>
-            <signal name="switch-page" handler="on_ntb_button_switch_page" swapped="no"/>
+            <signal name="switch_page" handler="on_ntb_button_switch_page"/>
             <child>
               <object class="GtkHButtonBox" id="hbtb_main">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="btn_homing">
@@ -5977,9 +5343,8 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">open homing button list</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_ref_al</property>
-                    <signal name="clicked" handler="on_btn_homing_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_homing_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -5995,9 +5360,8 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">open touch off button list</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_touch_off</property>
-                    <signal name="clicked" handler="on_btn_touch_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_touch_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6010,7 +5374,6 @@ actions</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6026,13 +5389,11 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Open the tooleditor page</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image_position">top</property>
-                    <signal name="clicked" handler="on_btn_tool_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_tool_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_tools">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/tools.png</property>
                       </object>
                     </child>
@@ -6048,7 +5409,6 @@ actions</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6061,7 +5421,6 @@ actions</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6074,7 +5433,6 @@ actions</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6090,9 +5448,8 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">make the preview as large as possible</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_fullsize_preview</property>
-                    <signal name="toggled" handler="on_tbtn_fullsize_preview_toggled" swapped="no"/>
+                    <signal name="toggled" handler="on_tbtn_fullsize_preview_toggled"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6105,7 +5462,6 @@ actions</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6121,9 +5477,8 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Close moccapy / leave the program</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_close</property>
-                    <signal name="clicked" handler="on_btn_exit_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_exit_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6139,7 +5494,6 @@ actions</property>
             <child type="tab">
               <object class="GtkLabel" id="lbl_ntb_button_manuel">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label">manuel button list</property>
               </object>
               <packing>
@@ -6149,7 +5503,6 @@ actions</property>
             <child>
               <object class="GtkHButtonBox" id="hbtb_MDI">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="homogeneous">True</property>
                 <child>
                   <placeholder/>
@@ -6186,12 +5539,10 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">This button will show or hide the Keyboard</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_show_kbd_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_show_kbd_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_keyboard">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/keyboard.png</property>
                       </object>
                     </child>
@@ -6212,7 +5563,6 @@ actions</property>
             <child type="tab">
               <object class="GtkLabel" id="lbl_ntb_button_mdi">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label">MDI button list</property>
               </object>
               <packing>
@@ -6223,7 +5573,6 @@ actions</property>
             <child>
               <object class="GtkHButtonBox" id="hbtb_auto">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="btn_load">
@@ -6233,10 +5582,9 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Load a new program</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_open</property>
-                    <signal name="state-changed" handler="on_btn_load_state_changed" swapped="no"/>
-                    <signal name="clicked" handler="on_btn_load_clicked" swapped="no"/>
+                    <signal name="state_changed" handler="on_btn_load_state_changed"/>
+                    <signal name="clicked" handler="on_btn_load_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6252,9 +5600,8 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Run the loaded program</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_run</property>
-                    <signal name="clicked" handler="on_btn_run_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_run_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6272,7 +5619,7 @@ actions</property>
                     <property name="tooltip_text" translatable="yes">Stop the running program</property>
                     <property name="related_action">hal_action_stop</property>
                     <property name="image">img_stop</property>
-                    <signal name="clicked" handler="on_btn_stop_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_stop_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6289,13 +5636,12 @@ actions</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Pause the running program</property>
                     <property name="related_action">hal_tgl_pause</property>
-                    <signal name="toggled" handler="on_tbtn_pause_toggled" swapped="no"/>
+                    <signal name="toggled" handler="on_tbtn_pause_toggled"/>
                     <child>
                       <object class="GtkImage" id="img_pause">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">pause the running program</property>
                         <property name="pixbuf">images/pause.png</property>
                       </object>
@@ -6315,9 +5661,8 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Run the  loaded program step by step</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_step</property>
-                    <signal name="clicked" handler="on_btn_step_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_step_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6333,9 +5678,8 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">run the program from a certain line, attention, that is dangerous, because the previous lines will not checed!</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_run_from</property>
-                    <signal name="clicked" handler="on_btn_from_line_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_from_line_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6351,14 +5695,12 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Machine or not the optional blocks of the program. If the button is pressed, the optional blocks will not be machined. The button will indicate this by a yellow background.</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="toggled" handler="on_tbtn_optional_blocks_toggled" swapped="no"/>
+                    <signal name="toggled" handler="on_tbtn_optional_blocks_toggled"/>
                     <child>
                       <object class="GtkImage" id="img_optional_blocks">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/tool_blockdelete.gif</property>
                       </object>
                     </child>
@@ -6378,8 +5720,7 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Make optional stops or not. if an M1 is programed and the button is pressed (is active) the programm will pause if it found a M1</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="toggled" handler="on_tbtn_optional_stops_toggled" swapped="no"/>
+                    <signal name="toggled" handler="on_tbtn_optional_stops_toggled"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6394,9 +5735,8 @@ actions</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_fullsize_preview1</property>
-                    <signal name="toggled" handler="on_tbtn_fullsize_preview_toggled" swapped="no"/>
+                    <signal name="toggled" handler="on_tbtn_fullsize_preview_toggled"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6412,9 +5752,8 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Edit the loaded program</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_editor</property>
-                    <signal name="clicked" handler="on_btn_edit_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_edit_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6430,7 +5769,6 @@ actions</property>
             <child type="tab">
               <object class="GtkLabel" id="lbl_ntb_button_auto">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label">Auto button list</property>
               </object>
               <packing>
@@ -6441,14 +5779,12 @@ actions</property>
             <child>
               <object class="GtkHButtonBox" id="hbtb_ref">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkLabel" id="lbl_space_8">
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6464,14 +5800,12 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">home all axis</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_home_all_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_home_all_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_home_all">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/refall.png</property>
                       </object>
                     </child>
@@ -6487,7 +5821,6 @@ actions</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6503,14 +5836,12 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">home x axis</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_home_selected_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_home_selected_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_home_x">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/refx.png</property>
                       </object>
                     </child>
@@ -6529,14 +5860,12 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">home y axis</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_home_selected_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_home_selected_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_home_y">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/refy.png</property>
                       </object>
                     </child>
@@ -6548,9 +5877,7 @@ actions</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="lbl_replace_y">
-                    <property name="can_focus">False</property>
-                  </object>
+                  <object class="GtkLabel" id="lbl_replace_y"/>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -6565,14 +5892,12 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">home z axis</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_home_selected_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_home_selected_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_home_z">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/refz.png</property>
                       </object>
                     </child>
@@ -6589,14 +5914,12 @@ actions</property>
                     <property name="height_request">56</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_home_selected_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_home_selected_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_home_a">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/refa.png</property>
                       </object>
                     </child>
@@ -6612,7 +5935,6 @@ actions</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6628,14 +5950,12 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Unhome all axis</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_unhome_all_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_unhome_all_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_unhome_all">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/unhome.png</property>
                       </object>
                     </child>
@@ -6651,7 +5971,6 @@ actions</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6667,9 +5986,8 @@ actions</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">go back to main button list</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_back_ref</property>
-                    <signal name="clicked" handler="on_btn_back_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_back_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6684,7 +6002,6 @@ actions</property>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="lbl_btn_homing">
-                <property name="can_focus">False</property>
                 <property name="label">homing button</property>
               </object>
               <packing>
@@ -6695,7 +6012,6 @@ actions</property>
             <child>
               <object class="GtkHButtonBox" id="hbtb_touch_off">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkToggleButton" id="tbtn_edit_offsets">
@@ -6707,8 +6023,7 @@ offsets</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Edit offsets</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="toggled" handler="on_tbtn_edit_offsets_toggled" swapped="no"/>
+                    <signal name="toggled" handler="on_tbtn_edit_offsets_toggled"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6724,14 +6039,12 @@ offsets</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">touch off X / set X to 0</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_zero_x_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_zero_x_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_zero_x">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/touchoffx.png</property>
                       </object>
                     </child>
@@ -6750,14 +6063,12 @@ offsets</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">touch off Y / set Y to 0</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_zero_y_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_zero_y_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_zero_y">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/touchoffy.png</property>
                       </object>
                     </child>
@@ -6772,7 +6083,6 @@ offsets</property>
                   <object class="GtkLabel" id="lbl_replace_zero_y">
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6788,14 +6098,12 @@ offsets</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">touch off Z / set Z to 0</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_zero_z_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_zero_z_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_zero_z">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="tooltip_markup">touch off z / set z to 0</property>
                         <property name="pixbuf">images/touchoffz.png</property>
                       </object>
@@ -6816,8 +6124,7 @@ G92</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Zero all G92 offsets</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_zero_g92_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_zero_g92_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6832,8 +6139,7 @@ Height</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_block_height_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_block_height_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6849,14 +6155,12 @@ Height</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">touch off X / set X to an desired value</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_set_value_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_set_value_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_set_value_x">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/touchoffx_value.png</property>
                       </object>
                     </child>
@@ -6875,14 +6179,12 @@ Height</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">touch off Y / set Y to an desired value</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_set_value_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_set_value_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_set_value_y">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/touchoffy_value.png</property>
                       </object>
                     </child>
@@ -6897,7 +6199,6 @@ Height</property>
                   <object class="GtkLabel" id="lbl_replace_set_value_y">
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6913,14 +6214,12 @@ Height</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">touch off Z / set Z to an desired value</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_set_value_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_set_value_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_set_value_z">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/touchoffz_value.png</property>
                       </object>
                     </child>
@@ -6941,8 +6240,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">set the selected coordinate system to be the active one</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_set_selected_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_set_selected_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6958,9 +6256,8 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Go back to main view</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_back_zero</property>
-                    <signal name="clicked" handler="on_btn_back_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_back_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -6976,7 +6273,6 @@ selected</property>
             <child type="tab">
               <object class="GtkLabel" id="lbl_btn_touch_off">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label">touch_off button</property>
               </object>
               <packing>
@@ -6987,7 +6283,6 @@ selected</property>
             <child>
               <object class="GtkHButtonBox" id="hbtb_setup">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="btn_delete">
@@ -6998,8 +6293,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">delete MDI history</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_delete_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_delete_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7012,7 +6306,6 @@ selected</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7025,7 +6318,6 @@ selected</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="label">&lt;b&gt;gmoccapy
   1.0.3&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
@@ -7041,7 +6333,6 @@ selected</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7058,8 +6349,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Open classicladder</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_classicladder_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_classicladder_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7076,8 +6366,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">launch hal scope</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_hal_scope_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_hal_scope_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7094,8 +6383,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">launch linuxcnc status</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_status_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_status_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7112,9 +6400,8 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">launch hal meter</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="xalign">0.51999998092651367</property>
-                    <signal name="clicked" handler="on_btn_hal_meter_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_hal_meter_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7131,8 +6418,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">launch calibration</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_calibration_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_calibration_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7149,8 +6435,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">opens the show hal tool</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_show_hal_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_show_hal_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7166,7 +6451,6 @@ selected</property>
             <child type="tab">
               <object class="GtkLabel" id="lbl_ntb_button_setup">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label">setup button list</property>
               </object>
               <packing>
@@ -7177,7 +6461,6 @@ selected</property>
             <child>
               <object class="GtkHButtonBox" id="hbtb_edit">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="btn_save1">
@@ -7189,7 +6472,6 @@ selected</property>
                     <child>
                       <object class="GtkImage" id="img_save1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_name">view-refresh</property>
                       </object>
                     </child>
@@ -7205,7 +6487,6 @@ selected</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7223,7 +6504,6 @@ selected</property>
                     <child>
                       <object class="GtkImage" id="img_save">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_name">document-save</property>
                       </object>
                     </child>
@@ -7246,7 +6526,6 @@ selected</property>
                     <child>
                       <object class="GtkImage" id="img_save_as">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="icon_name">document-save-as</property>
                       </object>
                     </child>
@@ -7265,14 +6544,12 @@ selected</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">save the program reload it and run it</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_save_and_run_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_save_and_run_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_save_and_run">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="stock">gtk-media-play</property>
                       </object>
                     </child>
@@ -7288,7 +6565,6 @@ selected</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7304,14 +6580,12 @@ selected</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">clear the edit field and make a new file</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_new_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_new_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_new">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="stock">gtk-new</property>
                       </object>
                     </child>
@@ -7327,7 +6601,6 @@ selected</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7343,14 +6616,12 @@ selected</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Show or hide the virtual keyboard</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_show_kbd_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_show_kbd_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_keyboard2">
                         <property name="width_request">48</property>
                         <property name="height_request">48</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/keyboard.png</property>
                       </object>
                     </child>
@@ -7369,9 +6640,8 @@ selected</property>
                     <property name="can_focus">False</property>
                     <property name="receives_default">False</property>
                     <property name="tooltip_text" translatable="yes">Go back to main button list</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_back_zero1</property>
-                    <signal name="clicked" handler="on_btn_back_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_back_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7387,7 +6657,6 @@ selected</property>
             <child type="tab">
               <object class="GtkLabel" id="lbl_ntb_button_edit">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label">edit buttons</property>
               </object>
               <packing>
@@ -7398,7 +6667,6 @@ selected</property>
             <child>
               <object class="GtkHButtonBox" id="hbtb_tool">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="btn_delete_tool">
                     <property name="label" translatable="yes">Delete</property>
@@ -7408,8 +6676,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">delete selected tool or tools</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_delete_tool_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_delete_tool_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7426,8 +6693,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">add a new tool to tool table</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_add_tool_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_add_tool_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7444,8 +6710,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">reload tool table from file</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_reload_tooltable_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_reload_tooltable_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7462,8 +6727,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">apply the changes you made, G43 will be excecuted only if it is active g-code</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_apply_tool_changes_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_apply_tool_changes_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7479,12 +6743,10 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Select a tool by number</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_select_tool_by_no_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_select_tool_by_no_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_tool_by_no">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/tool_by_no.svg</property>
                       </object>
                     </child>
@@ -7503,12 +6765,10 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">change tool with the command M61 Q?, no machine move will be done</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_selected_tool_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_selected_tool_clicked"/>
                     <child>
                       <object class="GtkImage" id="img_index_tool">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="pixbuf">images/index_tool.svg</property>
                       </object>
                     </child>
@@ -7527,9 +6787,8 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">change tool to the selected one</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_toolchange</property>
-                    <signal name="clicked" handler="on_btn_selected_tool_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_selected_tool_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7548,8 +6807,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">touch off the tool and set the value to the tool table</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_tool_touchoff_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_tool_touchoff_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7562,7 +6820,6 @@ selected</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7581,8 +6838,7 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">touch off the tool and set the value to the tool table</property>
-                    <property name="use_action_appearance">False</property>
-                    <signal name="clicked" handler="on_btn_tool_touchoff_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_tool_touchoff_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7598,9 +6854,8 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Go back to main button list</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_back_tool</property>
-                    <signal name="clicked" handler="on_btn_back_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_back_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7616,7 +6871,6 @@ selected</property>
             <child type="tab">
               <object class="GtkLabel" id="lbl_ntb_button_tool">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label">tool</property>
               </object>
               <packing>
@@ -7627,7 +6881,6 @@ selected</property>
             <child>
               <object class="GtkHButtonBox" id="hbtb_load_file">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="homogeneous">True</property>
                 <child>
                   <object class="GtkButton" id="btn_home">
@@ -7637,9 +6890,8 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Move to your home directory</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_home</property>
-                    <signal name="clicked" handler="on_btn_home_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_home_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7655,9 +6907,8 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Move to parrent directory</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_dir_up</property>
-                    <signal name="clicked" handler="on_btn_dir_up_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_dir_up_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7670,7 +6921,6 @@ selected</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7686,10 +6936,9 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Select the previos file</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_sel_prev</property>
                     <property name="image_position">top</property>
-                    <signal name="clicked" handler="on_btn_sel_prev_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_sel_prev_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7705,10 +6954,9 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Select the next file</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_sel_next</property>
                     <property name="image_position">top</property>
-                    <signal name="clicked" handler="on_btn_sel_next_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_sel_next_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7724,10 +6972,9 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Jump to user defined directory</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_jump_to</property>
                     <property name="image_position">top</property>
-                    <signal name="clicked" handler="on_btn_jump_to_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_jump_to_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7740,7 +6987,6 @@ selected</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7756,10 +7002,9 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">select the highlighted file and return the path</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_select</property>
                     <property name="image_position">top</property>
-                    <signal name="clicked" handler="on_btn_select_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_select_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7772,7 +7017,6 @@ selected</property>
                     <property name="width_request">85</property>
                     <property name="height_request">56</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7788,9 +7032,8 @@ selected</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Close without returning a file path</property>
-                    <property name="use_action_appearance">False</property>
                     <property name="image">img_back_file_load</property>
-                    <signal name="clicked" handler="on_btn_back_clicked" swapped="no"/>
+                    <signal name="clicked" handler="on_btn_back_clicked"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -7806,7 +7049,6 @@ selected</property>
             <child type="tab">
               <object class="GtkLabel" id="lbl_ntb_button_load_file">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Load File</property>
               </object>
               <packing>
@@ -7825,4 +7067,6 @@ selected</property>
       </object>
     </child>
   </object>
+  <object class="EMC_Action_Stop" id="hal_action_stop"/>
+  <object class="EMC_ToggleAction_Pause" id="hal_tgl_pause"/>
 </interface>
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py
index e7a8b4f0b21..7aa12ad0577 100755
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.py
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py
@@ -84,7 +84,7 @@ def excepthook(exc_type, exc_obj, exc_tb):
 
 # constants
 #          # gmoccapy  #"
-_RELEASE = "   1.3.2"
+_RELEASE = " 1.3.5.1"
 _INCH = 0                           # imperial units are active
 _MM = 1                             # metric units are active
 _TEMPDIR = tempfile.gettempdir()    # Now we know where the tempdir is, usualy /tmp
@@ -191,6 +191,8 @@ def __init__(self):
         self.width = 979                # The width of the main Window
         self.height = 750               # The heigh of the main Window
 
+        self.gcodeerror = ""            # we need this to avoid multile messages of the same error
+
         # the default theme = System Theme we store here to be able to go back to that one later
         self.default_theme = gtk.settings_get_default().get_property("gtk-theme-name")
 
@@ -1050,9 +1052,9 @@ def _init_keyboard(self, args = "", x = "", y = ""):
             else:
                 print (_("**** GMOCCAPY ERROR ****"))
                 print (_("**** No virtual keyboard installed, we checked for <onboard> and <matchbox-keyboard>."))
+                self._no_virt_keyboard()
                 return
             sid = self.onboard_kb.stdout.readline()
-            # print"keyboard", sid # skip header line
             socket = gtk.Socket()
             socket.show()
             self.widgets.key_box.add(socket)
@@ -1063,7 +1065,9 @@ def _init_keyboard(self, args = "", x = "", y = ""):
             print (_("**** Error with launching virtual keyboard,"))
             print (_("**** is onboard or matchbox-keyboard installed? ****"))
             traceback.print_exc()
+            self._no_virt_keyboard()
 
+    def _no_virt_keyboard(self):
             # In this case we will disable the coresponding part on the settings page
             self.widgets.chk_use_kb_on_offset.set_active(False)
             self.widgets.chk_use_kb_on_tooledit.set_active(False)
@@ -1355,8 +1359,15 @@ def _show_error(self, error):
             else:
                 self.audio.set_sound(self.alert_sound)
             self.audio.run()
-#        self.halcomp["error"] = True
 
+    def on_gremlin_gcode_error(self, widget, errortext):
+        if self.gcodeerror == errortext:
+            return
+        else:
+            self.gcodeerror = errortext
+            print(errortext)
+            if self.log: self._add_alarm_entry(errortext)
+            dialogs.warning_dialog(self, _("Important Warning"), errortext)
 
 
 # =========================================================
@@ -3507,6 +3518,7 @@ def on_btn_load_clicked(self, widget, data = None):
         self._show_iconview_tab(True)
         self.widgets.IconFileSelection1.refresh_filelist()
         self.widgets.IconFileSelection1.iconView.grab_focus()
+        self.gcodeerror = ""
 
     def on_btn_sel_next_clicked(self, widget, data = None):
         self.widgets.IconFileSelection1.btn_sel_next.emit("clicked")
@@ -3568,6 +3580,7 @@ def on_btn_edit_clicked(self, widget, data = None):
             self.widgets.ntb_info.hide()
             self.widgets.box_info.set_size_request(-1, 50)
         self.widgets.tbl_search.show()
+        self.gcodeerror = ""
 
 # Search and replace handling in edit mode
     # undo changes while in edit mode
@@ -3636,6 +3649,9 @@ def on_btn_save_and_run_clicked(self, widget, data = None):
         else:
             self.widgets.btn_save.emit("clicked")
         self.widgets.hal_action_reload.emit("activate")
+        if self.gcodeerror:
+            self.on_btn_edit_clicked(None)
+            return
         self.widgets.ntb_button.set_current_page(2)
         self.widgets.btn_run.emit("clicked")
 
diff --git a/src/emc/usr_intf/gmoccapy/release_notes.txt b/src/emc/usr_intf/gmoccapy/release_notes.txt
index 37978c22f6d..ef6edf53979 100755
--- a/src/emc/usr_intf/gmoccapy/release_notes.txt
+++ b/src/emc/usr_intf/gmoccapy/release_notes.txt
@@ -1,3 +1,26 @@
+ver. 1.3.5.1
+- forgot to reset the gcode error, resulting in showing it only once,
+  it ws not shown again if a good file was loaded and than again the 
+  wrong one, now the load and edit button do reset the error code. 
+
+ver. 1.3.5
+- added the new signal from hal_gremlin to gmoccapy so we do get 
+  a message of gcode errors when loading a file and not only when
+  the interpreter does read the wrong line. A warning box will inform 
+  about the error details.
+
+ver. 1.3.4
+- if no virtual keyboard was installed (nor onboard or matchbox),
+  the checkboxes on the settings page has not been sensitized and the
+  settings has not been reseted correctly from the preference file
+  Thanks to Roland (concierge) for finding this one
+
+ver. 1.3.3
+- the combobox for the mouse button mode has not been initialized
+  correct, if it had the default value of the glade file. It is a 
+  bug in glade. The work around is not to set a default value in glade
+  but in the python code.
+
 ver. 1.3.2
 - fixed a small bug PAUSE button did not get active on M01
   Thanks to Rick (LAIR82) for pointing on it.