update probe basic

linuxcnc.var

@@ -7,9 +7,9 @@
 5167	0.000000
 5168	0.000000
 5169	0.000000
-5181	35.000000
+5181	0.000000
-5182	459.000000
+5182	0.000000
-5183	-0.000000
+5183	0.000000
 5184	0.000000
 5185	0.000000
 5186	0.000000
@@ -27,9 +27,9 @@
 5218	0.000000
 5219	0.000000
 5220	1.000000
-5221	300.000000
+5221	0.000000
-5222	150.000000
+5222	0.000000
-5223	-10.000000
+5223	0.000000
 5224	0.000000
 5225	0.000000
 5226	0.000000
@@ -47,9 +47,9 @@
 5248	0.000000
 5249	0.000000
 5250	0.000000
-5261	199.563000
+5261	0.000000
-5262	97.159000
+5262	0.000000
-5263	-30.157000
+5263	0.000000
 5264	0.000000
 5265	0.000000
 5266	0.000000

linuxcnc.var.bak

@@ -7,9 +7,9 @@
 5167	0.000000
 5168	0.000000
 5169	0.000000
-5181	35.000000
+5181	0.000000
-5182	459.000000
+5182	0.000000
-5183	-0.000000
+5183	0.000000
 5184	0.000000
 5185	0.000000
 5186	0.000000
@@ -27,9 +27,9 @@
 5218	0.000000
 5219	0.000000
 5220	1.000000
-5221	300.000000
+5221	0.000000
-5222	150.000000
+5222	0.000000
-5223	-10.000000
+5223	0.000000
 5224	0.000000
 5225	0.000000
 5226	0.000000
@@ -47,9 +47,9 @@
 5248	0.000000
 5249	0.000000
 5250	0.000000
-5261	199.563000
+5261	0.000000
-5262	97.159000
+5262	0.000000
-5263	-30.157000
+5263	0.000000
 5264	0.000000
 5265	0.000000
 5266	0.000000

probe_basic.var

@@ -1,210 +0,0 @@
-3000	0.000000
-3001	0.000000
-3002	0.000000
-3003	0.000000
-3004	0.000000
-3005	0.000000
-3006	0.000000
-3007	0.000000
-3008	0.000000
-3009	0.000000
-3010	0.000000
-3011	0.000000
-3012	0.000000
-3013	0.000000
-3014	0.000000
-3015	0.000000
-3016	0.000000
-3017	0.000000
-3018	0.000000
-3019	0.000000
-3020	0.000000
-3021	0.000000
-3022	0.000000
-3023	0.000000
-3024	0.000000
-3025	0.000000
-3026	0.000000
-3027	0.000000
-3028	0.000000
-3029	0.000000
-3030	0.000000
-3031	0.000000
-3032	0.000000
-3033	0.000000
-3034	0.000000
-3035	0.000000
-3036	0.000000
-3037	0.000000
-3038	0.000000
-3039	0.000000
-3050	0.000000
-3051	0.000000
-3052	0.000000
-3053	0.000000
-3054	0.000000
-3979	0.000000
-3980	6.000000
-3981	0.000000
-3982	0.000000
-3983	0.000000
-3984	0.000000
-3985	0.000000
-3986	0.000000
-3987	0.000000
-3988	0.000000
-3989	0.000000
-3990	0.000000
-3991	0.000000
-3992	0.000000
-3993	0.000000
-3994	0.000000
-3995	0.000000
-3996	0.000000
-3997	0.000000
-3998	0.000000
-3999	0.000000
-4000	0.000000
-4001	0.000000
-4002	0.000000
-4003	0.000000
-4004	0.000000
-4005	0.000000
-4006	0.000000
-4007	0.000000
-4008	0.000000
-4009	0.000000
-4010	0.000000
-4011	0.000000
-4012	0.000000
-4013	0.000000
-4014	0.000000
-4015	0.000000
-4016	0.000000
-4017	0.000000
-4018	0.000000
-4019	0.000000
-4020	0.000000
-4021	0.000000
-4022	0.000000
-4023	0.000000
-4024	0.000000
-5161	0.000000
-5162	0.000000
-5163	0.000000
-5164	0.000000
-5165	0.000000
-5166	0.000000
-5167	0.000000
-5168	0.000000
-5169	0.000000
-5181	0.000000
-5182	0.000000
-5183	0.000000
-5184	0.000000
-5185	0.000000
-5186	0.000000
-5187	0.000000
-5188	0.000000
-5189	0.000000
-5210	0.000000
-5211	0.000000
-5212	0.000000
-5213	0.000000
-5214	0.000000
-5215	0.000000
-5216	0.000000
-5217	0.000000
-5218	0.000000
-5219	0.000000
-5220	1.000000
-5221	0.000000
-5222	0.000000
-5223	0.000000
-5224	0.000000
-5225	0.000000
-5226	0.000000
-5227	0.000000
-5228	0.000000
-5229	0.000000
-5230	0.000000
-5241	0.000000
-5242	0.000000
-5243	0.000000
-5244	0.000000
-5245	0.000000
-5246	0.000000
-5247	0.000000
-5248	0.000000
-5249	0.000000
-5250	0.000000
-5261	0.000000
-5262	0.000000
-5263	0.000000
-5264	0.000000
-5265	0.000000
-5266	0.000000
-5267	0.000000
-5268	0.000000
-5269	0.000000
-5270	0.000000
-5281	0.000000
-5282	0.000000
-5283	0.000000
-5284	0.000000
-5285	0.000000
-5286	0.000000
-5287	0.000000
-5288	0.000000
-5289	0.000000
-5290	0.000000
-5301	0.000000
-5302	0.000000
-5303	0.000000
-5304	0.000000
-5305	0.000000
-5306	0.000000
-5307	0.000000
-5308	0.000000
-5309	0.000000
-5310	0.000000
-5321	0.000000
-5322	0.000000
-5323	0.000000
-5324	0.000000
-5325	0.000000
-5326	0.000000
-5327	0.000000
-5328	0.000000
-5329	0.000000
-5330	0.000000
-5341	0.000000
-5342	0.000000
-5343	0.000000
-5344	0.000000
-5345	0.000000
-5346	0.000000
-5347	0.000000
-5348	0.000000
-5349	0.000000
-5350	0.000000
-5361	0.000000
-5362	0.000000
-5363	0.000000
-5364	0.000000
-5365	0.000000
-5366	0.000000
-5367	0.000000
-5368	0.000000
-5369	0.000000
-5370	0.000000
-5381	0.000000
-5382	0.000000
-5383	0.000000
-5384	0.000000
-5385	0.000000
-5386	0.000000
-5387	0.000000
-5388	0.000000
-5389	0.000000
-5390	0.000000

python/stdglue.py

@@ -96,11 +96,19 @@ def prepare_epilog(self, **words):
 def change_prolog(self, **words):
     try:
         # this is relevant only when using iocontrol-v2.
-        if self.params[5600] > 0.0:
+        hard_fault_flag = 0.0
-            if self.params[5601] < 0.0:
+        hard_fault_code = 0.0
-                self.set_errormsg("Toolchanger hard fault %d" % (int(self.params[5601])))
+        try:
+            hard_fault_flag = float(self.params[5600])
+            hard_fault_code = float(self.params[5601])
+        except KeyError:
+            pass
+
+        if hard_fault_flag > 0.0:
+            if hard_fault_code < 0.0:
+                self.set_errormsg("Toolchanger hard fault %d" % (int(hard_fault_code)))
                 return INTERP_ERROR
-            print("change_prolog: Toolchanger soft fault %d" % int(self.params[5601]))
+            print("change_prolog: Toolchanger soft fault %d" % int(hard_fault_code))
 
         if self.selected_pocket < 0:
             self.set_errormsg("M6: no tool prepared")
@@ -125,11 +133,19 @@ def change_epilog(self, **words):
                              % (r.name,r.remap_ngc if r.remap_ngc else r.remap_py))
             yield INTERP_ERROR
         # this is relevant only when using iocontrol-v2.
-        if self.params[5600] > 0.0:
+        hard_fault_flag = 0.0
-            if self.params[5601] < 0.0:
+        hard_fault_code = 0.0
-                self.set_errormsg("Toolchanger hard fault %d" % (int(self.params[5601])))
+        try:
+            hard_fault_flag = float(self.params[5600])
+            hard_fault_code = float(self.params[5601])
+        except KeyError:
+            pass
+
+        if hard_fault_flag > 0.0:
+            if hard_fault_code < 0.0:
+                self.set_errormsg("Toolchanger hard fault %d" % (int(hard_fault_code)))
                 yield INTERP_ERROR
-            print("change_epilog: Toolchanger soft fault %d" % int(self.params[5601]))
+            print("change_epilog: Toolchanger soft fault %d" % int(hard_fault_code))
 
         if self.blocks[self.remap_level].builtin_used:
             #print "---------- M6 builtin recursion, nothing to do"

subroutines/go_to_home.ngc

@@ -5,16 +5,34 @@ G90
 G53 G0 Z0
 G53 G0 X0 Y0
 
-o100 if [EXISTS[#<_ini[traj]axes>]]
+#<has_a> = 0
-    #<geometry> = #<_ini[traj]axes>
+#<has_b> = 0
+#<has_c> = 0
+
+o100 if [EXISTS[#<_ini[axis_a]max_limit>]]
+    #<has_a> = 1
 o100 endif
 
-o110 if [#<geometry> EQ 4]
+o110 if [EXISTS[#<_ini[axis_b]max_limit>]]
-    G53 G0 A0
+    #<has_b> = 1
-o110 else if [#<geometry> EQ 5]
-    G53 G0 A0 C0
 o110 endif
 
+o120 if [EXISTS[#<_ini[axis_c]max_limit>]]
+    #<has_c> = 1
+o120 endif
+
+o130 if [[#<has_a> EQ 1] AND [#<has_c> EQ 1]]
+    G53 G0 A0 C0
+o130 else if [[#<has_b> EQ 1] AND [#<has_c> EQ 1]]
+    G53 G0 B0 C0
+o130 else if [#<has_a> EQ 1]
+    G53 G0 A0
+o130 else if [#<has_b> EQ 1]
+    G53 G0 B0
+o130 else if [#<has_c> EQ 1]
+    G53 G0 C0
+o130 endif
+
 o<go_to_home> endsub
 
 M2

subroutines/go_to_zero.ngc

@@ -5,16 +5,34 @@ G90
 G53 G0 Z0
 G0 X0 Y0
 
-o100 if [EXISTS[#<_ini[traj]axes>]]
+#<has_a> = 0
-    #<geometry> = #<_ini[traj]axes>
+#<has_b> = 0
+#<has_c> = 0
+
+o100 if [EXISTS[#<_ini[axis_a]max_limit>]]
+    #<has_a> = 1
 o100 endif
 
-o110 if [#<geometry> EQ 4]
+o110 if [EXISTS[#<_ini[axis_b]max_limit>]]
-    G0 A0
+    #<has_b> = 1
-o110 else if [#<geometry> EQ 5]
-    G0 A0 C0
 o110 endif
 
+o120 if [EXISTS[#<_ini[axis_c]max_limit>]]
+    #<has_c> = 1
+o120 endif
+
+o130 if [[#<has_a> EQ 1] AND [#<has_c> EQ 1]]
+    G0 A0 C0
+o130 else if [[#<has_b> EQ 1] AND [#<has_c> EQ 1]]
+    G0 B0 C0
+o130 else if [#<has_a> EQ 1]
+    G0 A0
+o130 else if [#<has_b> EQ 1]
+    G0 B0
+o130 else if [#<has_c> EQ 1]
+    G0 C0
+o130 endif
+
 o<go_to_zero> endsub
 
 M2

subroutines/load_spindle_safety.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.5)
+(version: 0.6)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (load tool in spindle safety macro)
 ; This is called form the ATC page
@@ -15,8 +15,7 @@ o<load_spindle_safety> sub
 #<load_spindle_tool_number> = #1 ; this is the value form the ATC tab
 #<probe_tool_number> = #3014
 
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
+; Update atc pocket count based on INI settings
-#<number_of_pockets> = 12
 o101 if [EXISTS[#<_ini[atc]pockets>]]
     #<number_of_pockets> = #<_ini[atc]pockets>
 o101 endif
@@ -26,12 +25,15 @@ o101 endif
 
 o110 while [#10 LT #<number_of_pockets>]
     #10 = [#10+1]
-    o120 if [#<load_spindle_tool_number> EQ #[4000 + #10]]
+    o111 if [#<load_spindle_tool_number> EQ #[4000 + #10]]
-        (DEBUG, the tool you are trying to load is already stored in carousel pocket %d#10)
         #11 = 1
-    o120 endif
+    o111 endif
 o110 endwhile
 
+o120 if [#11 EQ 1]
+    (abort, Tool %d#<load_spindle_tool_number> is already stored in carousel, not loading into spindle)
+o120 endif
+
 o130 if [#11 EQ 0]
     M61 Q#<load_spindle_tool_number> G43 H#<load_spindle_tool_number>
     #3991 = #<load_spindle_tool_number>

subroutines/load_spindle_safety_2.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (load tool in spindle safety macro)
 ; This is called form the Tool page
@@ -15,8 +15,7 @@ o<load_spindle_safety_2> sub
 #<load_spindle_tool_number_2> = #1 ; this is the value form the TOOL tab
 #<probe_tool_number> = #3014
 
-; default to a 12 pocket ATC (matching DynATC Widget behaviour), then update based on INI settings
+; Update atc pocket count based on INI settings
-#<number_of_pockets> = 12
 o101 if [EXISTS[#<_ini[atc]pockets>]]
     #<number_of_pockets> = #<_ini[atc]pockets>
 o101 endif
@@ -26,12 +25,15 @@ o101 endif
 
 o110 while [#10 LT #<number_of_pockets>]
     #10 = [#10+1]
-    o120 if [#<load_spindle_tool_number_2> EQ #[4000 + #10]]
+    o111 if [#<load_spindle_tool_number_2> EQ #[4000 + #10]]
-        (DEBUG, the tool you are trying to load is already stored in carousel pocket %d#10)
         #11 = 1
-    o120 endif
+    o111 endif
 o110 endwhile
 
+o120 if [#11 EQ 1]
+    (abort, Tool %d#<load_spindle_tool_number> is already stored in carousel, not loading into spindle)
+o120 endif
+
 o130 if [#11 EQ 0]
     M61 Q#<load_spindle_tool_number_2> G43 H#<load_spindle_tool_number_2>
     #3991 = #<load_spindle_tool_number_2>

subroutines/on_abort.ngc

@@ -1,9 +1,10 @@
-%
 o<on_abort> sub
 
-G90
+M5 (Spindle Stop)
-G40
+M9 (Coolant Off)
-G49
+M50 P1
+G90 (Absolute Positioning)
+G40 (Cancel Cutter Radius Compensation)
 
 o<on_abort> endsub
-%
+M2 (end program)

subroutines/probe_back_left_inside_corner.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe back left inside corner for x,y,z 0,0,0 position)
 (Start probe position is over back left inside corner of stock)
@@ -35,9 +35,7 @@ o<probe_back_left_inside_corner> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-    (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+    (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-    M50 P1
-   o<probe_back_left_inside_corner> return
   o100 endif
 
   (Probe Diameter)
@@ -69,9 +67,7 @@ o<probe_back_left_inside_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-    (DEBUG, Missing X Sub returned edge parameter, aborting)
+    (abort, Missing X Sub returned edge parameter, aborting)
-    M50 P1
-    o<probe_back_left_inside_corner> return
   o110 endif
 
   (move to X start Position)
@@ -89,9 +85,7 @@ o<probe_back_left_inside_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-    (DEBUG, Missing Y Sub returned edge parameter, aborting)
+    (abort, Missing Y Sub returned edge parameter, aborting)
-    M50 P1
-    o<probe_back_left_inside_corner> return
   o120 endif
 
   (move to Y start Position)

subroutines/probe_back_left_top_corner.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe back left top corner for x,y,z 0,0,0 position)
 (Start probe position is over back left corner of stock)
@@ -35,9 +35,7 @@ o<probe_back_left_top_corner> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_back_left_top_corner> return
   o100 endif
 
   (Probe Diameter)
@@ -65,9 +63,7 @@ o<probe_back_left_top_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_back_left_top_corner> return
   o110 endif
 
   (Probe Y Positioning Move, up to Z clearance plane)
@@ -90,9 +86,7 @@ o<probe_back_left_top_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_back_left_top_corner> return
   o120 endif
 
   (Probe Completion Move to Z Clearance Plane, and XY Zero)
@@ -110,8 +104,7 @@ o<probe_back_left_top_corner> sub
       G10 L2 P#5220 Y[#<y_minus_zero_edge> + #<workspace_y>]
   o130 endif
 
-  (Reinstate Feedrate Override)
+  M50 P1 (Reinstate Feedrate Override)
-  M50 P1
 
 o<probe_back_left_top_corner> endsub
 

subroutines/probe_back_right_inside_corner.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe back right inside corner for x,y,z 0,0,0 position)
 (Start probe position is over back right inside corner of stock)
@@ -35,9 +35,7 @@ o<probe_back_right_inside_corner> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_back_right_inside_corner> return
   o100 endif
 
   (Probe Diameter)
@@ -69,9 +67,7 @@ o<probe_back_right_inside_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_back_right_inside_corner> return
   o110 endif
 
   (move to X start Position)
@@ -89,9 +85,7 @@ o<probe_back_right_inside_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_back_right_inside_corner> return
   o120 endif
 
   (move to Y start Position)

subroutines/probe_back_right_top_corner.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe back right top corner for x,y,z 0,0,0 position)
 (Start probe position is over back right corner of stock)
@@ -35,9 +35,7 @@ o<probe_back_right_top_corner> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_back_right_top_corner> return
   o100 endif
 
   (Probe Diameter)
@@ -65,9 +63,7 @@ o<probe_back_right_top_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_back_right_top_corner> return
   o110 endif
 
   (Probe Y Positioning Move, up to Z clearance plane)
@@ -89,9 +85,7 @@ o<probe_back_right_top_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_back_right_top_corner> return
   o120 endif
 
   (Probe Completion Move to Z Clearance Plane, and XY Zero)

subroutines/probe_back_top_side.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.4)
+(version: 0.5)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe back top side for y,z 0,0 position)
 (Start probe position is over back edge of stock)
@@ -34,9 +34,7 @@ o<Probe_back_top_side> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<Probe_back_top_side> return
   o100 endif
 
   (Probe Diameter)
@@ -64,9 +62,7 @@ o<Probe_back_top_side> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_back_top_side> return
   o110 endif
 
   (Probe Completion Move to Z Clearance Plane, and Y Zero)

subroutines/probe_cal_reset.ngc

@@ -1,7 +1,6 @@
 o<probe_cal_reset> sub
 
   #3032 = 0
-  (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
 
 o<probe_cal_reset> endsub
 

subroutines/probe_cal_round_boss.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe calibration offset using defined diam round boss)
 (Start probe position is over center of stock in X and Y axis)
@@ -23,7 +23,9 @@ o<probe_cal_round_boss> sub
   #<step_off_width> = #3023       (=0.5000)
   #<probe_mode> = #3030           (=0)
   #<cal_diameter> = #3033         (=0)
-  #<sq_cal_axis> = #3036          (=0)
+  #<xy_cal_axis> = #3048          (=0)
+  #<x_cal_axis> = #3049           (=0)
+  #<y_cal_axis> = #3050           (=0)
 
   (Cancel G92 offsets)
   G92.1
@@ -37,13 +39,10 @@ o<probe_cal_round_boss> sub
   
   (clear current probe calibration offset)
   #3032 = 0
-  (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_cal_round_boss> return
   o100 endif
 
   (Probe Diameter)
@@ -298,17 +297,14 @@ o<probe_cal_round_boss> sub
       #<new_y_cal_offset> = [#<y_cal_error>]
   o140 endif
 
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
+  #<new_xy_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
 
-  o150 if [#<sq_cal_axis> EQ 0]
+  o150 if [#<xy_cal_axis> EQ 1]
-      #3032 = [ABS[#<new_avg_cal_offset>]]
+      #3032 = [ABS[#<new_xy_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
+  o150 else if [#<x_cal_axis> EQ 1]
-  o150 else if [#<sq_cal_axis> EQ 1]
       #3032 = [ABS[#<new_x_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
   o150 else
       #3032 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
   o150 endif
 
   #<x_zero> = [#<x_center_probed> + #<workspace_x>]

subroutines/probe_cal_round_pocket.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe calibration offset using defined diam round pocket)
 (Start probe position is over left side edge of pocket wall)
@@ -23,7 +23,9 @@ o<probe_cal_round_pocket> sub
   #<step_off_width> = #3023       (=0.5000)
   #<probe_mode> = #3030           (=0)
   #<cal_diameter> = #3033         (=0)
-  #<sq_cal_axis> = #3036          (=0)
+  #<xy_cal_axis> = #3048          (=0)
+  #<x_cal_axis> = #3049           (=0)
+  #<y_cal_axis> = #3050           (=0)
 
   (Cancel G92 offsets)
   G92.1
@@ -36,13 +38,10 @@ o<probe_cal_round_pocket> sub
 
   (clear current probe calibration offset)
   #3032 = 0
-  (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-       o<probe_cal_round_pocket> return
   o100 endif
 
   (Probe Diameter)
@@ -191,17 +190,14 @@ o<probe_cal_round_pocket> sub
       #<new_y_cal_offset> = [#<y_cal_error>]
   o120 endif
 
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
+  #<new_xy_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
 
-  o130 if [#<sq_cal_axis> EQ 0]
+  o130 if [#<xy_cal_axis> EQ 1]
-      #3032 = [ABS[#<new_avg_cal_offset>]]
+      #3032 = [ABS[#<new_xy_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
+  o130 else if [#<x_cal_axis> EQ 1]
-  o130 else if [#<sq_cal_axis> EQ 1]
       #3032 = [ABS[#<new_x_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
   o130 else
       #3032 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
   o130 endif
 
   #<x_zero> = [#<x_center_probed> + #<workspace_x>]

subroutines/probe_cal_square_boss.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe calibration offset using defined width square boss)
 (Start probe position is over center of stock in X and Y axis)
@@ -24,7 +24,9 @@ o<probe_cal_square_boss> sub
   #<probe_mode> = #3030           (=0)
   #<x_cal_width> = #3034          (=0)
   #<y_cal_width> = #3035          (=0)
-  #<sq_cal_axis> = #3036          (=0)
+  #<xy_cal_axis> = #3048          (=0)
+  #<x_cal_axis> = #3049           (=0)
+  #<y_cal_axis> = #3050           (=0)
 
   (Cancel G92 offsets)
   G92.1
@@ -38,13 +40,10 @@ o<probe_cal_square_boss> sub
 
   (clear current probe calibration offset)
   #3032 = 0
-  (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_cal_square_boss> return
   o100 endif
 
   (Probe Diameter)
@@ -192,17 +191,14 @@ o<probe_cal_square_boss> sub
       #<new_y_cal_offset> = [#<y_cal_error>]
   o120 endif
 
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
+  #<new_xy_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
 
-  o130 if [#<sq_cal_axis> EQ 0]
+  o130 if [#<xy_cal_axis> EQ 1]
-      #3032 = [ABS[#<new_avg_cal_offset>]]
+      #3032 = [ABS[#<new_xy_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
+  o130 else if [#<x_cal_axis> EQ 1]
-  o130 else if [#<sq_cal_axis> EQ 1]
       #3032 = [ABS[#<new_x_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
   o130 else
       #3032 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
   o130 endif
 
   #<x_zero> = [#<x_center_probed> + #<workspace_x>]

subroutines/probe_cal_square_pocket.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe calibration offset using defined width square pocket)
 (Start probe position is over left side edge of pocket wall)
@@ -25,7 +25,9 @@ o<probe_cal_square_pocket> sub
   #<probe_mode> = #3030           (=0)
   #<x_cal_width> = #3034          (=0)
   #<y_cal_width> = #3035          (=0)
-  #<sq_cal_axis> = #3036          (=0)
+  #<xy_cal_axis> = #3048          (=0)
+  #<x_cal_axis> = #3049           (=0)
+  #<y_cal_axis> = #3050           (=0)
 
   (Cancel G92 offsets)
   G92.1
@@ -38,13 +40,10 @@ o<probe_cal_square_pocket> sub
 
   (clear current probe calibration offset)
   #3032 = 0
-  (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_cal_square_pocket> return
   o100 endif
 
   (Probe Diameter)
@@ -147,17 +146,14 @@ o<probe_cal_square_pocket> sub
       #<new_y_cal_offset> = [#<y_cal_error>]
   o120 endif
 
-  #<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
+  #<new_xy_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
 
-  o130 if [#<sq_cal_axis> EQ 0]
+  o130 if [#<xy_cal_axis> EQ 1]
-      #3032 = [ABS[#<new_avg_cal_offset>]]
+      #3032 = [ABS[#<new_xy_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
+  o130 else if [#<x_cal_axis> EQ 1]
-  o130 else if [#<sq_cal_axis> EQ 1]
       #3032 = [ABS[#<new_x_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
   o130 else
       #3032 = [ABS[#<new_y_cal_offset>]]
-      (DEBUG, EVAL[vcp.getWidget{"calibration_offset_3032"}.setValue{#3032}])
   o130 endif
 
   #<x_zero> = [#<x_center_probed> + #<workspace_x>]

subroutines/probe_corner_x_minus_edge_angle.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe Corner X minus Edge Angle for x,y,z 0,0,0 position)
 (Start probe position is over front right corner of stock)
@@ -40,9 +40,7 @@ o<probe_corner_x_minus_edge_angle> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_corner_x_minus_edge_angle> return
   o100 endif
 
   (Probe Diameter)
@@ -76,9 +74,7 @@ o<probe_corner_x_minus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_x_minus_edge_angle> return
   o110 endif
 
   (Probe Y Positioning Move, up to Z clearance plane)
@@ -103,9 +99,7 @@ o<probe_corner_x_minus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_x_minus_edge_angle> return
   o120 endif
 
   (edge width move to edge second probing point)
@@ -122,9 +116,7 @@ o<probe_corner_x_minus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o130 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_x_minus_edge_angle> return
   o130 endif
 
   #<edge_delta> = [#<p2x> - #<p3x>]

subroutines/probe_corner_x_plus_edge_angle.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe Corner X plus Edge Angle for x,y,z 0,0,0 position)
 (Start probe position is over back left corner of stock)
@@ -40,9 +40,7 @@ o<probe_corner_x_plus_edge_angle> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-     (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-     o<probe_corner_x_plus_edge_angle> return
   o100 endif
 
   (Probe Diameter)
@@ -76,9 +74,7 @@ o<probe_corner_x_plus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_x_plus_edge_angle> return
   o110 endif
 
   (Probe Y Positioning Move, up to Z clearance plane)
@@ -103,9 +99,7 @@ o<probe_corner_x_plus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_x_plus_edge_angle> return
   o120 endif
 
   (edge width move to edge second probing point)
@@ -122,9 +116,7 @@ o<probe_corner_x_plus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o130 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_x_plus_edge_angle> return
   o130 endif
 
   #<edge_delta> = [#<p3x> - #<p2x>]

subroutines/probe_corner_y_minus_edge_angle.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe Corner Y minus Edge Angle for x,y,z 0,0,0 position)
 (Start probe position is over back right corner of stock)
@@ -40,9 +40,7 @@ o<probe_corner_y_minus_edge_angle> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_corner_y_minus_edge_angle> return
   o100 endif
 
   (Probe Diameter)
@@ -76,9 +74,7 @@ o<probe_corner_y_minus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_y_minus_edge_angle> return
   o110 endif
 
   (Probe Y Positioning Move, up to Z clearance plane)
@@ -103,9 +99,7 @@ o<probe_corner_y_minus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_y_minus_edge_angle> return
   o120 endif
 
   (edge width move to edge second probing point)
@@ -122,9 +116,7 @@ o<probe_corner_y_minus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o130 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_y_minus_edge_angle> return
   o130 endif
 
   #<edge_delta> = [#<p2y> - #<p3y>]

subroutines/probe_corner_y_plus_edge_angle.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe Corner Y Plus Edge Angle for x,y,z 0,0,0 position)
 (Start probe position is over front left corner of stock)
@@ -40,9 +40,7 @@ o<probe_corner_y_plus_edge_angle> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_corner_y_plus_edge_angle> return
   o100 endif
 
   (Probe Diameter)
@@ -76,9 +74,7 @@ o<probe_corner_y_plus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_y_plus_edge_angle> return
   o110 endif
 
   (Probe Y Positioning Move, up to Z clearance plane)
@@ -103,9 +99,7 @@ o<probe_corner_y_plus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_y_plus_edge_angle> return
   o120 endif
 
   (edge width move to edge second probing point)
@@ -122,9 +116,7 @@ o<probe_corner_y_plus_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o130 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_corner_y_plus_edge_angle> return
   o130 endif
 
   #<edge_delta> = [#<p3y> - #<p2y>]

subroutines/probe_front_left_inside_corner.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe front left inside corner for x,y,z 0,0,0 position)
 (Start probe position is over front left inside corner of stock)
@@ -36,9 +36,7 @@ o<probe_front_left_inside_corner> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_front_left_inside_corner> return
   o100 endif
 
   (Probe Diameter)
@@ -70,9 +68,7 @@ o<probe_front_left_inside_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_front_left_inside_corner> return
   o110 endif
 
   (move to X start Position)
@@ -90,9 +86,7 @@ o<probe_front_left_inside_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_front_left_inside_corner> return
   o120 endif
 
   (move to Y start Position)

subroutines/probe_front_left_top_corner.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.5)
+(version: 0.6)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe front left top corner for x,y,z 0,0,0 position)
 (Start probe position is over front left corner of stock)
@@ -36,9 +36,7 @@ o<probe_front_left_top_corner> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_front_left_top_corner> return
   o100 endif
 
   (Probe Diameter)
@@ -66,9 +64,7 @@ o<probe_front_left_top_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_front_left_top_corner> return
   o110 endif
 
   (Probe Y Positioning Move, up to Z clearance plane)
@@ -91,9 +87,7 @@ o<probe_front_left_top_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_front_left_top_corner> return
   o120 endif
 
   (Probe Completion Move to Z Clearance Plane, and XY Zero)

subroutines/probe_front_right_inside_corner.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe front right inside corner for x,y,z 0,0,0 position)
 (Start probe position is over front right inside corner of stock)
@@ -36,9 +36,7 @@ o<probe_front_right_inside_corner> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_front_right_inside_corner> return
   o100 endif
 
   (Probe Diameter)
@@ -70,9 +68,7 @@ o<probe_front_right_inside_corner> sub
 
  (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_front_right_inside_corner> return
   o110 endif
 
   (move to X start Position)
@@ -90,9 +86,7 @@ o<probe_front_right_inside_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_front_right_inside_corner> return
   o120 endif
 
   (move to Y start Position)

subroutines/probe_front_right_top_corner.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe front right top corner for x,y,z 0,0,0 position)
 (Start probe position is over front right corner of stock)
@@ -37,9 +37,7 @@ o<probe_front_right_top_corner> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_front_right_top_corner> return
   o100 endif
 
   (Probe Diameter)
@@ -67,9 +65,7 @@ o<probe_front_right_top_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_front_right_top_corner> return
   o110 endif
 
   (Probe Y Positioning Move, up to Z clearance plane)
@@ -92,9 +88,7 @@ o<probe_front_right_top_corner> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_front_right_top_corner> return
   o120 endif
 
   (Probe Completion Move to Z Clearance Plane, and XY Zero)

subroutines/probe_front_top_side.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.5)
+(version: 0.6)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe front top side for y,z 0,0 position)
 (Start probe position is over front edge of stock)
@@ -35,9 +35,7 @@ o<Probe_front_top_side> sub
 
     (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<Probe_front_top_side> return
   o100 endif
 
   (Probe Diameter)
@@ -65,9 +63,7 @@ o<Probe_front_top_side> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_front_top_side> return
   o110 endif
 
   (Probe Completion Move to Z Clearance Plane, and Y Zero)

subroutines/probe_left_top_side.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.4)
+(version: 0.5)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe left top side for x,z 0,0 position)
 (Start probe position is over left side edge of stock)
@@ -35,9 +35,7 @@ o<Probe_left_top_side> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<Probe_left_top_side> return
   o100 endif
 
   (Probe Diameter)
@@ -65,9 +63,7 @@ o<Probe_left_top_side> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_left_top_side> return
   o110 endif
 
   (Probe Completion Move to Z Clearance Plane, and Y Zero)

subroutines/probe_rect_boss.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe Boss in X and Y Axes, find center and z 0 position)
 (Start probe position is over center of stock in X and Y axis)
@@ -39,9 +39,7 @@ o<probe_rect_boss> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_rect_boss> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_rect_pocket.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe rect pocket center measure x and widths, find xy center position)
 (Start probe position is over left side edge of pocket wall)
@@ -38,9 +38,7 @@ o<probe_rect_pocket> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_rect_pocket> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_rect_pocket_center_start.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe rect pocket center measure x and y widths, find xy center position)
 (Start probe position is rough center of pocket probe tip below top edge)
@@ -37,9 +37,7 @@ o<probe_rect_pocket_center_start> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_rect_pocket_center_start> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_ridge_x.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe Ridge in X Axis to find center and z 0 position)
 (Start probe position is over center of stock in the X axis)
@@ -38,9 +38,7 @@ o<probe_ridge_x> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_ridge_x> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_ridge_y.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe Ridge in Y Axis to find center and z 0 position)
 (Start probe position is over center of stock in the Y axis)
@@ -37,9 +37,7 @@ o<probe_ridge_y> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_ridge_y> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_right_top_side.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.4)
+(version: 0.5)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe right top side for x,z 0,0 position)
 (Start probe position is over right side edge of stock)
@@ -34,9 +34,7 @@ o<Probe_right_top_side> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<Probe_right_top_side> return
   o100 endif
 
   (Probe Diameter)
@@ -64,9 +62,7 @@ o<Probe_right_top_side> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_right_top_side> return
   o110 endif
 
   (Probe Completion Move to Z Clearance Plane, and Y Zero)

subroutines/probe_round_boss.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe Boss in X and Y Axes, find center, Diam and z 0 position)
 (Start probe position is over center of stock in X and Y axis)
@@ -37,9 +37,7 @@ o<probe_round_boss> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_round_boss> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_round_pocket.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe round pocket center measure x and y Diam, find xy center position)
 (Start probe position is over left side edge of pocket wall)
@@ -36,9 +36,7 @@ o<probe_round_pocket> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_round_pocket> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_round_pocket_center_start.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe round pocket center start measure x and y Diam, find xy center position)
 (Start probe position is rough center of pocket a safe distance below top edge)
@@ -36,9 +36,7 @@ o<probe_round_pocket_center_start> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_round_pocket_center_start> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_spindle_nose.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.0)
+(version: 0.1)
-(date: 12/26/24)
+(date: 01/28/26)
 
 (Probe Spindle Nose in Z Minus direction over tool setter and set Spindle Zero Distance)
 (Start probe position is over toolsetter platter within max z distance)
@@ -19,6 +19,8 @@ o<probe_spindle_nose> sub
 
   (Cancel G92 offsets)
   G92.1
+  (Cancel Feedrate Override)
+  M50 P0
 
   o100 if [2 EQ 2]
     G49
@@ -38,8 +40,7 @@ o<probe_spindle_nose> sub
       G90
       G1 F[#<probe_traverse_fr>] Z#<z>
       F[#<probe_fast_fr>]
-      (return from sub)
+      (abort, probe event failed to record point data, aborting)
-      o<probe_spindle_nose> return
   o110 endif
 
   (Move up retract_distance height for slow probe)
@@ -72,6 +73,8 @@ o<probe_spindle_nose> sub
 
   G53 G0 Z0.0
 
+  M50 P1 (Reinstate Feedrate Override)
+
 o<probe_spindle_nose> endsub
 
 M2 (end program)

subroutines/probe_top_back_edge_angle.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.4)
+(version: 0.5)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe back top edge angle for y,z 0,0 position and edge angle)
 (Start probe position is over back edge of stock, set edge width,)
@@ -39,9 +39,7 @@ o<probe_top_back_edge_angle> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_top_back_edge_angle> return
   o100 endif
 
   (Probe Diameter)
@@ -71,9 +69,7 @@ o<probe_top_back_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_top_back_edge_angle> return
   o110 endif
 
   (edge width move to edge second probing point)
@@ -88,9 +84,7 @@ o<probe_top_back_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_top_back_edge_angle> return
   o120 endif
 
   #<edge_delta> = [#<y_minus_zero_edge_start> - #<y_minus_zero_edge_end>]

subroutines/probe_top_front_edge_angle.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.5)
+(version: 0.6)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe top front edge angle for y,z 0,0 position and edge angle)
 (Start probe position is over front edge of stock, set edge width,)
@@ -39,9 +39,7 @@ o<probe_top_front_edge_angle> sub
 
     (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_top_front_edge_angle> return
   o100 endif
 
   (Probe Diameter)
@@ -71,9 +69,7 @@ o<probe_top_front_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_top_front_edge_angle> return
   o110 endif
 
   (edge width move to edge second probing point)
@@ -88,9 +84,7 @@ o<probe_top_front_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing Y Sub returned edge parameter, aborting)
+      (abort, Missing Y Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_top_front_edge_angle> return
   o120 endif
 
   #<edge_delta> = [#<y_plus_zero_edge_end> - #<y_plus_zero_edge_start>]

subroutines/probe_top_left_edge_angle.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.4)
+(version: 0.5)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe top left edge angle for y,z 0,0 position and edge angle)
 (Start probe position is over left edge of stock, set edge width,)
@@ -39,9 +39,7 @@ o<probe_top_left_edge_angle> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_top_left_edge_angle> return
   o100 endif
 
   (Probe Diameter)
@@ -71,9 +69,7 @@ o<probe_top_left_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_top_left_edge_angle> return
   o110 endif
 
   (edge width move to edge second probing point)
@@ -88,9 +84,7 @@ o<probe_top_left_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_top_left_edge_angle> return
   o120 endif
 
   #<edge_delta> = [#<x_plus_zero_edge_end> - #<x_plus_zero_edge_start>]

subroutines/probe_top_right_edge_angle.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.4)
+(version: 0.5)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe top right edge angle for y,z 0,0 position and edge angle)
 (Start probe position is over right edge of stock, set edge width,)
@@ -39,9 +39,7 @@ o<probe_top_right_edge_angle> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_top_right_edge_angle> return
   o100 endif
 
   (Probe Diameter)
@@ -71,9 +69,7 @@ o<probe_top_right_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o110 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_top_right_edge_angle> return
   o110 endif
 
   (edge width move to edge second probing point)
@@ -88,9 +84,7 @@ o<probe_top_right_edge_angle> sub
 
   (value returned safety check, aborts if no value returned)
   o120 if [#<probe_mode> EQ 1 AND #<_value_returned> NE 1]
-      (DEBUG, Missing X Sub returned edge parameter, aborting)
+      (abort, Missing X Sub returned edge parameter, aborting)
-      M50 P1
-      o<probe_top_right_edge_angle> return
   o120 endif
 
   #<edge_delta> = [#<x_minus_zero_edge_start> - #<x_minus_zero_edge_end>]

subroutines/probe_valley_x.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe valley in x, find Z0, X0 valley center position)
 (Start probe position is over left side edge of valley wall)
@@ -37,9 +37,7 @@ o<probe_valley_x> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_valley_x> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_valley_x_center_start.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe valley in x, find X zero valley center position)
 (Start probe position is centered between valley walls)
@@ -36,9 +36,7 @@ o<probe_valley_x_center_start> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_valley_x_center_start> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_valley_y.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe valley in Y, find Z0, Y0 valley center position)
 (Start probe position is over back side edge of valley wall)
@@ -37,9 +37,7 @@ o<probe_valley_y> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_valley_y> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_valley_y_center_start.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe valley in Y find Y0 valley center position)
 (Start probe position is rough center between valley walls)
@@ -36,9 +36,7 @@ o<probe_valley_y_center_start> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_valley_y_center_start> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_x_minus.ngc

@@ -24,8 +24,7 @@ o<probe_x_minus> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      o<probe_x_minus> return
   o100 endif
 
   (Probe Diameter)
@@ -52,8 +51,7 @@ o<probe_x_minus> sub
       G90
       G1 F[#<probe_traverse_fr>] X#<x>
       F[#<probe_fast_fr>]
-      (return from sub)
+      (abort, Probe event did not record point data, aborting)
-      o<probe_x_minus> return
   o110 endif
 
   (Move to xy_clearance distance for slow probe)

subroutines/probe_x_minus_wco.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe X Minus direction and set X 0 in current WCO)
 (Start probe position to the right side edge of stock)
@@ -34,9 +34,7 @@ o<probe_x_minus_wco> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_x_minus_wco> return
   o100 endif
 
   (Probe Diameter)

subroutines/probe_x_plus.ngc

@@ -24,8 +24,7 @@ o<probe_x_plus> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      o<probe_x_plus> return
   o100 endif
 
   (Probe Diameter)
@@ -52,8 +51,7 @@ o<probe_x_plus> sub
       G90
       G1 F[#<probe_traverse_fr>] X#<x>
       F[#<probe_fast_fr>]
-      (return from sub)
+      (abort, Probe event did not record point data, aborting)
-      o<probe_x_plus> return
   o110 endif
 
   (Move to xy_clearance distance for slow probe)

subroutines/probe_x_plus_wco.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe X plus direction and set X 0 in current WCO)
 (Start probe position to the left side edge of stock)
@@ -34,9 +34,7 @@ o<probe_x_plus_wco> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_x_plus_wco> return
   o100 endif
 
   (Probe Diameter)
@@ -63,8 +61,7 @@ o<probe_x_plus_wco> sub
       G90
       G1 F[#<probe_traverse_fr>] X#<x>
       F[#<probe_fast_fr>]
-      M50 P1
+      (abort, Probe event did not record point data, aborting)
-      o<probe_x_plus_wco> return
   o110 endif
 
   (Move to xy_clearance distance for slow probe)

subroutines/probe_y_minus.ngc

@@ -24,8 +24,7 @@ o<probe_y_minus> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      o<probe_y_minus> return
   o100 endif
 
   (Probe Diameter)
@@ -52,8 +51,7 @@ o<probe_y_minus> sub
       G90
       G1 F[#<probe_traverse_fr>] Y#<y>
       F[#<probe_fast_fr>]
-      (return from sub)
+      (abort, Probe event did not record point data, aborting)
-      o<probe_y_minus> return
   o110 endif
 
   (Move to xy_clearance distance for slow probe)

subroutines/probe_y_minus_wco.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe Y Minus direction and set Y 0 in current WCO)
 (Start probe position to the back side edge of stock)
@@ -34,9 +34,7 @@ o<probe_y_minus_wco> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_y_minus_wco> return
   o100 endif
 
   (Probe Diameter)
@@ -63,8 +61,7 @@ o<probe_y_minus_wco> sub
       G90
       G1 F[#<probe_traverse_fr>] Y#<y>
       F[#<probe_fast_fr>]
-      M50 P1
+      (abort, Probe event did not record point data, aborting)
-      o<probe_y_minus_wco> return
   o110 endif
 
   (Move to xy_clearance distance for slow probe)

subroutines/probe_y_plus.ngc

@@ -24,8 +24,7 @@ o<probe_y_plus> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      o<probe_y_plus> return
   o100 endif
 
   (Probe Diameter)
@@ -52,8 +51,7 @@ o<probe_y_plus> sub
       G90
       G1 F[#<probe_traverse_fr>] Y#<y>
       F[#<probe_fast_fr>]
-      (return from sub)
+      (abort, Probe event did not record point data, aborting)
-      o<probe_y_plus> return
   o110 endif
 
   (Move to xy_clearance distance for slow probe)

subroutines/probe_y_plus_wco.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 (Probe Y plus direction and set Y 0 in current WCO)
 (Start probe position to the front side edge of stock)
@@ -34,9 +34,7 @@ o<probe_y_plus_wco> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_y_plus_wco> return
   o100 endif
 
   (Probe Diameter)
@@ -63,8 +61,7 @@ o<probe_y_plus_wco> sub
       G90
       G1 F[#<probe_traverse_fr>] Y#<y>
       F[#<probe_fast_fr>]
-      M50 P1
+      (abort, Probe event did not record point data, aborting)
-      o<probe_y_plus_wco> return
   o110 endif
 
   (Move to xy_clearance distance for slow probe)

subroutines/probe_z_minus_sub.ngc

@@ -25,8 +25,7 @@ o<probe_z_minus_sub> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      o<probe_z_minus_sub> return
   o100 endif
 
   (Current Z Position including offsets in current program units)
@@ -44,8 +43,7 @@ o<probe_z_minus_sub> sub
       G90
       G1 F[#<probe_traverse_fr>] Z#<z>
       F[#<probe_fast_fr>]
-      (return from sub)
+      (abort, Probe event did not record point data, aborting)
-      o<probe_z_minus_sub> return
   o110 endif
 
   (Move to z_clearance height for slow probe)
@@ -76,7 +74,6 @@ o<probe_z_minus_sub> sub
   o130 if [#<probe_mode> EQ 0]
       (Record Z zero in selected WCO)
       G10 L2 P#5220 Z[#<z_minus_probed> + #<workspace_z>]
-      o<probe_z_minus_sub> return
   o130 endif
 
 o<probe_z_minus_sub> endsub [#<z_finish_height>]

subroutines/probe_z_minus_wco.ngc

@@ -28,9 +28,7 @@ o<probe_z_minus_wco> sub
 
   (Probe Tool Safety Check)
   o100 if [#5400 NE #<probe_tool_number>]
-      (DEBUG, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
+      (abort, Specified probe tool %d#<probe_tool_number> not in spindle, aborting)
-      M50 P1
-      o<probe_z_minus_wco> return
   o100 endif
 
   (Current Z Position including offsets in current program units)
@@ -48,9 +46,7 @@ o<probe_z_minus_wco> sub
       G90
       G1 F[#<probe_traverse_fr>] Z#<z>
       F[#<probe_fast_fr>]
-      (return from sub)
+      (abort, Probe event did not record point data, aborting)
-      M50 P1
-      o<probe_z_minus_wco> return
   o110 endif
 
   (Move to z_clearance height for slow probe)

subroutines/rack_id_calc.ngc

@@ -130,7 +130,7 @@ o<rack_id_calc> sub
     
   o130 endif
 
-  (MSG, "Error: No Conditions Met, Rack ID Not Set")
+  (DEBUG, "Error: No Conditions Met, Rack ID Not Set")
   #3979 = 0
   (DEBUG, EVAL[vcp.getWidget{"atc_rack_id"}.setValue{#3979}])
 

subroutines/retractatc.ngc

@@ -3,7 +3,7 @@ o<retractatc> sub
 M65 P0 ; Turn off carousel out solenoid
 M64 P1 ; Move Carousel IN
 
-M66 P0 L3 Q5 ; check carousel in position sensor
+M66 P0 L3 Q4 ; check carousel in position sensor
 o100 if [#5399 LT 0]
     M65 P1 ; turn off the solenoid to send atc home
     (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds

subroutines/set_g30_position.ngc

@@ -6,13 +6,10 @@ o100 if [1 EQ 1]
 o100 endif
 
 #1000 = #5181
-(DEBUG, EVAL[vcp.getWidget{"x_tool_change_position"}.setValue{#1000}])
 
 #1001 = #5182
-(DEBUG, EVAL[vcp.getWidget{"y_tool_change_position"}.setValue{#1001}])
 
 #1002 = #5183
-(DEBUG, EVAL[vcp.getWidget{"z_tool_change_position"}.setValue{#1002}])
 
 o<set_g30_position> endsub
 

subroutines/surface_test.ngc

@@ -1,5 +1,5 @@
 o<surface_test> sub
-  ;(MSG, SURFACE_TEST.NGC)
+  ;(DEBUG, SURFACE_TEST.NGC)
   M64 P0  (turn off compensation)
   ;T1 M6 (Install probe)
   #<x0> = #3050 ;(debug, x0: [#<x0>])

subroutines/tool_touch_off.ngc

@@ -72,12 +72,12 @@ o120 endif
 o130 if [#5070 EQ 1]    (verify probe event was succesful)
     #<z_slow_probe> = #5063    (save slow probe result to parameters)
 o130 else
-    (DEBUG,Tool Length Offset Probe Failed)
+    (abort,Tool Length Offset Probe Failed)
 o130 endif
 
 (Tool Diameter Probe Mode Section, User must define this section as needed)
 o140 if [#<tool_diameter_probe_mode> EQ 1]
-    (DEBUG, Tool Diameter Probing is Not Defined in Subroutine)
+    (abort, Tool Diameter Probing requires end-user custom subroutine programming, see tool_touch_off.ngc file line 80 to add your customized macro code)
 o140 endif
 
 o150 if [3 EQ 3]

subroutines/toolchange.ngc

@@ -1,6 +1,6 @@
 (author: Chris P)
-(version: 0.2)
+(version: 0.3)
-(date: 06/27/24)
+(date: 01/28/26)
 
 o<toolchange> sub
 
@@ -30,6 +30,7 @@ o110 endif
 o120 if [EXISTS[#<_ini[atc]z_tool_change_height>]]
     #<atc_z_tool_change_height> = #<_ini[atc]z_tool_change_height>
 o120 endif
+
 #<atc_z_tool_clearance_height> = [#<_ini[AXIS_Z]MAX_LIMIT>-0.01]
 o130 if [EXISTS[#<_ini[atc]z_tool_clearance_height>]]
     #<atc_z_tool_clearance_height> = #<_ini[atc]z_tool_clearance_height>
@@ -70,6 +71,7 @@ o160 do
     o162 endif
     #130 = [#130 - 1]
 o160 while [#130 GT 0]
+
 o170 if [#<next_pocket> EQ 0] ; if tool is not found, aborts and sends a message
     (abort, Tool T%d#<selected_tool> not found in carousel)
 o170 endif
@@ -105,7 +107,6 @@ o190 if [#<selected_tool> GT 0] ; selected tool is not tool0
         (abort, Failed to send carousel home) ; abort if the sensor does not activate in 5 seconds
     o191 endif
     M65 P0
-
     (DEBUG, EVAL[vcp.getWidget{"dynatc"}.store_tool{#<next_pocket>, 0}])
     M22 ; Carousel out
     #150 = #<next_pocket>

subroutines/toolsetter_wco.ngc

@@ -54,9 +54,7 @@ o<toolsetter_wco> sub
     G90
     G1 F[#<traverse_fr>] Z#<z>
     F[#<probe_fast_fr>]
-    (return from sub)
+    (abort, Probe event did not record point data, aborting)
-    M50 P1
-    o<toolsetter_wco> return
   o110 endif
 
   (Move to z_clearance height for slow probe)

user_atc_buttons/template_user_atc_buttons/template_user_atc_buttons.py

@@ -1,12 +1,12 @@
 import os
 import linuxcnc
 
-from qtpy import uic
+from PySide6.QtCore import Qt
-from qtpy.QtCore import Qt
+from PySide6.QtWidgets import QWidget
-from qtpy.QtWidgets import QWidget
 
 from qtpyvcp.plugins import getPlugin
 from qtpyvcp.utilities import logger
+import template_user_atc_buttons_ui
 
 LOG = logger.getLogger(__name__)
 
@@ -19,5 +19,5 @@ INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME'))
 class UserAtcButton(QWidget):
     def __init__(self, parent=None):
         super(UserAtcButton, self).__init__(parent)
-        ui_file = os.path.splitext(os.path.basename(__file__))[0] + ".ui"
+        self.ui = template_user_atc_buttons_ui.Ui_USER_ATC_BUTTONS()
-        uic.loadUi(os.path.join(os.path.dirname(__file__), ui_file), self)
+        self.ui.setupUi(self)

user_atc_buttons/template_user_atc_buttons/template_user_atc_buttons.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>299</width>
+    <width>300</width>
-    <height>508</height>
+    <height>478</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -20,7 +20,7 @@
    <string>User Atc Buttons</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -89,7 +89,7 @@
          <number>15</number>
         </property>
         <property name="sizeConstraint">
-         <enum>QLayout::SetFixedSize</enum>
+         <enum>QLayout::SizeConstraint::SetFixedSize</enum>
         </property>
         <property name="leftMargin">
          <number>2</number>
@@ -130,7 +130,7 @@
            <bool>false</bool>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="toolTip">
            <string>M11P1 User Defined Macro Call from Subroutine Folder</string>
@@ -140,7 +140,7 @@
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-    font: 15pt &quot;Bebas Kai&quot;;
+    font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -182,17 +182,17 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="toolTip">
            <string>M12 P1 User Defined Macro Call from Subroutine Folder</string>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::RightToLeft</enum>
+           <enum>Qt::LayoutDirection::RightToLeft</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-    font: 15pt &quot;Bebas Kai&quot;;
+    font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -221,7 +221,7 @@
          <number>15</number>
         </property>
         <property name="sizeConstraint">
-         <enum>QLayout::SetFixedSize</enum>
+         <enum>QLayout::SizeConstraint::SetFixedSize</enum>
         </property>
         <property name="leftMargin">
          <number>2</number>
@@ -256,7 +256,7 @@
            </size>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">SubCallButton {
@@ -266,7 +266,7 @@
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -322,7 +322,7 @@ SubCallButton:pressed {
            </size>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::RightToLeft</enum>
+           <enum>Qt::LayoutDirection::RightToLeft</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">SubCallButton {
@@ -332,7 +332,7 @@ SubCallButton:pressed {
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -414,7 +414,7 @@ SubCallButton:pressed {
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -470,7 +470,7 @@ SubCallButton:pressed {
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -545,7 +545,7 @@ SubCallButton:pressed {
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -594,17 +594,17 @@ SubCallButton:pressed {
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="toolTip">
            <string>M112 User Defined Macro Call from Subroutine Folder</string>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::RightToLeft</enum>
+           <enum>Qt::LayoutDirection::RightToLeft</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-    font: 15pt &quot;Bebas Kai&quot;;
+    font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -668,7 +668,7 @@ SubCallButton:pressed {
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -740,7 +740,7 @@ SubCallButton:pressed {
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -767,19 +767,6 @@ SubCallButton:pressed {
         </item>
        </layout>
       </item>
-      <item>
-       <widget class="QLabel" name="label_20">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_119">
         <property name="spacing">
@@ -818,14 +805,14 @@ SubCallButton:pressed {
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="toolTip">
            <string>M13 User Defined Macro Call from Subroutine Folder</string>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-    font: 15pt &quot;Bebas Kai&quot;;
+    font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">

user_atc_buttons/template_user_atc_buttons/template_user_atc_buttons_ui.py

@@ -1,118 +1,128 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/buildbot/buildbot/worker/probe_basic-dev/sources/debian/python3-probe-basic/usr/share/configs/machine_setup_files/user_atc_buttons/template_user_atc_buttons/template_user_atc_buttons.ui'
+################################################################################
-#
+## Form generated from reading UI file 'template_user_atc_buttons.ui'
-# Created by: PyQt5 UI code generator 5.15.9
+##
-#
+## Created by: Qt User Interface Compiler version 6.8.2
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+##
-# run again.  Do not edit this file unless you know what you are doing.
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
 
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+    QFont, QFontDatabase, QGradient, QIcon,
+    QImage, QKeySequence, QLinearGradient, QPainter,
+    QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QApplication, QHBoxLayout, QLayout, QSizePolicy,
+    QVBoxLayout, QWidget)
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qtpyvcp.widgets.button_widgets.mdi_button import MDIButton
-
+from qtpyvcp.widgets.button_widgets.subcall_button import SubCallButton
+import probe_basic_rc
 
 class Ui_USER_ATC_BUTTONS(object):
     def setupUi(self, USER_ATC_BUTTONS):
-        USER_ATC_BUTTONS.setObjectName("USER_ATC_BUTTONS")
+        if not USER_ATC_BUTTONS.objectName():
-        USER_ATC_BUTTONS.resize(299, 508)
+            USER_ATC_BUTTONS.setObjectName(u"USER_ATC_BUTTONS")
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        USER_ATC_BUTTONS.resize(300, 478)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(USER_ATC_BUTTONS.sizePolicy().hasHeightForWidth())
         USER_ATC_BUTTONS.setSizePolicy(sizePolicy)
-        USER_ATC_BUTTONS.setLayoutDirection(QtCore.Qt.LeftToRight)
+        USER_ATC_BUTTONS.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
-        self.verticalLayout = QtWidgets.QVBoxLayout(USER_ATC_BUTTONS)
+        self.verticalLayout = QVBoxLayout(USER_ATC_BUTTONS)
-        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout.setSpacing(0)
-        self.verticalLayout.setObjectName("verticalLayout")
+        self.verticalLayout.setObjectName(u"verticalLayout")
-        self.widget_64 = QtWidgets.QWidget(USER_ATC_BUTTONS)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        self.widget_64 = QWidget(USER_ATC_BUTTONS)
-        sizePolicy.setHorizontalStretch(0)
+        self.widget_64.setObjectName(u"widget_64")
-        sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.widget_64.sizePolicy().hasHeightForWidth())
         self.widget_64.setSizePolicy(sizePolicy)
-        self.widget_64.setMinimumSize(QtCore.QSize(300, 0))
+        self.widget_64.setMinimumSize(QSize(300, 0))
-        self.widget_64.setMaximumSize(QtCore.QSize(300, 16777215))
+        self.widget_64.setMaximumSize(QSize(300, 16777215))
-        self.widget_64.setStyleSheet(".QWidget {\n"
+        self.widget_64.setStyleSheet(u".QWidget {\n"
 "    background-color: rgb(51, 57, 59);\n"
 "    border-style: solid;\n"
 "    border-color: rgb(186, 189, 182);\n"
 "    border-width: 2px;\n"
 "    border-radius: 6px;\n"
 "}")
-        self.widget_64.setObjectName("widget_64")
+        self.verticalLayout_66 = QVBoxLayout(self.widget_64)
-        self.verticalLayout_66 = QtWidgets.QVBoxLayout(self.widget_64)
-        self.verticalLayout_66.setContentsMargins(20, 18, 20, 21)
         self.verticalLayout_66.setSpacing(16)
-        self.verticalLayout_66.setObjectName("verticalLayout_66")
+        self.verticalLayout_66.setObjectName(u"verticalLayout_66")
-        self.horizontalLayout_115 = QtWidgets.QHBoxLayout()
+        self.verticalLayout_66.setContentsMargins(20, 18, 20, 21)
-        self.horizontalLayout_115.setSizeConstraint(QtWidgets.QLayout.SetFixedSize)
+        self.horizontalLayout_115 = QHBoxLayout()
-        self.horizontalLayout_115.setContentsMargins(2, 2, 2, 2)
         self.horizontalLayout_115.setSpacing(15)
-        self.horizontalLayout_115.setObjectName("horizontalLayout_115")
+        self.horizontalLayout_115.setObjectName(u"horizontalLayout_115")
+        self.horizontalLayout_115.setSizeConstraint(QLayout.SizeConstraint.SetFixedSize)
+        self.horizontalLayout_115.setContentsMargins(2, 2, 2, 2)
         self.atc_rev_button = MDIButton(self.widget_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.atc_rev_button.setObjectName(u"atc_rev_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy1.setHorizontalStretch(1)
-        sizePolicy.setHeightForWidth(self.atc_rev_button.sizePolicy().hasHeightForWidth())
+        sizePolicy1.setVerticalStretch(0)
-        self.atc_rev_button.setSizePolicy(sizePolicy)
+        sizePolicy1.setHeightForWidth(self.atc_rev_button.sizePolicy().hasHeightForWidth())
-        self.atc_rev_button.setMinimumSize(QtCore.QSize(120, 45))
+        self.atc_rev_button.setSizePolicy(sizePolicy1)
-        self.atc_rev_button.setMaximumSize(QtCore.QSize(16777215, 45))
+        self.atc_rev_button.setMinimumSize(QSize(120, 45))
+        self.atc_rev_button.setMaximumSize(QSize(16777215, 45))
         self.atc_rev_button.setMouseTracking(True)
         self.atc_rev_button.setTabletTracking(False)
-        self.atc_rev_button.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.atc_rev_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
         self.atc_rev_button.setToolTipDuration(-1)
-        self.atc_rev_button.setStyleSheet("MDIButton {\n"
+        self.atc_rev_button.setStyleSheet(u"MDIButton {\n"
-"    font: 15pt \"Bebas Kai\";\n"
+"    font: 15pt \"Probe Basic Bebas Mono\";\n"
 "}")
-        icon = QtGui.QIcon()
+        icon = QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/images/ccw_arrow.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addFile(u":/images/ccw_arrow.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.atc_rev_button.setIcon(icon)
-        self.atc_rev_button.setIconSize(QtCore.QSize(20, 20))
+        self.atc_rev_button.setIconSize(QSize(20, 20))
-        self.atc_rev_button.setObjectName("atc_rev_button")
+
         self.horizontalLayout_115.addWidget(self.atc_rev_button)
+
         self.atc_fwd_button = MDIButton(self.widget_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.atc_fwd_button.setObjectName(u"atc_fwd_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy1.setHeightForWidth(self.atc_fwd_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.atc_fwd_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.atc_fwd_button.sizePolicy().hasHeightForWidth())
+        self.atc_fwd_button.setMinimumSize(QSize(120, 45))
-        self.atc_fwd_button.setSizePolicy(sizePolicy)
+        self.atc_fwd_button.setMaximumSize(QSize(16777215, 45))
-        self.atc_fwd_button.setMinimumSize(QtCore.QSize(120, 45))
+        self.atc_fwd_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-        self.atc_fwd_button.setMaximumSize(QtCore.QSize(16777215, 45))
+        self.atc_fwd_button.setLayoutDirection(Qt.LayoutDirection.RightToLeft)
-        self.atc_fwd_button.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.atc_fwd_button.setStyleSheet(u"MDIButton {\n"
-        self.atc_fwd_button.setLayoutDirection(QtCore.Qt.RightToLeft)
+"    font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.atc_fwd_button.setStyleSheet("MDIButton {\n"
-"    font: 15pt \"Bebas Kai\";\n"
 "}")
-        icon1 = QtGui.QIcon()
+        icon1 = QIcon()
-        icon1.addPixmap(QtGui.QPixmap(":/images/cw_arrow.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon1.addFile(u":/images/cw_arrow.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.atc_fwd_button.setIcon(icon1)
-        self.atc_fwd_button.setIconSize(QtCore.QSize(20, 20))
+        self.atc_fwd_button.setIconSize(QSize(20, 20))
-        self.atc_fwd_button.setObjectName("atc_fwd_button")
+
         self.horizontalLayout_115.addWidget(self.atc_fwd_button)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_115)
-        self.horizontalLayout_116 = QtWidgets.QHBoxLayout()
+
-        self.horizontalLayout_116.setSizeConstraint(QtWidgets.QLayout.SetFixedSize)
+        self.horizontalLayout_116 = QHBoxLayout()
-        self.horizontalLayout_116.setContentsMargins(2, 2, 2, 2)
         self.horizontalLayout_116.setSpacing(15)
-        self.horizontalLayout_116.setObjectName("horizontalLayout_116")
+        self.horizontalLayout_116.setObjectName(u"horizontalLayout_116")
+        self.horizontalLayout_116.setSizeConstraint(QLayout.SizeConstraint.SetFixedSize)
+        self.horizontalLayout_116.setContentsMargins(2, 2, 2, 2)
         self.atc_retract_button = SubCallButton(self.widget_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.atc_retract_button.setObjectName(u"atc_retract_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy1.setHeightForWidth(self.atc_retract_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.atc_retract_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.atc_retract_button.sizePolicy().hasHeightForWidth())
+        self.atc_retract_button.setMinimumSize(QSize(120, 45))
-        self.atc_retract_button.setSizePolicy(sizePolicy)
+        self.atc_retract_button.setMaximumSize(QSize(16777215, 45))
-        self.atc_retract_button.setMinimumSize(QtCore.QSize(120, 45))
+        self.atc_retract_button.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
-        self.atc_retract_button.setMaximumSize(QtCore.QSize(16777215, 45))
+        self.atc_retract_button.setStyleSheet(u"SubCallButton {\n"
-        self.atc_retract_button.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.atc_retract_button.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -128,29 +138,28 @@ class Ui_USER_ATC_BUTTONS(object):
 "    background:  qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(85, 85, 238, 255), stop:0.544974 rgba(90, 91, 239, 255), stop:1 rgba(126, 135, 243, 255));\n"
 "}\n"
 "")
-        icon2 = QtGui.QIcon()
+        icon2 = QIcon()
-        icon2.addPixmap(QtGui.QPixmap(":/images/left_arrow.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon2.addFile(u":/images/left_arrow.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.atc_retract_button.setIcon(icon2)
-        self.atc_retract_button.setIconSize(QtCore.QSize(20, 20))
+        self.atc_retract_button.setIconSize(QSize(20, 20))
-        self.atc_retract_button.setObjectName("atc_retract_button")
+
         self.horizontalLayout_116.addWidget(self.atc_retract_button)
+
         self.atc_extend_button = SubCallButton(self.widget_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.atc_extend_button.setObjectName(u"atc_extend_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy1.setHeightForWidth(self.atc_extend_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.atc_extend_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.atc_extend_button.sizePolicy().hasHeightForWidth())
+        self.atc_extend_button.setMinimumSize(QSize(120, 45))
-        self.atc_extend_button.setSizePolicy(sizePolicy)
+        self.atc_extend_button.setMaximumSize(QSize(16777215, 45))
-        self.atc_extend_button.setMinimumSize(QtCore.QSize(120, 45))
+        self.atc_extend_button.setLayoutDirection(Qt.LayoutDirection.RightToLeft)
-        self.atc_extend_button.setMaximumSize(QtCore.QSize(16777215, 45))
+        self.atc_extend_button.setStyleSheet(u"SubCallButton {\n"
-        self.atc_extend_button.setLayoutDirection(QtCore.Qt.RightToLeft)
-        self.atc_extend_button.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -166,33 +175,34 @@ class Ui_USER_ATC_BUTTONS(object):
 "    background:  qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(85, 85, 238, 255), stop:0.544974 rgba(90, 91, 239, 255), stop:1 rgba(126, 135, 243, 255));\n"
 "}\n"
 "")
-        icon3 = QtGui.QIcon()
+        icon3 = QIcon()
-        icon3.addPixmap(QtGui.QPixmap(":/images/right_arrow.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon3.addFile(u":/images/right_arrow.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         self.atc_extend_button.setIcon(icon3)
-        self.atc_extend_button.setIconSize(QtCore.QSize(20, 20))
+        self.atc_extend_button.setIconSize(QSize(20, 20))
-        self.atc_extend_button.setObjectName("atc_extend_button")
+
         self.horizontalLayout_116.addWidget(self.atc_extend_button)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_116)
-        self.horizontalLayout_117 = QtWidgets.QHBoxLayout()
+
-        self.horizontalLayout_117.setContentsMargins(2, 2, 2, 2)
+        self.horizontalLayout_117 = QHBoxLayout()
         self.horizontalLayout_117.setSpacing(15)
-        self.horizontalLayout_117.setObjectName("horizontalLayout_117")
+        self.horizontalLayout_117.setObjectName(u"horizontalLayout_117")
+        self.horizontalLayout_117.setContentsMargins(2, 2, 2, 2)
         self.clamp_tool_button = SubCallButton(self.widget_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.clamp_tool_button.setObjectName(u"clamp_tool_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy1.setHeightForWidth(self.clamp_tool_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.clamp_tool_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.clamp_tool_button.sizePolicy().hasHeightForWidth())
+        self.clamp_tool_button.setMinimumSize(QSize(120, 45))
-        self.clamp_tool_button.setSizePolicy(sizePolicy)
+        self.clamp_tool_button.setMaximumSize(QSize(16777215, 45))
-        self.clamp_tool_button.setMinimumSize(QtCore.QSize(120, 45))
+        self.clamp_tool_button.setStyleSheet(u"SubCallButton {\n"
-        self.clamp_tool_button.setMaximumSize(QtCore.QSize(16777215, 45))
-        self.clamp_tool_button.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -208,25 +218,24 @@ class Ui_USER_ATC_BUTTONS(object):
 "    background:  qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(85, 85, 238, 255), stop:0.544974 rgba(90, 91, 239, 255), stop:1 rgba(126, 135, 243, 255));\n"
 "}\n"
 "")
-        self.clamp_tool_button.setObjectName("clamp_tool_button")
+
         self.horizontalLayout_117.addWidget(self.clamp_tool_button)
+
         self.release_tool_button = SubCallButton(self.widget_64)
+        self.release_tool_button.setObjectName(u"release_tool_button")
         self.release_tool_button.setEnabled(True)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy1.setHeightForWidth(self.release_tool_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setHorizontalStretch(1)
+        self.release_tool_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setVerticalStretch(0)
+        self.release_tool_button.setMinimumSize(QSize(120, 45))
-        sizePolicy.setHeightForWidth(self.release_tool_button.sizePolicy().hasHeightForWidth())
+        self.release_tool_button.setMaximumSize(QSize(16777215, 45))
-        self.release_tool_button.setSizePolicy(sizePolicy)
+        self.release_tool_button.setStyleSheet(u"SubCallButton {\n"
-        self.release_tool_button.setMinimumSize(QtCore.QSize(120, 45))
-        self.release_tool_button.setMaximumSize(QtCore.QSize(16777215, 45))
-        self.release_tool_button.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -242,29 +251,30 @@ class Ui_USER_ATC_BUTTONS(object):
 "    background:  qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(85, 85, 238, 255), stop:0.544974 rgba(90, 91, 239, 255), stop:1 rgba(126, 135, 243, 255));\n"
 "}\n"
 "")
-        self.release_tool_button.setObjectName("release_tool_button")
+
         self.horizontalLayout_117.addWidget(self.release_tool_button)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_117)
-        self.horizontalLayout_152 = QtWidgets.QHBoxLayout()
+
-        self.horizontalLayout_152.setContentsMargins(2, 2, 2, 2)
+        self.horizontalLayout_152 = QHBoxLayout()
         self.horizontalLayout_152.setSpacing(15)
-        self.horizontalLayout_152.setObjectName("horizontalLayout_152")
+        self.horizontalLayout_152.setObjectName(u"horizontalLayout_152")
+        self.horizontalLayout_152.setContentsMargins(2, 2, 2, 2)
         self.spindle_orientation = SubCallButton(self.widget_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.spindle_orientation.setObjectName(u"spindle_orientation")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy1.setHeightForWidth(self.spindle_orientation.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.spindle_orientation.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.spindle_orientation.sizePolicy().hasHeightForWidth())
+        self.spindle_orientation.setMinimumSize(QSize(120, 45))
-        self.spindle_orientation.setSizePolicy(sizePolicy)
+        self.spindle_orientation.setMaximumSize(QSize(16777215, 45))
-        self.spindle_orientation.setMinimumSize(QtCore.QSize(120, 45))
+        self.spindle_orientation.setStyleSheet(u"SubCallButton {\n"
-        self.spindle_orientation.setMaximumSize(QtCore.QSize(16777215, 45))
-        self.spindle_orientation.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -281,45 +291,45 @@ class Ui_USER_ATC_BUTTONS(object):
 "}\n"
 "")
         self.spindle_orientation.setCheckable(True)
-        self.spindle_orientation.setObjectName("spindle_orientation")
+
         self.horizontalLayout_152.addWidget(self.spindle_orientation)
+
         self.unlock_spindle = MDIButton(self.widget_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.unlock_spindle.setObjectName(u"unlock_spindle")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy1.setHeightForWidth(self.unlock_spindle.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.unlock_spindle.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.unlock_spindle.sizePolicy().hasHeightForWidth())
+        self.unlock_spindle.setMinimumSize(QSize(120, 45))
-        self.unlock_spindle.setSizePolicy(sizePolicy)
+        self.unlock_spindle.setMaximumSize(QSize(16777215, 45))
-        self.unlock_spindle.setMinimumSize(QtCore.QSize(120, 45))
+        self.unlock_spindle.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-        self.unlock_spindle.setMaximumSize(QtCore.QSize(16777215, 45))
+        self.unlock_spindle.setLayoutDirection(Qt.LayoutDirection.RightToLeft)
-        self.unlock_spindle.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.unlock_spindle.setStyleSheet(u"MDIButton {\n"
-        self.unlock_spindle.setLayoutDirection(QtCore.Qt.RightToLeft)
+"    font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.unlock_spindle.setStyleSheet("MDIButton {\n"
-"    font: 15pt \"Bebas Kai\";\n"
 "}")
-        self.unlock_spindle.setIconSize(QtCore.QSize(20, 20))
+        self.unlock_spindle.setIconSize(QSize(20, 20))
-        self.unlock_spindle.setObjectName("unlock_spindle")
+
         self.horizontalLayout_152.addWidget(self.unlock_spindle)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_152)
-        self.horizontalLayout_174 = QtWidgets.QHBoxLayout()
+
-        self.horizontalLayout_174.setContentsMargins(2, 2, 2, 2)
+        self.horizontalLayout_174 = QHBoxLayout()
         self.horizontalLayout_174.setSpacing(15)
-        self.horizontalLayout_174.setObjectName("horizontalLayout_174")
+        self.horizontalLayout_174.setObjectName(u"horizontalLayout_174")
+        self.horizontalLayout_174.setContentsMargins(2, 2, 2, 2)
         self.move_head_above_carousel_button = SubCallButton(self.widget_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.move_head_above_carousel_button.setObjectName(u"move_head_above_carousel_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy1.setHeightForWidth(self.move_head_above_carousel_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.move_head_above_carousel_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.move_head_above_carousel_button.sizePolicy().hasHeightForWidth())
+        self.move_head_above_carousel_button.setMinimumSize(QSize(120, 45))
-        self.move_head_above_carousel_button.setSizePolicy(sizePolicy)
+        self.move_head_above_carousel_button.setMaximumSize(QSize(16777215, 45))
-        self.move_head_above_carousel_button.setMinimumSize(QtCore.QSize(120, 45))
+        self.move_head_above_carousel_button.setStyleSheet(u"SubCallButton {\n"
-        self.move_head_above_carousel_button.setMaximumSize(QtCore.QSize(16777215, 45))
-        self.move_head_above_carousel_button.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -335,29 +345,30 @@ class Ui_USER_ATC_BUTTONS(object):
 "    background:  qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(85, 85, 238, 255), stop:0.544974 rgba(90, 91, 239, 255), stop:1 rgba(126, 135, 243, 255));\n"
 "}\n"
 "")
-        self.move_head_above_carousel_button.setObjectName("move_head_above_carousel_button")
+
         self.horizontalLayout_174.addWidget(self.move_head_above_carousel_button)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_174)
-        self.horizontalLayout_118 = QtWidgets.QHBoxLayout()
+
-        self.horizontalLayout_118.setContentsMargins(2, 2, 2, 2)
+        self.horizontalLayout_118 = QHBoxLayout()
         self.horizontalLayout_118.setSpacing(15)
-        self.horizontalLayout_118.setObjectName("horizontalLayout_118")
+        self.horizontalLayout_118.setObjectName(u"horizontalLayout_118")
+        self.horizontalLayout_118.setContentsMargins(2, 2, 2, 2)
         self.move_tool_to_carousel_height_button = SubCallButton(self.widget_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.move_tool_to_carousel_height_button.setObjectName(u"move_tool_to_carousel_height_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy1.setHeightForWidth(self.move_tool_to_carousel_height_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.move_tool_to_carousel_height_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.move_tool_to_carousel_height_button.sizePolicy().hasHeightForWidth())
+        self.move_tool_to_carousel_height_button.setMinimumSize(QSize(120, 45))
-        self.move_tool_to_carousel_height_button.setSizePolicy(sizePolicy)
+        self.move_tool_to_carousel_height_button.setMaximumSize(QSize(16777215, 45))
-        self.move_tool_to_carousel_height_button.setMinimumSize(QtCore.QSize(120, 45))
+        self.move_tool_to_carousel_height_button.setStyleSheet(u"SubCallButton {\n"
-        self.move_tool_to_carousel_height_button.setMaximumSize(QtCore.QSize(16777215, 45))
-        self.move_tool_to_carousel_height_button.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -373,73 +384,78 @@ class Ui_USER_ATC_BUTTONS(object):
 "    background:  qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(85, 85, 238, 255), stop:0.544974 rgba(90, 91, 239, 255), stop:1 rgba(126, 135, 243, 255));\n"
 "}\n"
 "")
-        self.move_tool_to_carousel_height_button.setObjectName("move_tool_to_carousel_height_button")
+
         self.horizontalLayout_118.addWidget(self.move_tool_to_carousel_height_button)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_118)
-        self.label_20 = QtWidgets.QLabel(self.widget_64)
+
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        self.horizontalLayout_119 = QHBoxLayout()
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_20.sizePolicy().hasHeightForWidth())
-        self.label_20.setSizePolicy(sizePolicy)
-        self.label_20.setAlignment(QtCore.Qt.AlignCenter)
-        self.label_20.setObjectName("label_20")
-        self.verticalLayout_66.addWidget(self.label_20)
-        self.horizontalLayout_119 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_119.setContentsMargins(2, 2, 2, 2)
         self.horizontalLayout_119.setSpacing(15)
-        self.horizontalLayout_119.setObjectName("horizontalLayout_119")
+        self.horizontalLayout_119.setObjectName(u"horizontalLayout_119")
+        self.horizontalLayout_119.setContentsMargins(2, 2, 2, 2)
         self.reference_carousel = MDIButton(self.widget_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.reference_carousel.setObjectName(u"reference_carousel")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy1.setHeightForWidth(self.reference_carousel.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.reference_carousel.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.reference_carousel.sizePolicy().hasHeightForWidth())
+        self.reference_carousel.setMinimumSize(QSize(125, 45))
-        self.reference_carousel.setSizePolicy(sizePolicy)
+        self.reference_carousel.setMaximumSize(QSize(16777215, 45))
-        self.reference_carousel.setMinimumSize(QtCore.QSize(125, 45))
+        self.reference_carousel.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-        self.reference_carousel.setMaximumSize(QtCore.QSize(16777215, 45))
+        self.reference_carousel.setStyleSheet(u"MDIButton {\n"
-        self.reference_carousel.setFocusPolicy(QtCore.Qt.NoFocus)
+"    font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.reference_carousel.setStyleSheet("MDIButton {\n"
-"    font: 15pt \"Bebas Kai\";\n"
 "}")
-        self.reference_carousel.setIconSize(QtCore.QSize(20, 20))
+        self.reference_carousel.setIconSize(QSize(20, 20))
-        self.reference_carousel.setObjectName("reference_carousel")
+
         self.horizontalLayout_119.addWidget(self.reference_carousel)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_119)
+
+
         self.verticalLayout.addWidget(self.widget_64)
 
+
         self.retranslateUi(USER_ATC_BUTTONS)
-        QtCore.QMetaObject.connectSlotsByName(USER_ATC_BUTTONS)
+
+        QMetaObject.connectSlotsByName(USER_ATC_BUTTONS)
+    # setupUi
 
     def retranslateUi(self, USER_ATC_BUTTONS):
-        _translate = QtCore.QCoreApplication.translate
+        USER_ATC_BUTTONS.setWindowTitle(QCoreApplication.translate("USER_ATC_BUTTONS", u"User Atc Buttons", None))
-        USER_ATC_BUTTONS.setWindowTitle(_translate("USER_ATC_BUTTONS", "User Atc Buttons"))
+#if QT_CONFIG(tooltip)
-        self.atc_rev_button.setToolTip(_translate("USER_ATC_BUTTONS", "M11P1 User Defined Macro Call from Subroutine Folder"))
+        self.atc_rev_button.setToolTip(QCoreApplication.translate("USER_ATC_BUTTONS", u"M11P1 User Defined Macro Call from Subroutine Folder", None))
-        self.atc_rev_button.setText(_translate("USER_ATC_BUTTONS", " ATC REV"))
+#endif // QT_CONFIG(tooltip)
-        self.atc_rev_button.setProperty("MDICommand", _translate("USER_ATC_BUTTONS", "M12P1"))
+        self.atc_rev_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u" ATC REV", None))
-        self.atc_fwd_button.setToolTip(_translate("USER_ATC_BUTTONS", "M12 P1 User Defined Macro Call from Subroutine Folder"))
+        self.atc_rev_button.setProperty(u"MDICommand", QCoreApplication.translate("USER_ATC_BUTTONS", u"M12P1", None))
-        self.atc_fwd_button.setText(_translate("USER_ATC_BUTTONS", " ATC FWD "))
+#if QT_CONFIG(tooltip)
-        self.atc_fwd_button.setProperty("MDICommand", _translate("USER_ATC_BUTTONS", "M11P1"))
+        self.atc_fwd_button.setToolTip(QCoreApplication.translate("USER_ATC_BUTTONS", u"M12 P1 User Defined Macro Call from Subroutine Folder", None))
-        self.atc_retract_button.setText(_translate("USER_ATC_BUTTONS", "  ATC RETRACT"))
+#endif // QT_CONFIG(tooltip)
-        self.atc_retract_button.setProperty("filename", _translate("USER_ATC_BUTTONS", "retractatc.ngc"))
+        self.atc_fwd_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u" ATC FWD ", None))
-        self.atc_extend_button.setText(_translate("USER_ATC_BUTTONS", "ATC EXTEND  "))
+        self.atc_fwd_button.setProperty(u"MDICommand", QCoreApplication.translate("USER_ATC_BUTTONS", u"M11P1", None))
-        self.atc_extend_button.setProperty("filename", _translate("USER_ATC_BUTTONS", "extendatc.ngc"))
+        self.atc_retract_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"  ATC RETRACT", None))
-        self.clamp_tool_button.setText(_translate("USER_ATC_BUTTONS", "CLAMP TOOL"))
+        self.atc_retract_button.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"retractatc.ngc", None))
-        self.clamp_tool_button.setProperty("filename", _translate("USER_ATC_BUTTONS", "clamptool.ngc"))
+        self.atc_extend_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"ATC EXTEND  ", None))
-        self.release_tool_button.setText(_translate("USER_ATC_BUTTONS", "RELEASE TOOL"))
+        self.atc_extend_button.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"extendatc.ngc", None))
-        self.release_tool_button.setProperty("rules", _translate("USER_ATC_BUTTONS", "[{\"name\": \"New Rule\", \"property\": \"Enable\", \"expression\": \"not ch[0]\", \"channels\": [{\"url\": \"status:spindle.0.enabled\", \"trigger\": true}]}]"))
+        self.clamp_tool_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"CLAMP TOOL", None))
-        self.release_tool_button.setProperty("filename", _translate("USER_ATC_BUTTONS", "unclamptool.ngc"))
+        self.clamp_tool_button.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"clamptool.ngc", None))
-        self.spindle_orientation.setText(_translate("USER_ATC_BUTTONS", "ORIENT SPINDLE"))
+        self.release_tool_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"RELEASE TOOL", None))
-        self.spindle_orientation.setProperty("filename", _translate("USER_ATC_BUTTONS", "orientspindle.ngc"))
+        self.release_tool_button.setProperty(u"rules", QCoreApplication.translate("USER_ATC_BUTTONS", u"[{\"name\": \"New Rule\", \"property\": \"Enable\", \"expression\": \"not ch[0]\", \"channels\": [{\"url\": \"status:spindle.0.enabled\", \"trigger\": true}]}]", None))
-        self.unlock_spindle.setToolTip(_translate("USER_ATC_BUTTONS", "M112 User Defined Macro Call from Subroutine Folder"))
+        self.release_tool_button.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"unclamptool.ngc", None))
-        self.unlock_spindle.setText(_translate("USER_ATC_BUTTONS", "UNLOCK SPINDLE"))
+        self.spindle_orientation.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"ORIENT SPINDLE", None))
-        self.unlock_spindle.setProperty("MDICommand", _translate("USER_ATC_BUTTONS", "M5"))
+        self.spindle_orientation.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"orientspindle.ngc", None))
-        self.move_head_above_carousel_button.setText(_translate("USER_ATC_BUTTONS", "MOVE HEAD ABOVE CAROUSEL"))
+#if QT_CONFIG(tooltip)
-        self.move_head_above_carousel_button.setProperty("filename", _translate("USER_ATC_BUTTONS", "move_head_above_carousel.ngc"))
+        self.unlock_spindle.setToolTip(QCoreApplication.translate("USER_ATC_BUTTONS", u"M112 User Defined Macro Call from Subroutine Folder", None))
-        self.move_tool_to_carousel_height_button.setText(_translate("USER_ATC_BUTTONS", "MOVE TOOL TO CAROUSEL HEIGHT"))
+#endif // QT_CONFIG(tooltip)
-        self.move_tool_to_carousel_height_button.setProperty("filename", _translate("USER_ATC_BUTTONS", "move_tool_to_carousel_height.ngc"))
+        self.unlock_spindle.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"UNLOCK SPINDLE", None))
-        self.reference_carousel.setToolTip(_translate("USER_ATC_BUTTONS", "M13 User Defined Macro Call from Subroutine Folder"))
+        self.unlock_spindle.setProperty(u"MDICommand", QCoreApplication.translate("USER_ATC_BUTTONS", u"M5", None))
-        self.reference_carousel.setText(_translate("USER_ATC_BUTTONS", "REF CAROUSEL"))
+        self.move_head_above_carousel_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"MOVE HEAD ABOVE CAROUSEL", None))
-        self.reference_carousel.setProperty("MDICommand", _translate("USER_ATC_BUTTONS", "M13"))
+        self.move_head_above_carousel_button.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"move_head_above_carousel.ngc", None))
-from qtpyvcp.widgets.button_widgets.mdi_button import MDIButton
+        self.move_tool_to_carousel_height_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"MOVE TOOL TO CAROUSEL HEIGHT", None))
-from qtpyvcp.widgets.button_widgets.subcall_button import SubCallButton
+        self.move_tool_to_carousel_height_button.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"move_tool_to_carousel_height.ngc", None))
-import probe_basic_rc
+#if QT_CONFIG(tooltip)
+        self.reference_carousel.setToolTip(QCoreApplication.translate("USER_ATC_BUTTONS", u"M13 User Defined Macro Call from Subroutine Folder", None))
+#endif // QT_CONFIG(tooltip)
+        self.reference_carousel.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"REF CAROUSEL", None))
+        self.reference_carousel.setProperty(u"MDICommand", QCoreApplication.translate("USER_ATC_BUTTONS", u"M13", None))
+    # retranslateUi
+

user_atc_buttons/template_user_rack_atc_buttons/template_user_rack_atc_buttons.py

@@ -1,12 +1,12 @@
 import os
 import linuxcnc
 
-from qtpy import uic
+from PySide6.QtCore import Qt
-from qtpy.QtCore import Qt
+from PySide6.QtWidgets import QWidget
-from qtpy.QtWidgets import QWidget
 
 from qtpyvcp.plugins import getPlugin
 from qtpyvcp.utilities import logger
+import template_user_rack_atc_buttons_ui
 
 LOG = logger.getLogger(__name__)
 
@@ -19,5 +19,8 @@ INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME'))
 class UserRackAtcButton(QWidget):
     def __init__(self, parent=None):
         super(UserRackAtcButton, self).__init__(parent)
-        ui_file = os.path.splitext(os.path.basename(__file__))[0] + ".ui"
+        ui_cls = getattr(template_user_rack_atc_buttons_ui, "Ui_USER_RACK_ATC_BUTTONS", None)
-        uic.loadUi(os.path.join(os.path.dirname(__file__), ui_file), self)
+        if ui_cls is None:
+            ui_cls = template_user_rack_atc_buttons_ui.Ui_USER_ATC_BUTTONS
+        self.ui = ui_cls()
+        self.ui.setupUi(self)

user_atc_buttons/template_user_rack_atc_buttons/template_user_rack_atc_buttons.ui

@@ -102,7 +102,7 @@
     border-radius: 5px;
     color: white;
     background: rgb(90, 90, 90);
-	font: 16pt "Bebas Kai";
+	font: 16pt "Probe Basic Bebas Mono";
 }</string>
         </property>
         <property name="frameShape">
@@ -167,7 +167,7 @@
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-    font: 15pt &quot;Bebas Kai&quot;;
+    font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -212,7 +212,7 @@
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-    font: 15pt &quot;Bebas Kai&quot;;
+    font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -276,7 +276,7 @@
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -332,7 +332,7 @@ SubCallButton:pressed {
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -407,7 +407,7 @@ SubCallButton:pressed {
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -466,7 +466,7 @@ SubCallButton:pressed {
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-    font: 15pt &quot;Bebas Kai&quot;;
+    font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -530,7 +530,7 @@ SubCallButton:pressed {
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -583,7 +583,7 @@ SubCallButton:pressed {
     border-radius: 5px;
     border-width: 2px;
     background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));
-    font-family: &quot;Bebas Kai&quot;;
+    font-family: &quot;Probe Basic Bebas Mono&quot;;
     font-size: 15pt;
 }
 
@@ -658,7 +658,7 @@ SubCallButton:pressed {
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-    font: 15pt &quot;Bebas Kai&quot;;
+    font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">

user_atc_buttons/template_user_rack_atc_buttons/template_user_rack_atc_buttons_ui.py

@@ -1,122 +1,133 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/buildbot/buildbot/worker/probe_basic-dev/sources/debian/python3-probe-basic/usr/share/configs/machine_setup_files/user_atc_buttons/template_user_rack_atc_buttons/template_user_rack_atc_buttons.ui'
+################################################################################
-#
+## Form generated from reading UI file 'template_user_rack_atc_buttons.ui'
-# Created by: PyQt5 UI code generator 5.15.9
+##
-#
+## Created by: Qt User Interface Compiler version 6.8.2
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+##
-# run again.  Do not edit this file unless you know what you are doing.
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
 
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+    QFont, QFontDatabase, QGradient, QIcon,
+    QImage, QKeySequence, QLinearGradient, QPainter,
+    QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QApplication, QFrame, QHBoxLayout, QLabel,
+    QSizePolicy, QVBoxLayout, QWidget)
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qtpyvcp.widgets.button_widgets.mdi_button import MDIButton
-
+from qtpyvcp.widgets.button_widgets.subcall_button import SubCallButton
 
 class Ui_USER_ATC_BUTTONS(object):
     def setupUi(self, USER_ATC_BUTTONS):
-        USER_ATC_BUTTONS.setObjectName("USER_ATC_BUTTONS")
+        if not USER_ATC_BUTTONS.objectName():
+            USER_ATC_BUTTONS.setObjectName(u"USER_ATC_BUTTONS")
         USER_ATC_BUTTONS.resize(300, 429)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(USER_ATC_BUTTONS.sizePolicy().hasHeightForWidth())
         USER_ATC_BUTTONS.setSizePolicy(sizePolicy)
-        USER_ATC_BUTTONS.setLayoutDirection(QtCore.Qt.LeftToRight)
+        USER_ATC_BUTTONS.setLayoutDirection(Qt.LeftToRight)
-        self.verticalLayout = QtWidgets.QVBoxLayout(USER_ATC_BUTTONS)
+        self.verticalLayout = QVBoxLayout(USER_ATC_BUTTONS)
-        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout.setSpacing(0)
-        self.verticalLayout.setObjectName("verticalLayout")
+        self.verticalLayout.setObjectName(u"verticalLayout")
-        self.frame_64 = QtWidgets.QFrame(USER_ATC_BUTTONS)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        self.frame_64 = QFrame(USER_ATC_BUTTONS)
-        sizePolicy.setHorizontalStretch(0)
+        self.frame_64.setObjectName(u"frame_64")
-        sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.frame_64.sizePolicy().hasHeightForWidth())
         self.frame_64.setSizePolicy(sizePolicy)
-        self.frame_64.setMaximumSize(QtCore.QSize(300, 16777215))
+        self.frame_64.setMaximumSize(QSize(300, 16777215))
-        self.frame_64.setStyleSheet("")
+        self.frame_64.setStyleSheet(u"")
-        self.frame_64.setObjectName("frame_64")
+        self.verticalLayout_66 = QVBoxLayout(self.frame_64)
-        self.verticalLayout_66 = QtWidgets.QVBoxLayout(self.frame_64)
-        self.verticalLayout_66.setContentsMargins(20, 18, 20, 18)
         self.verticalLayout_66.setSpacing(16)
-        self.verticalLayout_66.setObjectName("verticalLayout_66")
+        self.verticalLayout_66.setObjectName(u"verticalLayout_66")
-        self.work_column_header_8 = QtWidgets.QLabel(self.frame_64)
+        self.verticalLayout_66.setContentsMargins(20, 18, 20, 18)
+        self.work_column_header_8 = QLabel(self.frame_64)
+        self.work_column_header_8.setObjectName(u"work_column_header_8")
         self.work_column_header_8.setEnabled(True)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
+        sizePolicy1.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy1.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.work_column_header_8.sizePolicy().hasHeightForWidth())
+        sizePolicy1.setHeightForWidth(self.work_column_header_8.sizePolicy().hasHeightForWidth())
-        self.work_column_header_8.setSizePolicy(sizePolicy)
+        self.work_column_header_8.setSizePolicy(sizePolicy1)
-        self.work_column_header_8.setMinimumSize(QtCore.QSize(0, 38))
+        self.work_column_header_8.setMinimumSize(QSize(0, 38))
-        self.work_column_header_8.setMaximumSize(QtCore.QSize(16777215, 38))
+        self.work_column_header_8.setMaximumSize(QSize(16777215, 38))
-        self.work_column_header_8.setStyleSheet("QLabel{\n"
+        self.work_column_header_8.setStyleSheet(u"QLabel{\n"
 "    border-style: solid;\n"
 "    border-color: rgb(176, 179, 172);\n"
 "    border-width: 2px;\n"
 "    border-radius: 5px;\n"
 "    color: white;\n"
 "    background: rgb(90, 90, 90);\n"
-"    font: 16pt \"Bebas Kai\";\n"
+"	font: 16pt \"Probe Basic Bebas Mono\";\n"
 "}")
-        self.work_column_header_8.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.work_column_header_8.setFrameShape(QFrame.NoFrame)
-        self.work_column_header_8.setAlignment(QtCore.Qt.AlignCenter)
+        self.work_column_header_8.setAlignment(Qt.AlignCenter)
         self.work_column_header_8.setWordWrap(True)
         self.work_column_header_8.setIndent(0)
-        self.work_column_header_8.setObjectName("work_column_header_8")
+
         self.verticalLayout_66.addWidget(self.work_column_header_8)
-        self.horizontalLayout_119 = QtWidgets.QHBoxLayout()
+
-        self.horizontalLayout_119.setContentsMargins(2, 2, 2, 2)
+        self.horizontalLayout_119 = QHBoxLayout()
         self.horizontalLayout_119.setSpacing(15)
-        self.horizontalLayout_119.setObjectName("horizontalLayout_119")
+        self.horizontalLayout_119.setObjectName(u"horizontalLayout_119")
+        self.horizontalLayout_119.setContentsMargins(2, 2, 2, 2)
         self.reference_carousel_3 = MDIButton(self.frame_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.reference_carousel_3.setObjectName(u"reference_carousel_3")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy2.setHorizontalStretch(1)
-        sizePolicy.setHeightForWidth(self.reference_carousel_3.sizePolicy().hasHeightForWidth())
+        sizePolicy2.setVerticalStretch(0)
-        self.reference_carousel_3.setSizePolicy(sizePolicy)
+        sizePolicy2.setHeightForWidth(self.reference_carousel_3.sizePolicy().hasHeightForWidth())
-        self.reference_carousel_3.setMinimumSize(QtCore.QSize(120, 45))
+        self.reference_carousel_3.setSizePolicy(sizePolicy2)
-        self.reference_carousel_3.setMaximumSize(QtCore.QSize(16777215, 45))
+        self.reference_carousel_3.setMinimumSize(QSize(120, 45))
-        self.reference_carousel_3.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.reference_carousel_3.setMaximumSize(QSize(16777215, 45))
-        self.reference_carousel_3.setStyleSheet("MDIButton {\n"
+        self.reference_carousel_3.setFocusPolicy(Qt.NoFocus)
-"    font: 15pt \"Bebas Kai\";\n"
+        self.reference_carousel_3.setStyleSheet(u"MDIButton {\n"
+"    font: 15pt \"Probe Basic Bebas Mono\";\n"
 "}")
-        self.reference_carousel_3.setIconSize(QtCore.QSize(20, 20))
+        self.reference_carousel_3.setIconSize(QSize(20, 20))
-        self.reference_carousel_3.setObjectName("reference_carousel_3")
+
         self.horizontalLayout_119.addWidget(self.reference_carousel_3)
+
         self.reference_carousel_4 = MDIButton(self.frame_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.reference_carousel_4.setObjectName(u"reference_carousel_4")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy2.setHeightForWidth(self.reference_carousel_4.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.reference_carousel_4.setSizePolicy(sizePolicy2)
-        sizePolicy.setHeightForWidth(self.reference_carousel_4.sizePolicy().hasHeightForWidth())
+        self.reference_carousel_4.setMinimumSize(QSize(120, 45))
-        self.reference_carousel_4.setSizePolicy(sizePolicy)
+        self.reference_carousel_4.setMaximumSize(QSize(16777215, 45))
-        self.reference_carousel_4.setMinimumSize(QtCore.QSize(120, 45))
+        self.reference_carousel_4.setFocusPolicy(Qt.NoFocus)
-        self.reference_carousel_4.setMaximumSize(QtCore.QSize(16777215, 45))
+        self.reference_carousel_4.setStyleSheet(u"MDIButton {\n"
-        self.reference_carousel_4.setFocusPolicy(QtCore.Qt.NoFocus)
+"    font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.reference_carousel_4.setStyleSheet("MDIButton {\n"
-"    font: 15pt \"Bebas Kai\";\n"
 "}")
-        self.reference_carousel_4.setIconSize(QtCore.QSize(20, 20))
+        self.reference_carousel_4.setIconSize(QSize(20, 20))
-        self.reference_carousel_4.setObjectName("reference_carousel_4")
+
         self.horizontalLayout_119.addWidget(self.reference_carousel_4)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_119)
-        self.horizontalLayout_117 = QtWidgets.QHBoxLayout()
+
-        self.horizontalLayout_117.setContentsMargins(2, 2, 2, 2)
+        self.horizontalLayout_117 = QHBoxLayout()
         self.horizontalLayout_117.setSpacing(15)
-        self.horizontalLayout_117.setObjectName("horizontalLayout_117")
+        self.horizontalLayout_117.setObjectName(u"horizontalLayout_117")
+        self.horizontalLayout_117.setContentsMargins(2, 2, 2, 2)
         self.clamp_tool_button = SubCallButton(self.frame_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.clamp_tool_button.setObjectName(u"clamp_tool_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy2.setHeightForWidth(self.clamp_tool_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.clamp_tool_button.setSizePolicy(sizePolicy2)
-        sizePolicy.setHeightForWidth(self.clamp_tool_button.sizePolicy().hasHeightForWidth())
+        self.clamp_tool_button.setMinimumSize(QSize(120, 45))
-        self.clamp_tool_button.setSizePolicy(sizePolicy)
+        self.clamp_tool_button.setMaximumSize(QSize(16777215, 45))
-        self.clamp_tool_button.setMinimumSize(QtCore.QSize(120, 45))
+        self.clamp_tool_button.setStyleSheet(u"SubCallButton {\n"
-        self.clamp_tool_button.setMaximumSize(QtCore.QSize(16777215, 45))
-        self.clamp_tool_button.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -132,25 +143,24 @@ class Ui_USER_ATC_BUTTONS(object):
 "    background:  qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(85, 85, 238, 255), stop:0.544974 rgba(90, 91, 239, 255), stop:1 rgba(126, 135, 243, 255));\n"
 "}\n"
 "")
-        self.clamp_tool_button.setObjectName("clamp_tool_button")
+
         self.horizontalLayout_117.addWidget(self.clamp_tool_button)
+
         self.release_tool_button = SubCallButton(self.frame_64)
+        self.release_tool_button.setObjectName(u"release_tool_button")
         self.release_tool_button.setEnabled(False)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy2.setHeightForWidth(self.release_tool_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setHorizontalStretch(1)
+        self.release_tool_button.setSizePolicy(sizePolicy2)
-        sizePolicy.setVerticalStretch(0)
+        self.release_tool_button.setMinimumSize(QSize(120, 45))
-        sizePolicy.setHeightForWidth(self.release_tool_button.sizePolicy().hasHeightForWidth())
+        self.release_tool_button.setMaximumSize(QSize(16777215, 45))
-        self.release_tool_button.setSizePolicy(sizePolicy)
+        self.release_tool_button.setStyleSheet(u"SubCallButton {\n"
-        self.release_tool_button.setMinimumSize(QtCore.QSize(120, 45))
-        self.release_tool_button.setMaximumSize(QtCore.QSize(16777215, 45))
-        self.release_tool_button.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -166,29 +176,30 @@ class Ui_USER_ATC_BUTTONS(object):
 "    background:  qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(85, 85, 238, 255), stop:0.544974 rgba(90, 91, 239, 255), stop:1 rgba(126, 135, 243, 255));\n"
 "}\n"
 "")
-        self.release_tool_button.setObjectName("release_tool_button")
+
         self.horizontalLayout_117.addWidget(self.release_tool_button)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_117)
-        self.horizontalLayout_152 = QtWidgets.QHBoxLayout()
+
-        self.horizontalLayout_152.setContentsMargins(2, 2, 2, 2)
+        self.horizontalLayout_152 = QHBoxLayout()
         self.horizontalLayout_152.setSpacing(15)
-        self.horizontalLayout_152.setObjectName("horizontalLayout_152")
+        self.horizontalLayout_152.setObjectName(u"horizontalLayout_152")
+        self.horizontalLayout_152.setContentsMargins(2, 2, 2, 2)
         self.spindle_orientation = SubCallButton(self.frame_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.spindle_orientation.setObjectName(u"spindle_orientation")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy2.setHeightForWidth(self.spindle_orientation.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.spindle_orientation.setSizePolicy(sizePolicy2)
-        sizePolicy.setHeightForWidth(self.spindle_orientation.sizePolicy().hasHeightForWidth())
+        self.spindle_orientation.setMinimumSize(QSize(120, 45))
-        self.spindle_orientation.setSizePolicy(sizePolicy)
+        self.spindle_orientation.setMaximumSize(QSize(16777215, 45))
-        self.spindle_orientation.setMinimumSize(QtCore.QSize(120, 45))
+        self.spindle_orientation.setStyleSheet(u"SubCallButton {\n"
-        self.spindle_orientation.setMaximumSize(QtCore.QSize(16777215, 45))
-        self.spindle_orientation.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -205,45 +216,45 @@ class Ui_USER_ATC_BUTTONS(object):
 "}\n"
 "")
         self.spindle_orientation.setCheckable(True)
-        self.spindle_orientation.setObjectName("spindle_orientation")
+
         self.horizontalLayout_152.addWidget(self.spindle_orientation)
+
         self.unlock_spindle = MDIButton(self.frame_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.unlock_spindle.setObjectName(u"unlock_spindle")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy2.setHeightForWidth(self.unlock_spindle.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.unlock_spindle.setSizePolicy(sizePolicy2)
-        sizePolicy.setHeightForWidth(self.unlock_spindle.sizePolicy().hasHeightForWidth())
+        self.unlock_spindle.setMinimumSize(QSize(120, 45))
-        self.unlock_spindle.setSizePolicy(sizePolicy)
+        self.unlock_spindle.setMaximumSize(QSize(16777215, 45))
-        self.unlock_spindle.setMinimumSize(QtCore.QSize(120, 45))
+        self.unlock_spindle.setFocusPolicy(Qt.NoFocus)
-        self.unlock_spindle.setMaximumSize(QtCore.QSize(16777215, 45))
+        self.unlock_spindle.setLayoutDirection(Qt.RightToLeft)
-        self.unlock_spindle.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.unlock_spindle.setStyleSheet(u"MDIButton {\n"
-        self.unlock_spindle.setLayoutDirection(QtCore.Qt.RightToLeft)
+"    font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.unlock_spindle.setStyleSheet("MDIButton {\n"
-"    font: 15pt \"Bebas Kai\";\n"
 "}")
-        self.unlock_spindle.setIconSize(QtCore.QSize(20, 20))
+        self.unlock_spindle.setIconSize(QSize(20, 20))
-        self.unlock_spindle.setObjectName("unlock_spindle")
+
         self.horizontalLayout_152.addWidget(self.unlock_spindle)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_152)
-        self.horizontalLayout_174 = QtWidgets.QHBoxLayout()
+
-        self.horizontalLayout_174.setContentsMargins(2, 2, 2, 2)
+        self.horizontalLayout_174 = QHBoxLayout()
         self.horizontalLayout_174.setSpacing(15)
-        self.horizontalLayout_174.setObjectName("horizontalLayout_174")
+        self.horizontalLayout_174.setObjectName(u"horizontalLayout_174")
+        self.horizontalLayout_174.setContentsMargins(2, 2, 2, 2)
         self.move_head_above_carousel_button = SubCallButton(self.frame_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.move_head_above_carousel_button.setObjectName(u"move_head_above_carousel_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy2.setHeightForWidth(self.move_head_above_carousel_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.move_head_above_carousel_button.setSizePolicy(sizePolicy2)
-        sizePolicy.setHeightForWidth(self.move_head_above_carousel_button.sizePolicy().hasHeightForWidth())
+        self.move_head_above_carousel_button.setMinimumSize(QSize(120, 45))
-        self.move_head_above_carousel_button.setSizePolicy(sizePolicy)
+        self.move_head_above_carousel_button.setMaximumSize(QSize(16777215, 45))
-        self.move_head_above_carousel_button.setMinimumSize(QtCore.QSize(120, 45))
+        self.move_head_above_carousel_button.setStyleSheet(u"SubCallButton {\n"
-        self.move_head_above_carousel_button.setMaximumSize(QtCore.QSize(16777215, 45))
-        self.move_head_above_carousel_button.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -259,24 +270,23 @@ class Ui_USER_ATC_BUTTONS(object):
 "    background:  qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(85, 85, 238, 255), stop:0.544974 rgba(90, 91, 239, 255), stop:1 rgba(126, 135, 243, 255));\n"
 "}\n"
 "")
-        self.move_head_above_carousel_button.setObjectName("move_head_above_carousel_button")
+
         self.horizontalLayout_174.addWidget(self.move_head_above_carousel_button)
+
         self.move_tool_to_carousel_height_button = SubCallButton(self.frame_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.move_tool_to_carousel_height_button.setObjectName(u"move_tool_to_carousel_height_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy2.setHeightForWidth(self.move_tool_to_carousel_height_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.move_tool_to_carousel_height_button.setSizePolicy(sizePolicy2)
-        sizePolicy.setHeightForWidth(self.move_tool_to_carousel_height_button.sizePolicy().hasHeightForWidth())
+        self.move_tool_to_carousel_height_button.setMinimumSize(QSize(120, 45))
-        self.move_tool_to_carousel_height_button.setSizePolicy(sizePolicy)
+        self.move_tool_to_carousel_height_button.setMaximumSize(QSize(16777215, 45))
-        self.move_tool_to_carousel_height_button.setMinimumSize(QtCore.QSize(120, 45))
+        self.move_tool_to_carousel_height_button.setStyleSheet(u"SubCallButton {\n"
-        self.move_tool_to_carousel_height_button.setMaximumSize(QtCore.QSize(16777215, 45))
-        self.move_tool_to_carousel_height_button.setStyleSheet("SubCallButton {\n"
 "    color: white;\n"
 "    border-color: black;\n"
 "    border-style: solid;\n"
 "    border-radius: 5px;\n"
 "    border-width: 2px;\n"
 "    background: qlineargradient(spread:pad, x1:0, y1:1, x2:0, y2:0, stop:0 rgba(213, 218, 216, 255), stop:0.169312 rgba(82, 82, 83, 255), stop:0.328042 rgba(72, 70, 73, 255), stop:0.492063 rgba(78, 77, 79, 255), stop:0.703704 rgba(72, 70, 73, 255), stop:0.86 rgba(82, 82, 83, 255), stop:1 rgba(213, 218, 216, 255));\n"
-"    font-family: \"Bebas Kai\";\n"
+"    font-family: \"Probe Basic Bebas Mono\";\n"
 "    font-size: 15pt;\n"
 "}\n"
 "\n"
@@ -292,63 +302,80 @@ class Ui_USER_ATC_BUTTONS(object):
 "    background:  qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(85, 85, 238, 255), stop:0.544974 rgba(90, 91, 239, 255), stop:1 rgba(126, 135, 243, 255));\n"
 "}\n"
 "")
-        self.move_tool_to_carousel_height_button.setObjectName("move_tool_to_carousel_height_button")
+
         self.horizontalLayout_174.addWidget(self.move_tool_to_carousel_height_button)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_174)
-        self.widget_10 = QtWidgets.QWidget(self.frame_64)
+
-        self.widget_10.setObjectName("widget_10")
+        self.widget_10 = QWidget(self.frame_64)
+        self.widget_10.setObjectName(u"widget_10")
+
         self.verticalLayout_66.addWidget(self.widget_10)
-        self.horizontalLayout_159 = QtWidgets.QHBoxLayout()
+
-        self.horizontalLayout_159.setContentsMargins(2, 2, 2, 2)
+        self.horizontalLayout_159 = QHBoxLayout()
         self.horizontalLayout_159.setSpacing(15)
-        self.horizontalLayout_159.setObjectName("horizontalLayout_159")
+        self.horizontalLayout_159.setObjectName(u"horizontalLayout_159")
+        self.horizontalLayout_159.setContentsMargins(2, 2, 2, 2)
         self.reference_carousel_2 = MDIButton(self.frame_64)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.reference_carousel_2.setObjectName(u"reference_carousel_2")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy2.setHeightForWidth(self.reference_carousel_2.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.reference_carousel_2.setSizePolicy(sizePolicy2)
-        sizePolicy.setHeightForWidth(self.reference_carousel_2.sizePolicy().hasHeightForWidth())
+        self.reference_carousel_2.setMinimumSize(QSize(125, 45))
-        self.reference_carousel_2.setSizePolicy(sizePolicy)
+        self.reference_carousel_2.setMaximumSize(QSize(16777215, 45))
-        self.reference_carousel_2.setMinimumSize(QtCore.QSize(125, 45))
+        self.reference_carousel_2.setFocusPolicy(Qt.NoFocus)
-        self.reference_carousel_2.setMaximumSize(QtCore.QSize(16777215, 45))
+        self.reference_carousel_2.setStyleSheet(u"MDIButton {\n"
-        self.reference_carousel_2.setFocusPolicy(QtCore.Qt.NoFocus)
+"    font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.reference_carousel_2.setStyleSheet("MDIButton {\n"
-"    font: 15pt \"Bebas Kai\";\n"
 "}")
-        self.reference_carousel_2.setIconSize(QtCore.QSize(20, 20))
+        self.reference_carousel_2.setIconSize(QSize(20, 20))
-        self.reference_carousel_2.setObjectName("reference_carousel_2")
+
         self.horizontalLayout_159.addWidget(self.reference_carousel_2)
+
+
         self.verticalLayout_66.addLayout(self.horizontalLayout_159)
+
+
         self.verticalLayout.addWidget(self.frame_64)
 
+
         self.retranslateUi(USER_ATC_BUTTONS)
-        QtCore.QMetaObject.connectSlotsByName(USER_ATC_BUTTONS)
+
+        QMetaObject.connectSlotsByName(USER_ATC_BUTTONS)
+    # setupUi
 
     def retranslateUi(self, USER_ATC_BUTTONS):
-        _translate = QtCore.QCoreApplication.translate
+        USER_ATC_BUTTONS.setWindowTitle(QCoreApplication.translate("USER_ATC_BUTTONS", u"User Atc Buttons", None))
-        USER_ATC_BUTTONS.setWindowTitle(_translate("USER_ATC_BUTTONS", "User Atc Buttons"))
+        self.work_column_header_8.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"ATC MANUAL CONTROL PANEL", None))
-        self.work_column_header_8.setText(_translate("USER_ATC_BUTTONS", "ATC MANUAL CONTROL PANEL"))
+#if QT_CONFIG(tooltip)
-        self.reference_carousel_3.setToolTip(_translate("USER_ATC_BUTTONS", "M13 User Defined Macro Call from Subroutine Folder"))
+        self.reference_carousel_3.setToolTip(QCoreApplication.translate("USER_ATC_BUTTONS", u"M13 User Defined Macro Call from Subroutine Folder", None))
-        self.reference_carousel_3.setText(_translate("USER_ATC_BUTTONS", "AIR BLAST"))
+#endif // QT_CONFIG(tooltip)
-        self.reference_carousel_3.setProperty("MDICommand", _translate("USER_ATC_BUTTONS", "M13"))
+        self.reference_carousel_3.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"AIR BLAST", None))
-        self.reference_carousel_4.setToolTip(_translate("USER_ATC_BUTTONS", "M13 User Defined Macro Call from Subroutine Folder"))
+        self.reference_carousel_3.setProperty(u"MDICommand", QCoreApplication.translate("USER_ATC_BUTTONS", u"M13", None))
-        self.reference_carousel_4.setText(_translate("USER_ATC_BUTTONS", "RETR DUST BOOT"))
+#if QT_CONFIG(tooltip)
-        self.reference_carousel_4.setProperty("MDICommand", _translate("USER_ATC_BUTTONS", "M13"))
+        self.reference_carousel_4.setToolTip(QCoreApplication.translate("USER_ATC_BUTTONS", u"M13 User Defined Macro Call from Subroutine Folder", None))
-        self.clamp_tool_button.setText(_translate("USER_ATC_BUTTONS", "CLAMP TOOL"))
+#endif // QT_CONFIG(tooltip)
-        self.clamp_tool_button.setProperty("filename", _translate("USER_ATC_BUTTONS", "clamptool.ngc"))
+        self.reference_carousel_4.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"RETR DUST BOOT", None))
-        self.release_tool_button.setText(_translate("USER_ATC_BUTTONS", "RELEASE TOOL"))
+        self.reference_carousel_4.setProperty(u"MDICommand", QCoreApplication.translate("USER_ATC_BUTTONS", u"M13", None))
-        self.release_tool_button.setProperty("rules", _translate("USER_ATC_BUTTONS", "[{\"name\": \"spindle safety\", \"property\": \"Enable\", \"expression\": \"not ch[0]\", \"channels\": [{\"url\": \"status:spindle.0.enabled\", \"trigger\": true}]}]"))
+        self.clamp_tool_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"CLAMP TOOL", None))
-        self.release_tool_button.setProperty("filename", _translate("USER_ATC_BUTTONS", "unclamptool.ngc"))
+        self.clamp_tool_button.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"clamptool.ngc", None))
-        self.spindle_orientation.setText(_translate("USER_ATC_BUTTONS", "ORIENT SPINDLE"))
+        self.release_tool_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"RELEASE TOOL", None))
-        self.spindle_orientation.setProperty("filename", _translate("USER_ATC_BUTTONS", "orientspindle.ngc"))
+        self.release_tool_button.setProperty(u"rules", QCoreApplication.translate("USER_ATC_BUTTONS", u"[{\"name\": \"spindle safety\", \"property\": \"Enable\", \"expression\": \"not ch[0]\", \"channels\": [{\"url\": \"status:spindle.0.enabled\", \"trigger\": true}]}]", None))
-        self.unlock_spindle.setToolTip(_translate("USER_ATC_BUTTONS", "M112 User Defined Macro Call from Subroutine Folder"))
+        self.release_tool_button.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"unclamptool.ngc", None))
-        self.unlock_spindle.setText(_translate("USER_ATC_BUTTONS", "UNLOCK SPINDLE"))
+        self.spindle_orientation.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"ORIENT SPINDLE", None))
-        self.unlock_spindle.setProperty("MDICommand", _translate("USER_ATC_BUTTONS", "M5"))
+        self.spindle_orientation.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"orientspindle.ngc", None))
-        self.move_head_above_carousel_button.setText(_translate("USER_ATC_BUTTONS", "HEAD UP"))
+#if QT_CONFIG(tooltip)
-        self.move_head_above_carousel_button.setProperty("filename", _translate("USER_ATC_BUTTONS", "move_head_above_carousel.ngc"))
+        self.unlock_spindle.setToolTip(QCoreApplication.translate("USER_ATC_BUTTONS", u"M112 User Defined Macro Call from Subroutine Folder", None))
-        self.move_tool_to_carousel_height_button.setText(_translate("USER_ATC_BUTTONS", "HEAD DOWN"))
+#endif // QT_CONFIG(tooltip)
-        self.move_tool_to_carousel_height_button.setProperty("filename", _translate("USER_ATC_BUTTONS", "move_tool_to_carousel_height.ngc"))
+        self.unlock_spindle.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"UNLOCK SPINDLE", None))
-        self.reference_carousel_2.setToolTip(_translate("USER_ATC_BUTTONS", "M13 User Defined Macro Call from Subroutine Folder"))
+        self.unlock_spindle.setProperty(u"MDICommand", QCoreApplication.translate("USER_ATC_BUTTONS", u"M5", None))
-        self.reference_carousel_2.setText(_translate("USER_ATC_BUTTONS", "REF RACK DATA"))
+        self.move_head_above_carousel_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"HEAD UP", None))
-        self.reference_carousel_2.setProperty("MDICommand", _translate("USER_ATC_BUTTONS", "M13"))
+        self.move_head_above_carousel_button.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"move_head_above_carousel.ngc", None))
-from qtpyvcp.widgets.button_widgets.mdi_button import MDIButton
+        self.move_tool_to_carousel_height_button.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"HEAD DOWN", None))
-from qtpyvcp.widgets.button_widgets.subcall_button import SubCallButton
+        self.move_tool_to_carousel_height_button.setProperty(u"filename", QCoreApplication.translate("USER_ATC_BUTTONS", u"move_tool_to_carousel_height.ngc", None))
+#if QT_CONFIG(tooltip)
+        self.reference_carousel_2.setToolTip(QCoreApplication.translate("USER_ATC_BUTTONS", u"M13 User Defined Macro Call from Subroutine Folder", None))
+#endif // QT_CONFIG(tooltip)
+        self.reference_carousel_2.setText(QCoreApplication.translate("USER_ATC_BUTTONS", u"REF RACK DATA", None))
+        self.reference_carousel_2.setProperty(u"MDICommand", QCoreApplication.translate("USER_ATC_BUTTONS", u"M13", None))
+    # retranslateUi
+

user_buttons/template_user_buttons/template_user_buttons.py

@@ -1,12 +1,14 @@
 import os
 import linuxcnc
 
-from qtpy import uic
+from PySide6.QtWidgets import QWidget
-from qtpy.QtCore import Qt
+
-from qtpy.QtWidgets import QWidget
+import template_user_buttons_ui
+from qtpyvcp.widgets.button_widgets.action_button import ActionButton
 
 from qtpyvcp.plugins import getPlugin
 from qtpyvcp.utilities import logger
+from qtpyvcp.actions import bindWidget, InvalidAction
 
 LOG = logger.getLogger(__name__)
 
@@ -19,5 +21,17 @@ INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME'))
 class UserButton(QWidget):
     def __init__(self, parent=None):
         super(UserButton, self).__init__(parent)
-        ui_file = os.path.splitext(os.path.basename(__file__))[0] + ".ui"
+        self.ui = template_user_buttons_ui.Ui_USER_BUTTONS()
-        uic.loadUi(os.path.join(os.path.dirname(__file__), ui_file), self)
+        self.ui.setupUi(self)
+        self._bind_action_buttons()
+
+    def _bind_action_buttons(self):
+        # Explicitly bind dynamic buttons in case property-based binding was skipped.
+        for button in self.findChildren(ActionButton):
+            action_name = button.property("actionName")
+            if not action_name:
+                continue
+            try:
+                bindWidget(button, str(action_name))
+            except InvalidAction:
+                LOG.warning("Invalid action for user button %s: %s", button.objectName(), action_name)

user_buttons/template_user_buttons/template_user_buttons.ui

@@ -20,7 +20,7 @@
    <string>User Buttons</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
@@ -62,11 +62,11 @@
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
+      <enum>Qt::FocusPolicy::NoFocus</enum>
      </property>
      <property name="styleSheet">
       <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
      </property>
      <property name="text">
@@ -101,11 +101,11 @@
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
+      <enum>Qt::FocusPolicy::NoFocus</enum>
      </property>
      <property name="styleSheet">
       <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
      </property>
      <property name="text">
@@ -140,15 +140,15 @@
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
+      <enum>Qt::FocusPolicy::NoFocus</enum>
      </property>
      <property name="styleSheet">
       <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
      </property>
      <property name="text">
-      <string>Flood</string>
+      <string>FLOOD</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
@@ -179,11 +179,11 @@
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
+      <enum>Qt::FocusPolicy::NoFocus</enum>
      </property>
      <property name="styleSheet">
       <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
      </property>
      <property name="text">
@@ -215,15 +215,15 @@
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
+      <enum>Qt::FocusPolicy::NoFocus</enum>
      </property>
      <property name="styleSheet">
       <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
      </property>
      <property name="text">
-      <string>Mist</string>
+      <string>MIST</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
@@ -254,11 +254,11 @@
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
+      <enum>Qt::FocusPolicy::NoFocus</enum>
      </property>
      <property name="styleSheet">
       <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
      </property>
      <property name="text">
@@ -296,11 +296,11 @@
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
+      <enum>Qt::FocusPolicy::NoFocus</enum>
      </property>
      <property name="styleSheet">
       <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
      </property>
      <property name="text">
@@ -335,14 +335,14 @@
       </size>
      </property>
      <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
+      <enum>Qt::FocusPolicy::NoFocus</enum>
      </property>
      <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
+      <enum>Qt::LayoutDirection::LeftToRight</enum>
      </property>
      <property name="styleSheet">
       <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
      </property>
      <property name="text">

user_buttons/template_user_buttons/template_user_buttons_ui.py

@@ -1,205 +1,214 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/buildbot/buildbot/worker/probe_basic-dev/sources/debian/python3-probe-basic/usr/share/configs/machine_setup_files/user_buttons/template_user_buttons/template_user_buttons.ui'
+################################################################################
-#
+## Form generated from reading UI file 'template_user_buttons.ui'
-# Created by: PyQt5 UI code generator 5.15.9
+##
-#
+## Created by: Qt User Interface Compiler version 6.8.2
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+##
-# run again.  Do not edit this file unless you know what you are doing.
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
 
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+    QFont, QFontDatabase, QGradient, QIcon,
+    QImage, QKeySequence, QLinearGradient, QPainter,
+    QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QApplication, QGridLayout, QLabel, QSizePolicy,
+    QWidget)
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from qtpyvcp.widgets.button_widgets.action_button import ActionButton
-
 
 class Ui_USER_BUTTONS(object):
     def setupUi(self, USER_BUTTONS):
-        USER_BUTTONS.setObjectName("USER_BUTTONS")
+        if not USER_BUTTONS.objectName():
+            USER_BUTTONS.setObjectName(u"USER_BUTTONS")
         USER_BUTTONS.resize(285, 196)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(USER_BUTTONS.sizePolicy().hasHeightForWidth())
         USER_BUTTONS.setSizePolicy(sizePolicy)
-        USER_BUTTONS.setLayoutDirection(QtCore.Qt.LeftToRight)
+        USER_BUTTONS.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
-        self.gridLayout = QtWidgets.QGridLayout(USER_BUTTONS)
+        self.gridLayout = QGridLayout(USER_BUTTONS)
-        self.gridLayout.setContentsMargins(1, 3, 1, 1)
+        self.gridLayout.setObjectName(u"gridLayout")
         self.gridLayout.setHorizontalSpacing(3)
         self.gridLayout.setVerticalSpacing(8)
-        self.gridLayout.setObjectName("gridLayout")
+        self.gridLayout.setContentsMargins(1, 3, 1, 1)
         self.block_delete_button = ActionButton(USER_BUTTONS)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.block_delete_button.setObjectName(u"block_delete_button")
-        sizePolicy.setHorizontalStretch(0)
+        sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy1.setHorizontalStretch(0)
-        sizePolicy.setHeightForWidth(self.block_delete_button.sizePolicy().hasHeightForWidth())
+        sizePolicy1.setVerticalStretch(0)
-        self.block_delete_button.setSizePolicy(sizePolicy)
+        sizePolicy1.setHeightForWidth(self.block_delete_button.sizePolicy().hasHeightForWidth())
-        self.block_delete_button.setMinimumSize(QtCore.QSize(135, 42))
+        self.block_delete_button.setSizePolicy(sizePolicy1)
-        self.block_delete_button.setMaximumSize(QtCore.QSize(16777215, 42))
+        self.block_delete_button.setMinimumSize(QSize(135, 42))
-        self.block_delete_button.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.block_delete_button.setMaximumSize(QSize(16777215, 42))
-        self.block_delete_button.setStyleSheet("QPushButton {\n"
+        self.block_delete_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-"       font: 15pt \"Bebas Kai\";\n"
+        self.block_delete_button.setStyleSheet(u"QPushButton {\n"
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
 "}")
         self.block_delete_button.setCheckable(True)
-        self.block_delete_button.setObjectName("block_delete_button")
+
         self.gridLayout.addWidget(self.block_delete_button, 2, 2, 1, 1)
+
         self.m01_break_button = ActionButton(USER_BUTTONS)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.m01_break_button.setObjectName(u"m01_break_button")
-        sizePolicy.setHorizontalStretch(0)
+        sizePolicy1.setHeightForWidth(self.m01_break_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.m01_break_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.m01_break_button.sizePolicy().hasHeightForWidth())
+        self.m01_break_button.setMinimumSize(QSize(135, 42))
-        self.m01_break_button.setSizePolicy(sizePolicy)
+        self.m01_break_button.setMaximumSize(QSize(16777215, 42))
-        self.m01_break_button.setMinimumSize(QtCore.QSize(135, 42))
+        self.m01_break_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-        self.m01_break_button.setMaximumSize(QtCore.QSize(16777215, 42))
+        self.m01_break_button.setStyleSheet(u"QPushButton {\n"
-        self.m01_break_button.setFocusPolicy(QtCore.Qt.NoFocus)
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.m01_break_button.setStyleSheet("QPushButton {\n"
-"       font: 15pt \"Bebas Kai\";\n"
 "}")
         self.m01_break_button.setCheckable(True)
-        self.m01_break_button.setObjectName("m01_break_button")
+
         self.gridLayout.addWidget(self.m01_break_button, 3, 2, 1, 1)
+
         self.flood_button = ActionButton(USER_BUTTONS)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.flood_button.setObjectName(u"flood_button")
-        sizePolicy.setHorizontalStretch(0)
+        sizePolicy1.setHeightForWidth(self.flood_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.flood_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.flood_button.sizePolicy().hasHeightForWidth())
+        self.flood_button.setMinimumSize(QSize(135, 42))
-        self.flood_button.setSizePolicy(sizePolicy)
+        self.flood_button.setMaximumSize(QSize(16777215, 42))
-        self.flood_button.setMinimumSize(QtCore.QSize(135, 42))
+        self.flood_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-        self.flood_button.setMaximumSize(QtCore.QSize(16777215, 42))
+        self.flood_button.setStyleSheet(u"QPushButton {\n"
-        self.flood_button.setFocusPolicy(QtCore.Qt.NoFocus)
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.flood_button.setStyleSheet("QPushButton {\n"
-"       font: 15pt \"Bebas Kai\";\n"
 "}")
         self.flood_button.setCheckable(True)
-        self.flood_button.setObjectName("flood_button")
+
         self.gridLayout.addWidget(self.flood_button, 2, 0, 1, 1)
+
         self.single_block_button = ActionButton(USER_BUTTONS)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.single_block_button.setObjectName(u"single_block_button")
-        sizePolicy.setHorizontalStretch(0)
+        sizePolicy1.setHeightForWidth(self.single_block_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.single_block_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.single_block_button.sizePolicy().hasHeightForWidth())
+        self.single_block_button.setMinimumSize(QSize(135, 42))
-        self.single_block_button.setSizePolicy(sizePolicy)
+        self.single_block_button.setMaximumSize(QSize(16777215, 42))
-        self.single_block_button.setMinimumSize(QtCore.QSize(135, 42))
+        self.single_block_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-        self.single_block_button.setMaximumSize(QtCore.QSize(16777215, 42))
+        self.single_block_button.setStyleSheet(u"QPushButton {\n"
-        self.single_block_button.setFocusPolicy(QtCore.Qt.NoFocus)
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.single_block_button.setStyleSheet("QPushButton {\n"
-"       font: 15pt \"Bebas Kai\";\n"
 "}")
-        self.single_block_button.setObjectName("single_block_button")
+
         self.gridLayout.addWidget(self.single_block_button, 1, 2, 1, 1)
+
         self.mist_button = ActionButton(USER_BUTTONS)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.mist_button.setObjectName(u"mist_button")
-        sizePolicy.setHorizontalStretch(1)
+        sizePolicy2 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy2.setHorizontalStretch(1)
-        sizePolicy.setHeightForWidth(self.mist_button.sizePolicy().hasHeightForWidth())
+        sizePolicy2.setVerticalStretch(0)
-        self.mist_button.setSizePolicy(sizePolicy)
+        sizePolicy2.setHeightForWidth(self.mist_button.sizePolicy().hasHeightForWidth())
-        self.mist_button.setMinimumSize(QtCore.QSize(135, 42))
+        self.mist_button.setSizePolicy(sizePolicy2)
-        self.mist_button.setMaximumSize(QtCore.QSize(16777215, 42))
+        self.mist_button.setMinimumSize(QSize(135, 42))
-        self.mist_button.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.mist_button.setMaximumSize(QSize(16777215, 42))
-        self.mist_button.setStyleSheet("QPushButton {\n"
+        self.mist_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-"       font: 15pt \"Bebas Kai\";\n"
+        self.mist_button.setStyleSheet(u"QPushButton {\n"
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
 "}")
         self.mist_button.setCheckable(True)
-        self.mist_button.setObjectName("mist_button")
+
         self.gridLayout.addWidget(self.mist_button, 3, 0, 1, 1)
+
         self.feed_hold_button = ActionButton(USER_BUTTONS)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.feed_hold_button.setObjectName(u"feed_hold_button")
-        sizePolicy.setHorizontalStretch(0)
+        sizePolicy1.setHeightForWidth(self.feed_hold_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.feed_hold_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.feed_hold_button.sizePolicy().hasHeightForWidth())
+        self.feed_hold_button.setMinimumSize(QSize(135, 42))
-        self.feed_hold_button.setSizePolicy(sizePolicy)
+        self.feed_hold_button.setMaximumSize(QSize(16777215, 42))
-        self.feed_hold_button.setMinimumSize(QtCore.QSize(135, 42))
+        self.feed_hold_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-        self.feed_hold_button.setMaximumSize(QtCore.QSize(16777215, 42))
+        self.feed_hold_button.setStyleSheet(u"QPushButton {\n"
-        self.feed_hold_button.setFocusPolicy(QtCore.Qt.NoFocus)
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.feed_hold_button.setStyleSheet("QPushButton {\n"
-"       font: 15pt \"Bebas Kai\";\n"
 "}")
         self.feed_hold_button.setCheckable(True)
-        self.feed_hold_button.setObjectName("feed_hold_button")
+
         self.gridLayout.addWidget(self.feed_hold_button, 0, 2, 1, 1)
+
         self.clear_program_button = ActionButton(USER_BUTTONS)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.clear_program_button.setObjectName(u"clear_program_button")
-        sizePolicy.setHorizontalStretch(0)
+        sizePolicy1.setHeightForWidth(self.clear_program_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.clear_program_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.clear_program_button.sizePolicy().hasHeightForWidth())
+        self.clear_program_button.setMinimumSize(QSize(135, 42))
-        self.clear_program_button.setSizePolicy(sizePolicy)
+        self.clear_program_button.setMaximumSize(QSize(16777215, 42))
-        self.clear_program_button.setMinimumSize(QtCore.QSize(135, 42))
+        self.clear_program_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-        self.clear_program_button.setMaximumSize(QtCore.QSize(16777215, 42))
+        self.clear_program_button.setStyleSheet(u"QPushButton {\n"
-        self.clear_program_button.setFocusPolicy(QtCore.Qt.NoFocus)
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.clear_program_button.setStyleSheet("QPushButton {\n"
-"       font: 15pt \"Bebas Kai\";\n"
 "}")
         self.clear_program_button.setCheckable(False)
-        self.clear_program_button.setObjectName("clear_program_button")
+
         self.gridLayout.addWidget(self.clear_program_button, 1, 0, 1, 1)
+
         self.reload_program_button = ActionButton(USER_BUTTONS)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        self.reload_program_button.setObjectName(u"reload_program_button")
-        sizePolicy.setHorizontalStretch(0)
+        sizePolicy1.setHeightForWidth(self.reload_program_button.sizePolicy().hasHeightForWidth())
-        sizePolicy.setVerticalStretch(0)
+        self.reload_program_button.setSizePolicy(sizePolicy1)
-        sizePolicy.setHeightForWidth(self.reload_program_button.sizePolicy().hasHeightForWidth())
+        self.reload_program_button.setMinimumSize(QSize(135, 42))
-        self.reload_program_button.setSizePolicy(sizePolicy)
+        self.reload_program_button.setMaximumSize(QSize(16777215, 42))
-        self.reload_program_button.setMinimumSize(QtCore.QSize(135, 42))
+        self.reload_program_button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
-        self.reload_program_button.setMaximumSize(QtCore.QSize(16777215, 42))
+        self.reload_program_button.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
-        self.reload_program_button.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.reload_program_button.setStyleSheet(u"QPushButton {\n"
-        self.reload_program_button.setLayoutDirection(QtCore.Qt.LeftToRight)
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
-        self.reload_program_button.setStyleSheet("QPushButton {\n"
-"       font: 15pt \"Bebas Kai\";\n"
 "}")
         self.reload_program_button.setCheckable(False)
-        self.reload_program_button.setObjectName("reload_program_button")
+
         self.gridLayout.addWidget(self.reload_program_button, 0, 0, 1, 1)
-        self.label = QtWidgets.QLabel(USER_BUTTONS)
+
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        self.label = QLabel(USER_BUTTONS)
-        sizePolicy.setHorizontalStretch(1)
+        self.label.setObjectName(u"label")
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy3 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+        sizePolicy3.setHorizontalStretch(1)
-        self.label.setSizePolicy(sizePolicy)
+        sizePolicy3.setVerticalStretch(0)
-        self.label.setObjectName("label")
+        sizePolicy3.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+        self.label.setSizePolicy(sizePolicy3)
+
         self.gridLayout.addWidget(self.label, 0, 1, 1, 1)
-        self.label_2 = QtWidgets.QLabel(USER_BUTTONS)
+
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        self.label_2 = QLabel(USER_BUTTONS)
-        sizePolicy.setHorizontalStretch(1)
+        self.label_2.setObjectName(u"label_2")
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy3.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
-        sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
+        self.label_2.setSizePolicy(sizePolicy3)
-        self.label_2.setSizePolicy(sizePolicy)
+
-        self.label_2.setObjectName("label_2")
         self.gridLayout.addWidget(self.label_2, 1, 1, 1, 1)
-        self.label_3 = QtWidgets.QLabel(USER_BUTTONS)
+
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        self.label_3 = QLabel(USER_BUTTONS)
-        sizePolicy.setHorizontalStretch(1)
+        self.label_3.setObjectName(u"label_3")
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy3.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth())
-        sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth())
+        self.label_3.setSizePolicy(sizePolicy3)
-        self.label_3.setSizePolicy(sizePolicy)
+
-        self.label_3.setObjectName("label_3")
         self.gridLayout.addWidget(self.label_3, 2, 1, 1, 1)
-        self.label_4 = QtWidgets.QLabel(USER_BUTTONS)
+
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        self.label_4 = QLabel(USER_BUTTONS)
-        sizePolicy.setHorizontalStretch(1)
+        self.label_4.setObjectName(u"label_4")
-        sizePolicy.setVerticalStretch(0)
+        sizePolicy3.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
-        sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
+        self.label_4.setSizePolicy(sizePolicy3)
-        self.label_4.setSizePolicy(sizePolicy)
+
-        self.label_4.setObjectName("label_4")
         self.gridLayout.addWidget(self.label_4, 3, 1, 1, 1)
 
+
         self.retranslateUi(USER_BUTTONS)
-        QtCore.QMetaObject.connectSlotsByName(USER_BUTTONS)
+
+        QMetaObject.connectSlotsByName(USER_BUTTONS)
+    # setupUi
 
     def retranslateUi(self, USER_BUTTONS):
-        _translate = QtCore.QCoreApplication.translate
+        USER_BUTTONS.setWindowTitle(QCoreApplication.translate("USER_BUTTONS", u"User Buttons", None))
-        USER_BUTTONS.setWindowTitle(_translate("USER_BUTTONS", "User Buttons"))
+        self.block_delete_button.setText(QCoreApplication.translate("USER_BUTTONS", u"BLOCK DELETE", None))
-        self.block_delete_button.setText(_translate("USER_BUTTONS", "BLOCK DELETE"))
+        self.block_delete_button.setProperty(u"actionName", QCoreApplication.translate("USER_BUTTONS", u"program.block-delete.toggle", None))
-        self.block_delete_button.setProperty("actionName", _translate("USER_BUTTONS", "program.block-delete.toggle"))
+        self.m01_break_button.setText(QCoreApplication.translate("USER_BUTTONS", u"M01 BREAK", None))
-        self.m01_break_button.setText(_translate("USER_BUTTONS", "M01 BREAK"))
+        self.m01_break_button.setProperty(u"actionName", QCoreApplication.translate("USER_BUTTONS", u"program.optional-stop.toggle", None))
-        self.m01_break_button.setProperty("actionName", _translate("USER_BUTTONS", "program.optional-stop.toggle"))
+        self.flood_button.setText(QCoreApplication.translate("USER_BUTTONS", u"FLOOD", None))
-        self.flood_button.setText(_translate("USER_BUTTONS", "Flood"))
+        self.flood_button.setProperty(u"actionName", QCoreApplication.translate("USER_BUTTONS", u"coolant.flood.toggle", None))
-        self.flood_button.setProperty("actionName", _translate("USER_BUTTONS", "coolant.flood.toggle"))
+        self.single_block_button.setText(QCoreApplication.translate("USER_BUTTONS", u"SINGLE BLOCK", None))
-        self.single_block_button.setText(_translate("USER_BUTTONS", "SINGLE BLOCK"))
+        self.single_block_button.setProperty(u"actionName", QCoreApplication.translate("USER_BUTTONS", u"program.step", None))
-        self.single_block_button.setProperty("actionName", _translate("USER_BUTTONS", "program.step"))
+        self.mist_button.setText(QCoreApplication.translate("USER_BUTTONS", u"MIST", None))
-        self.mist_button.setText(_translate("USER_BUTTONS", "Mist"))
+        self.mist_button.setProperty(u"actionName", QCoreApplication.translate("USER_BUTTONS", u"coolant.mist.toggle", None))
-        self.mist_button.setProperty("actionName", _translate("USER_BUTTONS", "coolant.mist.toggle"))
+        self.feed_hold_button.setText(QCoreApplication.translate("USER_BUTTONS", u"FEED HOLD", None))
-        self.feed_hold_button.setText(_translate("USER_BUTTONS", "FEED HOLD"))
+        self.feed_hold_button.setProperty(u"rules", QCoreApplication.translate("USER_BUTTONS", u"[{\"channels\": [{\"url\": \"status:interp_state?text\", \"trigger\": true}], \"property\": \"Checked\", \"expression\": \"ch[0] == 'Paused'\", \"name\": \"check when paused\"}]", None))
-        self.feed_hold_button.setProperty("rules", _translate("USER_BUTTONS", "[{\"channels\": [{\"url\": \"status:interp_state?text\", \"trigger\": true}], \"property\": \"Checked\", \"expression\": \"ch[0] == \'Paused\'\", \"name\": \"check when paused\"}]"))
+        self.feed_hold_button.setProperty(u"actionName", QCoreApplication.translate("USER_BUTTONS", u"program.pause", None))
-        self.feed_hold_button.setProperty("actionName", _translate("USER_BUTTONS", "program.pause"))
+        self.clear_program_button.setText(QCoreApplication.translate("USER_BUTTONS", u"CLEAR PGM", None))
-        self.clear_program_button.setText(_translate("USER_BUTTONS", "CLEAR PGM"))
+        self.clear_program_button.setProperty(u"actionName", QCoreApplication.translate("USER_BUTTONS", u"program.clear", None))
-        self.clear_program_button.setProperty("actionName", _translate("USER_BUTTONS", "program.clear"))
+        self.reload_program_button.setText(QCoreApplication.translate("USER_BUTTONS", u"RELOAD PGM", None))
-        self.reload_program_button.setText(_translate("USER_BUTTONS", "RELOAD PGM"))
+        self.reload_program_button.setProperty(u"actionName", QCoreApplication.translate("USER_BUTTONS", u"program.reload", None))
-        self.reload_program_button.setProperty("actionName", _translate("USER_BUTTONS", "program.reload"))
+    # retranslateUi
-from qtpyvcp.widgets.button_widgets.action_button import ActionButton
+

user_dro_display/user_dros/dros_user.py

@@ -1,23 +1,47 @@
 import os
+import sys
+sys.path.insert(0, "/usr/lib/python3/dist-packages/probe_basic")
+from probe_basic_rc import *
 import linuxcnc
 
-from qtpy import uic
+from PySide6.QtCore import Qt
-from qtpy.QtCore import Qt
+from PySide6.QtWidgets import QWidget
-from qtpy.QtWidgets import QWidget
 
 from qtpyvcp.plugins import getPlugin
 from qtpyvcp.utilities import logger
+from qtpyvcp.utilities.runtime_ui_loader import load_ui as load_runtime_ui
 
 LOG = logger.getLogger(__name__)
 
-STATUS = getPlugin('status')
+# Detect if we're running in Qt Designer
-TOOL_TABLE = getPlugin('tooltable')
+IN_DESIGNER = os.getenv('DESIGNER', False)
 
-INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME'))
+# Defer plugin imports to avoid issues in designer
+STATUS = None
+TOOL_TABLE = None
+
+def _get_status():
+    global STATUS
+    if STATUS is None:
+        STATUS = getPlugin('status')
+    return STATUS
+
+def _get_tool_table():
+    global TOOL_TABLE
+    if TOOL_TABLE is None:
+        TOOL_TABLE = getPlugin('tooltable')
+    return TOOL_TABLE
+
+INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME')) if not IN_DESIGNER else None
+
+
+def _load_ui(ui_path, parent):
+    return load_runtime_ui(ui_path, parent)
 
 
 class UserDRO(QWidget):
     def __init__(self, parent=None):
         super(UserDRO, self).__init__(parent)
         ui_file = os.path.splitext(os.path.basename(__file__))[0] + ".ui"
-        uic.loadUi(os.path.join(os.path.dirname(__file__), ui_file), self)
+        ui_path = os.path.join(os.path.dirname(__file__), ui_file)
+        self.ui = _load_ui(ui_path, self)

user_dro_display/user_dros/dros_user.ui

@@ -20,7 +20,7 @@
    <string>dros_user</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="c_axis_dro_layout_2">
    <property name="spacing">
@@ -97,14 +97,14 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 14pt &quot;Bebas Kai&quot;;
+   	font: 14pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -137,7 +137,7 @@
 ]</string>
           </property>
           <property name="MDICommand" stdset="0">
-           <string>G10 L20 P{ch[0]} X0.0 Y0.0 Z0.0 A0.0 B0.0</string>
+           <string>G10 L20 P{ch[0]} X0.0 Y0.0 Z0.0 A0.0 B0.0 C0.0</string>
           </property>
          </widget>
         </item>
@@ -172,10 +172,10 @@
 }</string>
           </property>
           <property name="frameShape">
-           <enum>QFrame::StyledPanel</enum>
+           <enum>QFrame::Shape::StyledPanel</enum>
           </property>
           <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
+           <enum>QFrame::Shadow::Raised</enum>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_103">
            <property name="spacing">
@@ -210,12 +210,12 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
     padding-left: 6px;
 }</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
              <property name="rules" stdset="0">
               <string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:g5x_index?text&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;ch[0] + ' WORK'\n&quot;, &quot;name&quot;: &quot;WCS Header&quot;}]</string>
@@ -248,14 +248,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>MACHINE</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -282,14 +282,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>DTG</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -317,11 +317,11 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -378,14 +378,14 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -438,33 +438,17 @@
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-          </property>
-          <property name="text">
-           <string>     0.000</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
@@ -484,6 +468,9 @@
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -506,28 +493,8 @@
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -547,6 +514,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -569,20 +539,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -602,6 +560,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -625,11 +586,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -686,11 +647,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -743,34 +704,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>1</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -793,28 +744,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -834,6 +765,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -856,20 +790,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -889,6 +811,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -912,11 +837,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -973,11 +898,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1030,34 +955,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>2</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1080,28 +995,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1121,6 +1016,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1143,20 +1041,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1176,6 +1062,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1199,11 +1088,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1260,11 +1149,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1316,34 +1205,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>3</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1366,28 +1245,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1407,6 +1266,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1429,20 +1291,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1462,6 +1312,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1485,11 +1338,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1546,11 +1399,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1603,30 +1456,17 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
@@ -1646,6 +1486,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1668,28 +1511,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1709,6 +1532,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1731,20 +1557,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1764,6 +1578,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1787,11 +1604,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1848,11 +1665,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1905,30 +1722,17 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
@@ -1948,6 +1752,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1970,28 +1777,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -2011,6 +1798,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -2033,20 +1823,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -2066,6 +1844,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -2089,11 +1870,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">

user_dro_display/xyz_dros/dros_xyz.py

@@ -1,23 +1,47 @@
 import os
+import sys
+sys.path.insert(0, "/usr/lib/python3/dist-packages/probe_basic")
+from probe_basic_rc import *
 import linuxcnc
 
-from qtpy import uic
+from PySide6.QtCore import Qt
-from qtpy.QtCore import Qt
+from PySide6.QtWidgets import QWidget
-from qtpy.QtWidgets import QWidget
 
 from qtpyvcp.plugins import getPlugin
 from qtpyvcp.utilities import logger
+from qtpyvcp.utilities.runtime_ui_loader import load_ui as load_runtime_ui
 
 LOG = logger.getLogger(__name__)
 
-STATUS = getPlugin('status')
+# Detect if we're running in Qt Designer
-TOOL_TABLE = getPlugin('tooltable')
+IN_DESIGNER = os.getenv('DESIGNER', False)
 
-INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME'))
+# Defer plugin imports to avoid issues in designer
+STATUS = None
+TOOL_TABLE = None
+
+def _get_status():
+    global STATUS
+    if STATUS is None:
+        STATUS = getPlugin('status')
+    return STATUS
+
+def _get_tool_table():
+    global TOOL_TABLE
+    if TOOL_TABLE is None:
+        TOOL_TABLE = getPlugin('tooltable')
+    return TOOL_TABLE
+
+INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME')) if not IN_DESIGNER else None
+
+
+def _load_ui(ui_path, parent):
+    return load_runtime_ui(ui_path, parent)
 
 
 class UserDRO(QWidget):
     def __init__(self, parent=None):
         super(UserDRO, self).__init__(parent)
         ui_file = os.path.splitext(os.path.basename(__file__))[0] + ".ui"
-        uic.loadUi(os.path.join(os.path.dirname(__file__), ui_file), self)
+        ui_path = os.path.join(os.path.dirname(__file__), ui_file)
+        self.ui = _load_ui(ui_path, self)

user_dro_display/xyz_dros/dros_xyz.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>469</width>
+    <width>461</width>
     <height>286</height>
    </rect>
   </property>
@@ -20,7 +20,7 @@
    <string>dros_xyz</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -74,7 +74,7 @@
          <number>1</number>
         </property>
         <item>
-         <widget class="QFrame" name="frame">
+         <widget class="QFrame" name="xyz_header_frame">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
             <horstretch>0</horstretch>
@@ -104,10 +104,10 @@
 }</string>
           </property>
           <property name="frameShape">
-           <enum>QFrame::StyledPanel</enum>
+           <enum>QFrame::Shape::StyledPanel</enum>
           </property>
           <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
+           <enum>QFrame::Shadow::Raised</enum>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_136">
            <property name="spacing">
@@ -142,7 +142,7 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
     padding-left: 1px;
     padding-right: 20px;
 }</string>
@@ -151,7 +151,7 @@
               <string>AXIS</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
              <property name="rules" stdset="0">
               <string>[]</string>
@@ -181,12 +181,12 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
     padding-left: 6px;
 }</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
              <property name="rules" stdset="0">
               <string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:g5x_index?text&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;ch[0] + ' WORK'\n&quot;, &quot;name&quot;: &quot;WCS Header&quot;}]</string>
@@ -219,14 +219,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>MACHINE</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -253,14 +253,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>DTG</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -287,7 +287,7 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
     padding-left: 6px;
 }</string>
              </property>
@@ -295,7 +295,7 @@
               <string>REF</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
              <property name="rules" stdset="0">
               <string>[]</string>
@@ -348,14 +348,14 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -408,36 +408,23 @@
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="text">
-           <string>     0.000</string>
+           <string/>
           </property>
           <property name="cursorPosition">
-           <number>10</number>
+           <number>0</number>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
@@ -457,6 +444,9 @@
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -479,28 +469,8 @@
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -520,6 +490,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -542,20 +515,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -575,6 +536,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -598,11 +562,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -659,11 +623,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -716,34 +680,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>1</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -766,28 +720,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -807,6 +741,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -829,20 +766,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -862,6 +787,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -885,11 +813,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -946,11 +874,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1003,34 +931,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>2</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1053,28 +971,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1094,6 +992,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1116,20 +1017,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1149,6 +1038,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1172,11 +1064,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1193,7 +1085,7 @@ QLabel[style=&quot;homing&quot;]{
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="layout">
+       <layout class="QHBoxLayout" name="layout_ref_zero">
         <property name="spacing">
          <number>20</number>
         </property>
@@ -1233,14 +1125,14 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1294,11 +1186,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">

user_dro_display/xyz_dros/offset_dros_xyz.ui

@@ -20,11 +20,11 @@
    <string>offset_dros_xyz</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QHBoxLayout" name="x_axis_dro_layout">
+    <layout class="QHBoxLayout" name="x_axis_dro_offsets_layout">
      <property name="spacing">
       <number>12</number>
      </property>
@@ -52,11 +52,11 @@
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -110,14 +110,14 @@
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>X</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -143,27 +143,20 @@
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+       </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
        </property>
       </widget>
      </item>
@@ -187,28 +180,8 @@
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -228,6 +201,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -250,23 +226,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -289,23 +257,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -328,29 +288,21 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="y_axis_dro_layout">
+    <layout class="QHBoxLayout" name="y_axis_dro_offsets_layout">
      <property name="spacing">
       <number>12</number>
      </property>
@@ -378,11 +330,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -430,14 +382,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>Y</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -463,31 +415,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>1</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -510,28 +455,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -551,6 +476,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -573,23 +501,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -612,23 +532,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -651,29 +563,21 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="z_axis_dro_layout">
+    <layout class="QHBoxLayout" name="z_axis_dro_offsets_layout">
      <property name="spacing">
       <number>12</number>
      </property>
@@ -701,11 +605,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -753,14 +657,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>Z</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -786,31 +690,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>2</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -833,28 +730,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -874,6 +751,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -896,23 +776,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -935,23 +807,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -974,23 +838,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:tool_offset&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;tool offset&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>

user_dro_display/xyz_dros/offset_dros_xyz_ui.py

@@ -1,560 +1,415 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/buildbot/buildbot/worker/probe_basic-dev/sources/debian/python3-probe-basic/usr/share/configs/machine_setup_files/user_dro_display/xyz_dros/offset_dros_xyz.ui'
+################################################################################
-#
+## Form generated from reading UI file 'offset_dros_xyz.ui'
-# Created by: PyQt5 UI code generator 5.15.9
+##
-#
+## Created by: Qt User Interface Compiler version 6.8.2
-# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+##
-# run again.  Do not edit this file unless you know what you are doing.
+## WARNING! All changes made in this file will be lost when recompiling UI file!
+################################################################################
 
+from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
+    QMetaObject, QObject, QPoint, QRect,
+    QSize, QTime, QUrl, Qt)
+from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
+    QFont, QFontDatabase, QGradient, QIcon,
+    QImage, QKeySequence, QLinearGradient, QPainter,
+    QPalette, QPixmap, QRadialGradient, QTransform)
+from PySide6.QtWidgets import (QApplication, QHBoxLayout, QLabel, QSizePolicy,
+    QVBoxLayout, QWidget)
 
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_offset_dros_xyz(object):
-    def setupUi(self, offset_dros_xyz):
-        offset_dros_xyz.setObjectName("offset_dros_xyz")
-        offset_dros_xyz.resize(493, 150)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(offset_dros_xyz.sizePolicy().hasHeightForWidth())
-        offset_dros_xyz.setSizePolicy(sizePolicy)
-        offset_dros_xyz.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.verticalLayout = QtWidgets.QVBoxLayout(offset_dros_xyz)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.x_axis_dro_layout = QtWidgets.QHBoxLayout()
-        self.x_axis_dro_layout.setContentsMargins(-1, 1, -1, 1)
-        self.x_axis_dro_layout.setSpacing(12)
-        self.x_axis_dro_layout.setObjectName("x_axis_dro_layout")
-        self.zero_x_button_offset = MDIButton(offset_dros_xyz)
-        self.zero_x_button_offset.setEnabled(False)
-        self.zero_x_button_offset.setMinimumSize(QtCore.QSize(55, 38))
-        self.zero_x_button_offset.setMaximumSize(QtCore.QSize(55, 38))
-        self.zero_x_button_offset.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.zero_x_button_offset.setStyleSheet("MDIButton {\n"
-"       font: 15pt \"Bebas Kai\";\n"
-"}")
-        self.zero_x_button_offset.setObjectName("zero_x_button_offset")
-        self.x_axis_dro_layout.addWidget(self.zero_x_button_offset)
-        self.axis_label_x = QtWidgets.QLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.axis_label_x.sizePolicy().hasHeightForWidth())
-        self.axis_label_x.setSizePolicy(sizePolicy)
-        self.axis_label_x.setMinimumSize(QtCore.QSize(45, 35))
-        self.axis_label_x.setMaximumSize(QtCore.QSize(45, 35))
-        self.axis_label_x.setStyleSheet("QLabel{\n"
-"    border-style: solid;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: rgb(238, 238, 236);\n"
-"    font: 18pt \"Bebas Kai\";\n"
-"}")
-        self.axis_label_x.setAlignment(QtCore.Qt.AlignCenter)
-        self.axis_label_x.setObjectName("axis_label_x")
-        self.x_axis_dro_layout.addWidget(self.axis_label_x)
-        self.dro_entry_offset_x = DROLineEdit(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.dro_entry_offset_x.sizePolicy().hasHeightForWidth())
-        self.dro_entry_offset_x.setSizePolicy(sizePolicy)
-        self.dro_entry_offset_x.setMinimumSize(QtCore.QSize(0, 38))
-        self.dro_entry_offset_x.setMaximumSize(QtCore.QSize(16777215, 38))
-        font = QtGui.QFont()
-        font.setFamily("Bebas Kai")
-        font.setPointSize(17)
-        font.setBold(False)
-        font.setItalic(False)
-        font.setWeight(50)
-        self.dro_entry_offset_x.setFont(font)
-        self.dro_entry_offset_x.setStyleSheet("QLineEdit{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    padding-right: 2px;\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.dro_entry_offset_x.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.dro_entry_offset_x.setObjectName("dro_entry_offset_x")
-        self.x_axis_dro_layout.addWidget(self.dro_entry_offset_x)
-        self.drolabel_work_x = DROLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.drolabel_work_x.sizePolicy().hasHeightForWidth())
-        self.drolabel_work_x.setSizePolicy(sizePolicy)
-        self.drolabel_work_x.setMinimumSize(QtCore.QSize(0, 38))
-        self.drolabel_work_x.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.drolabel_work_x.setStyleSheet("QLabel{\n"
-"    border-style: transparent;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"    padding-right: 2px;\n"
-"}\n"
-"\n"
-"QLabel[style=\"unhomed\"]{\n"
-"   color: red;\n"
-"}\n"
-"\n"
-"QLabel[style=\"homing\"]{\n"
-"   color: rgb(196, 160, 0);\n"
-"}")
-        self.drolabel_work_x.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.drolabel_work_x.setProperty("referenceType", 0)
-        self.drolabel_work_x.setProperty("axisNumber", 0)
-        self.drolabel_work_x.setProperty("latheMode", 0)
-        self.drolabel_work_x.setObjectName("drolabel_work_x")
-        self.x_axis_dro_layout.addWidget(self.drolabel_work_x)
-        self.work_offset_x = StatusLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.work_offset_x.sizePolicy().hasHeightForWidth())
-        self.work_offset_x.setSizePolicy(sizePolicy)
-        self.work_offset_x.setMinimumSize(QtCore.QSize(0, 38))
-        self.work_offset_x.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.work_offset_x.setStyleSheet("StatusLabel{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.work_offset_x.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.work_offset_x.setObjectName("work_offset_x")
-        self.x_axis_dro_layout.addWidget(self.work_offset_x)
-        self.g52_g92_x = StatusLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.g52_g92_x.sizePolicy().hasHeightForWidth())
-        self.g52_g92_x.setSizePolicy(sizePolicy)
-        self.g52_g92_x.setMinimumSize(QtCore.QSize(0, 38))
-        self.g52_g92_x.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.g52_g92_x.setStyleSheet("StatusLabel{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.g52_g92_x.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.g52_g92_x.setObjectName("g52_g92_x")
-        self.x_axis_dro_layout.addWidget(self.g52_g92_x)
-        self.tool_offset_x = StatusLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.tool_offset_x.sizePolicy().hasHeightForWidth())
-        self.tool_offset_x.setSizePolicy(sizePolicy)
-        self.tool_offset_x.setMinimumSize(QtCore.QSize(0, 38))
-        self.tool_offset_x.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.tool_offset_x.setStyleSheet("StatusLabel{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.tool_offset_x.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.tool_offset_x.setObjectName("tool_offset_x")
-        self.x_axis_dro_layout.addWidget(self.tool_offset_x)
-        self.verticalLayout.addLayout(self.x_axis_dro_layout)
-        self.y_axis_dro_layout = QtWidgets.QHBoxLayout()
-        self.y_axis_dro_layout.setContentsMargins(-1, 1, -1, 1)
-        self.y_axis_dro_layout.setSpacing(12)
-        self.y_axis_dro_layout.setObjectName("y_axis_dro_layout")
-        self.zero_y_button_offset = MDIButton(offset_dros_xyz)
-        self.zero_y_button_offset.setEnabled(False)
-        self.zero_y_button_offset.setMinimumSize(QtCore.QSize(55, 38))
-        self.zero_y_button_offset.setMaximumSize(QtCore.QSize(55, 38))
-        self.zero_y_button_offset.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.zero_y_button_offset.setStyleSheet("MDIButton {\n"
-"       font: 15pt \"Bebas Kai\";\n"
-"}")
-        self.zero_y_button_offset.setObjectName("zero_y_button_offset")
-        self.y_axis_dro_layout.addWidget(self.zero_y_button_offset)
-        self.axis_label_y = QtWidgets.QLabel(offset_dros_xyz)
-        self.axis_label_y.setMinimumSize(QtCore.QSize(45, 35))
-        self.axis_label_y.setMaximumSize(QtCore.QSize(45, 35))
-        self.axis_label_y.setStyleSheet("QLabel{\n"
-"    border-style: solid;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: rgb(238, 238, 236);\n"
-"    font: 18pt \"Bebas Kai\";\n"
-"}")
-        self.axis_label_y.setAlignment(QtCore.Qt.AlignCenter)
-        self.axis_label_y.setObjectName("axis_label_y")
-        self.y_axis_dro_layout.addWidget(self.axis_label_y)
-        self.dro_entry_offset_y = DROLineEdit(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.dro_entry_offset_y.sizePolicy().hasHeightForWidth())
-        self.dro_entry_offset_y.setSizePolicy(sizePolicy)
-        self.dro_entry_offset_y.setMinimumSize(QtCore.QSize(0, 38))
-        self.dro_entry_offset_y.setMaximumSize(QtCore.QSize(16777215, 38))
-        font = QtGui.QFont()
-        font.setFamily("Bebas Kai")
-        font.setPointSize(17)
-        font.setBold(False)
-        font.setItalic(False)
-        font.setWeight(50)
-        self.dro_entry_offset_y.setFont(font)
-        self.dro_entry_offset_y.setStyleSheet("QLineEdit{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    padding-right: 2px;\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.dro_entry_offset_y.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.dro_entry_offset_y.setProperty("axisNumber", 1)
-        self.dro_entry_offset_y.setObjectName("dro_entry_offset_y")
-        self.y_axis_dro_layout.addWidget(self.dro_entry_offset_y)
-        self.drolabel_work_y = DROLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.drolabel_work_y.sizePolicy().hasHeightForWidth())
-        self.drolabel_work_y.setSizePolicy(sizePolicy)
-        self.drolabel_work_y.setMinimumSize(QtCore.QSize(0, 38))
-        self.drolabel_work_y.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.drolabel_work_y.setStyleSheet("QLabel{\n"
-"    border-style: transparent;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"    padding-right: 2px;\n"
-"}\n"
-"\n"
-"QLabel[style=\"unhomed\"]{\n"
-"   color: red;\n"
-"}\n"
-"\n"
-"QLabel[style=\"homing\"]{\n"
-"   color: rgb(196, 160, 0);\n"
-"}")
-        self.drolabel_work_y.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.drolabel_work_y.setProperty("referenceType", 0)
-        self.drolabel_work_y.setProperty("axisNumber", 1)
-        self.drolabel_work_y.setProperty("latheMode", 0)
-        self.drolabel_work_y.setObjectName("drolabel_work_y")
-        self.y_axis_dro_layout.addWidget(self.drolabel_work_y)
-        self.work_offset_y = StatusLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.work_offset_y.sizePolicy().hasHeightForWidth())
-        self.work_offset_y.setSizePolicy(sizePolicy)
-        self.work_offset_y.setMinimumSize(QtCore.QSize(0, 38))
-        self.work_offset_y.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.work_offset_y.setStyleSheet("StatusLabel{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.work_offset_y.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.work_offset_y.setObjectName("work_offset_y")
-        self.y_axis_dro_layout.addWidget(self.work_offset_y)
-        self.g52_g92_y = StatusLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.g52_g92_y.sizePolicy().hasHeightForWidth())
-        self.g52_g92_y.setSizePolicy(sizePolicy)
-        self.g52_g92_y.setMinimumSize(QtCore.QSize(0, 38))
-        self.g52_g92_y.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.g52_g92_y.setStyleSheet("StatusLabel{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.g52_g92_y.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.g52_g92_y.setObjectName("g52_g92_y")
-        self.y_axis_dro_layout.addWidget(self.g52_g92_y)
-        self.tool_offset_y = StatusLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.tool_offset_y.sizePolicy().hasHeightForWidth())
-        self.tool_offset_y.setSizePolicy(sizePolicy)
-        self.tool_offset_y.setMinimumSize(QtCore.QSize(0, 38))
-        self.tool_offset_y.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.tool_offset_y.setStyleSheet("StatusLabel{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.tool_offset_y.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.tool_offset_y.setObjectName("tool_offset_y")
-        self.y_axis_dro_layout.addWidget(self.tool_offset_y)
-        self.verticalLayout.addLayout(self.y_axis_dro_layout)
-        self.z_axis_dro_layout = QtWidgets.QHBoxLayout()
-        self.z_axis_dro_layout.setContentsMargins(-1, 1, -1, 1)
-        self.z_axis_dro_layout.setSpacing(12)
-        self.z_axis_dro_layout.setObjectName("z_axis_dro_layout")
-        self.zero_z_button_offset = MDIButton(offset_dros_xyz)
-        self.zero_z_button_offset.setEnabled(False)
-        self.zero_z_button_offset.setMinimumSize(QtCore.QSize(55, 38))
-        self.zero_z_button_offset.setMaximumSize(QtCore.QSize(55, 38))
-        self.zero_z_button_offset.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.zero_z_button_offset.setStyleSheet("MDIButton {\n"
-"       font: 15pt \"Bebas Kai\";\n"
-"}")
-        self.zero_z_button_offset.setObjectName("zero_z_button_offset")
-        self.z_axis_dro_layout.addWidget(self.zero_z_button_offset)
-        self.axis_label_z = QtWidgets.QLabel(offset_dros_xyz)
-        self.axis_label_z.setMinimumSize(QtCore.QSize(45, 35))
-        self.axis_label_z.setMaximumSize(QtCore.QSize(45, 35))
-        self.axis_label_z.setStyleSheet("QLabel{\n"
-"    border-style: solid;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: rgb(238, 238, 236);\n"
-"    font: 18pt \"Bebas Kai\";\n"
-"}")
-        self.axis_label_z.setAlignment(QtCore.Qt.AlignCenter)
-        self.axis_label_z.setObjectName("axis_label_z")
-        self.z_axis_dro_layout.addWidget(self.axis_label_z)
-        self.dro_entry_offset_z = DROLineEdit(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.dro_entry_offset_z.sizePolicy().hasHeightForWidth())
-        self.dro_entry_offset_z.setSizePolicy(sizePolicy)
-        self.dro_entry_offset_z.setMinimumSize(QtCore.QSize(0, 38))
-        self.dro_entry_offset_z.setMaximumSize(QtCore.QSize(16777215, 38))
-        font = QtGui.QFont()
-        font.setFamily("Bebas Kai")
-        font.setPointSize(17)
-        font.setBold(False)
-        font.setItalic(False)
-        font.setWeight(50)
-        self.dro_entry_offset_z.setFont(font)
-        self.dro_entry_offset_z.setStyleSheet("QLineEdit{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    padding-right: 2px;\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.dro_entry_offset_z.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.dro_entry_offset_z.setProperty("axisNumber", 2)
-        self.dro_entry_offset_z.setObjectName("dro_entry_offset_z")
-        self.z_axis_dro_layout.addWidget(self.dro_entry_offset_z)
-        self.drolabel_work_z = DROLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.drolabel_work_z.sizePolicy().hasHeightForWidth())
-        self.drolabel_work_z.setSizePolicy(sizePolicy)
-        self.drolabel_work_z.setMinimumSize(QtCore.QSize(0, 38))
-        self.drolabel_work_z.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.drolabel_work_z.setStyleSheet("QLabel{\n"
-"    border-style: transparent;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"    padding-right: 2px;\n"
-"}\n"
-"\n"
-"QLabel[style=\"unhomed\"]{\n"
-"   color: red;\n"
-"}\n"
-"\n"
-"QLabel[style=\"homing\"]{\n"
-"   color: rgb(196, 160, 0);\n"
-"}")
-        self.drolabel_work_z.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.drolabel_work_z.setProperty("referenceType", 0)
-        self.drolabel_work_z.setProperty("axisNumber", 2)
-        self.drolabel_work_z.setProperty("latheMode", 0)
-        self.drolabel_work_z.setObjectName("drolabel_work_z")
-        self.z_axis_dro_layout.addWidget(self.drolabel_work_z)
-        self.work_offset_z = StatusLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.work_offset_z.sizePolicy().hasHeightForWidth())
-        self.work_offset_z.setSizePolicy(sizePolicy)
-        self.work_offset_z.setMinimumSize(QtCore.QSize(0, 38))
-        self.work_offset_z.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.work_offset_z.setStyleSheet("StatusLabel{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.work_offset_z.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.work_offset_z.setObjectName("work_offset_z")
-        self.z_axis_dro_layout.addWidget(self.work_offset_z)
-        self.g52_g92_z = StatusLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.g52_g92_z.sizePolicy().hasHeightForWidth())
-        self.g52_g92_z.setSizePolicy(sizePolicy)
-        self.g52_g92_z.setMinimumSize(QtCore.QSize(0, 38))
-        self.g52_g92_z.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.g52_g92_z.setStyleSheet("StatusLabel{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.g52_g92_z.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.g52_g92_z.setObjectName("g52_g92_z")
-        self.z_axis_dro_layout.addWidget(self.g52_g92_z)
-        self.tool_offset_z = StatusLabel(offset_dros_xyz)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(1)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.tool_offset_z.sizePolicy().hasHeightForWidth())
-        self.tool_offset_z.setSizePolicy(sizePolicy)
-        self.tool_offset_z.setMinimumSize(QtCore.QSize(0, 38))
-        self.tool_offset_z.setMaximumSize(QtCore.QSize(16777215, 38))
-        self.tool_offset_z.setStyleSheet("StatusLabel{\n"
-"    border-style: transparant;\n"
-"    border-color: rgb(235, 235, 235);\n"
-"    border-width: 1px;\n"
-"    border-radius: 5px;\n"
-"    color: black;\n"
-"    background: rgb(235, 235, 235);\n"
-"    font: 17pt \"Bebas Kai\";\n"
-"}")
-        self.tool_offset_z.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.tool_offset_z.setObjectName("tool_offset_z")
-        self.z_axis_dro_layout.addWidget(self.tool_offset_z)
-        self.verticalLayout.addLayout(self.z_axis_dro_layout)
-
-        self.retranslateUi(offset_dros_xyz)
-        QtCore.QMetaObject.connectSlotsByName(offset_dros_xyz)
-
-    def retranslateUi(self, offset_dros_xyz):
-        _translate = QtCore.QCoreApplication.translate
-        offset_dros_xyz.setWindowTitle(_translate("offset_dros_xyz", "offset_dros_xyz"))
-        self.zero_x_button_offset.setText(_translate("offset_dros_xyz", "ZERO"))
-        self.zero_x_button_offset.setProperty("rules", _translate("offset_dros_xyz", "[\n"
-"    {\n"
-"        \"channels\": [\n"
-"            {\n"
-"                \"url\": \"status:g5x_index\",\n"
-"                \"trigger\": true,\n"
-"                \"type\": \"int\"\n"
-"            }\n"
-"        ],\n"
-"        \"expression\": \"\",\n"
-"        \"name\": \"G5x Index\",\n"
-"        \"property\": \"None\"\n"
-"    }\n"
-"]"))
-        self.zero_x_button_offset.setProperty("MDICommand", _translate("offset_dros_xyz", "G10 L20 P{ch[0]} X0.0"))
-        self.axis_label_x.setText(_translate("offset_dros_xyz", "X"))
-        self.drolabel_work_x.setProperty("inchFormat", _translate("offset_dros_xyz", "%9.4f"))
-        self.drolabel_work_x.setProperty("millimeterFormat", _translate("offset_dros_xyz", "%10.3f"))
-        self.drolabel_work_x.setProperty("degreeFormat", _translate("offset_dros_xyz", "%10.2f"))
-        self.work_offset_x.setProperty("rules", _translate("offset_dros_xyz", "[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g5x_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][0])\", \"name\": \"New Rule\"}]"))
-        self.g52_g92_x.setProperty("rules", _translate("offset_dros_xyz", "[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g92_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][0])\", \"name\": \"New Rule\"}]"))
-        self.tool_offset_x.setProperty("rules", _translate("offset_dros_xyz", "[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:tool_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][0])\", \"name\": \"New Rule\"}]"))
-        self.zero_y_button_offset.setText(_translate("offset_dros_xyz", "ZERO"))
-        self.zero_y_button_offset.setProperty("rules", _translate("offset_dros_xyz", "[\n"
-"    {\n"
-"        \"channels\": [\n"
-"            {\n"
-"                \"url\": \"status:g5x_index\",\n"
-"                \"trigger\": true,\n"
-"                \"type\": \"int\"\n"
-"            }\n"
-"        ],\n"
-"        \"expression\": \"\",\n"
-"        \"name\": \"G5x Index\",\n"
-"        \"property\": \"None\"\n"
-"    }\n"
-"]"))
-        self.zero_y_button_offset.setProperty("MDICommand", _translate("offset_dros_xyz", "G10 L20 P{ch[0]} Y0.0"))
-        self.axis_label_y.setText(_translate("offset_dros_xyz", "Y"))
-        self.drolabel_work_y.setProperty("inchFormat", _translate("offset_dros_xyz", "%9.4f"))
-        self.drolabel_work_y.setProperty("millimeterFormat", _translate("offset_dros_xyz", "%10.3f"))
-        self.drolabel_work_y.setProperty("degreeFormat", _translate("offset_dros_xyz", "%10.2f"))
-        self.work_offset_y.setProperty("rules", _translate("offset_dros_xyz", "[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g5x_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][1])\", \"name\": \"New Rule\"}]"))
-        self.g52_g92_y.setProperty("rules", _translate("offset_dros_xyz", "[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g92_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][1])\", \"name\": \"New Rule\"}]"))
-        self.tool_offset_y.setProperty("rules", _translate("offset_dros_xyz", "[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:tool_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][1])\", \"name\": \"New Rule\"}]"))
-        self.zero_z_button_offset.setText(_translate("offset_dros_xyz", "ZERO"))
-        self.zero_z_button_offset.setProperty("rules", _translate("offset_dros_xyz", "[\n"
-"    {\n"
-"        \"channels\": [\n"
-"            {\n"
-"                \"url\": \"status:g5x_index\",\n"
-"                \"trigger\": true,\n"
-"                \"type\": \"int\"\n"
-"            }\n"
-"        ],\n"
-"        \"expression\": \"\",\n"
-"        \"name\": \"G5x Index\",\n"
-"        \"property\": \"None\"\n"
-"    }\n"
-"]"))
-        self.zero_z_button_offset.setProperty("MDICommand", _translate("offset_dros_xyz", "G10 L20 P{ch[0]} Z0.0"))
-        self.axis_label_z.setText(_translate("offset_dros_xyz", "Z"))
-        self.drolabel_work_z.setProperty("inchFormat", _translate("offset_dros_xyz", "%9.4f"))
-        self.drolabel_work_z.setProperty("millimeterFormat", _translate("offset_dros_xyz", "%10.3f"))
-        self.drolabel_work_z.setProperty("degreeFormat", _translate("offset_dros_xyz", "%10.2f"))
-        self.work_offset_z.setProperty("rules", _translate("offset_dros_xyz", "[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g5x_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][2])\", \"name\": \"New Rule\"}]"))
-        self.g52_g92_z.setProperty("rules", _translate("offset_dros_xyz", "[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g92_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][2])\", \"name\": \"New Rule\"}]"))
-        self.tool_offset_z.setProperty("rules", _translate("offset_dros_xyz", "[{\"channels\": [{\"url\": \"status:tool_offset\", \"trigger\": true}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][2])\", \"name\": \"tool offset\"}]"))
 from qtpyvcp.widgets.button_widgets.mdi_button import MDIButton
 from qtpyvcp.widgets.display_widgets.dro_label import DROLabel
 from qtpyvcp.widgets.display_widgets.status_label import StatusLabel
 from qtpyvcp.widgets.input_widgets.dro_line_edit import DROLineEdit
 import probe_basic_rc
+
+class Ui_offset_dros_xyz(object):
+    def setupUi(self, offset_dros_xyz):
+        if not offset_dros_xyz.objectName():
+            offset_dros_xyz.setObjectName(u"offset_dros_xyz")
+        offset_dros_xyz.resize(493, 150)
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(offset_dros_xyz.sizePolicy().hasHeightForWidth())
+        offset_dros_xyz.setSizePolicy(sizePolicy)
+        offset_dros_xyz.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
+        self.verticalLayout = QVBoxLayout(offset_dros_xyz)
+        self.verticalLayout.setObjectName(u"verticalLayout")
+        self.x_axis_dro_offsets_layout = QHBoxLayout()
+        self.x_axis_dro_offsets_layout.setSpacing(12)
+        self.x_axis_dro_offsets_layout.setObjectName(u"x_axis_dro_offsets_layout")
+        self.x_axis_dro_offsets_layout.setContentsMargins(-1, 1, -1, 1)
+        self.zero_x_button_offset = MDIButton(offset_dros_xyz)
+        self.zero_x_button_offset.setObjectName(u"zero_x_button_offset")
+        self.zero_x_button_offset.setEnabled(False)
+        self.zero_x_button_offset.setMinimumSize(QSize(55, 38))
+        self.zero_x_button_offset.setMaximumSize(QSize(55, 38))
+        self.zero_x_button_offset.setFocusPolicy(Qt.FocusPolicy.NoFocus)
+        self.zero_x_button_offset.setStyleSheet(u"MDIButton {\n"
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
+"}")
+
+        self.x_axis_dro_offsets_layout.addWidget(self.zero_x_button_offset)
+
+        self.axis_label_x = QLabel(offset_dros_xyz)
+        self.axis_label_x.setObjectName(u"axis_label_x")
+        sizePolicy.setHeightForWidth(self.axis_label_x.sizePolicy().hasHeightForWidth())
+        self.axis_label_x.setSizePolicy(sizePolicy)
+        self.axis_label_x.setMinimumSize(QSize(45, 35))
+        self.axis_label_x.setMaximumSize(QSize(45, 35))
+        self.axis_label_x.setStyleSheet(u"QLabel{\n"
+"    border-style: solid;\n"
+"    border-color: rgb(235, 235, 235);\n"
+"    border-width: 1px;\n"
+"    border-radius: 5px;\n"
+"    color: rgb(238, 238, 236);\n"
+"	font: 18pt \"Probe Basic Bebas Mono\";\n"
+"}")
+        self.axis_label_x.setAlignment(Qt.AlignmentFlag.AlignCenter)
+
+        self.x_axis_dro_offsets_layout.addWidget(self.axis_label_x)
+
+        self.dro_entry_offset_x = DROLineEdit(offset_dros_xyz)
+        self.dro_entry_offset_x.setObjectName(u"dro_entry_offset_x")
+        sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred)
+        sizePolicy1.setHorizontalStretch(1)
+        sizePolicy1.setVerticalStretch(0)
+        sizePolicy1.setHeightForWidth(self.dro_entry_offset_x.sizePolicy().hasHeightForWidth())
+        self.dro_entry_offset_x.setSizePolicy(sizePolicy1)
+        self.dro_entry_offset_x.setMinimumSize(QSize(0, 38))
+        self.dro_entry_offset_x.setMaximumSize(QSize(16777215, 38))
+        font = QFont()
+        font.setFamilies([u"Probe Basic Bebas Mono"])
+        font.setPointSize(17)
+        font.setBold(False)
+        font.setItalic(False)
+        self.dro_entry_offset_x.setFont(font)
+        self.dro_entry_offset_x.setFocusPolicy(Qt.FocusPolicy.ClickFocus)
+        self.dro_entry_offset_x.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+
+        self.x_axis_dro_offsets_layout.addWidget(self.dro_entry_offset_x)
+
+        self.drolabel_work_x = DROLabel(offset_dros_xyz)
+        self.drolabel_work_x.setObjectName(u"drolabel_work_x")
+        sizePolicy1.setHeightForWidth(self.drolabel_work_x.sizePolicy().hasHeightForWidth())
+        self.drolabel_work_x.setSizePolicy(sizePolicy1)
+        self.drolabel_work_x.setMinimumSize(QSize(0, 38))
+        self.drolabel_work_x.setMaximumSize(QSize(16777215, 38))
+        self.drolabel_work_x.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+        self.drolabel_work_x.setProperty(u"referenceType", 0)
+        self.drolabel_work_x.setProperty(u"axisNumber", 0)
+        self.drolabel_work_x.setProperty(u"latheMode", 0)
+
+        self.x_axis_dro_offsets_layout.addWidget(self.drolabel_work_x)
+
+        self.work_offset_x = StatusLabel(offset_dros_xyz)
+        self.work_offset_x.setObjectName(u"work_offset_x")
+        sizePolicy1.setHeightForWidth(self.work_offset_x.sizePolicy().hasHeightForWidth())
+        self.work_offset_x.setSizePolicy(sizePolicy1)
+        self.work_offset_x.setMinimumSize(QSize(0, 38))
+        self.work_offset_x.setMaximumSize(QSize(16777215, 38))
+        self.work_offset_x.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+
+        self.x_axis_dro_offsets_layout.addWidget(self.work_offset_x)
+
+        self.g52_g92_x = StatusLabel(offset_dros_xyz)
+        self.g52_g92_x.setObjectName(u"g52_g92_x")
+        sizePolicy1.setHeightForWidth(self.g52_g92_x.sizePolicy().hasHeightForWidth())
+        self.g52_g92_x.setSizePolicy(sizePolicy1)
+        self.g52_g92_x.setMinimumSize(QSize(0, 38))
+        self.g52_g92_x.setMaximumSize(QSize(16777215, 38))
+        self.g52_g92_x.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+
+        self.x_axis_dro_offsets_layout.addWidget(self.g52_g92_x)
+
+        self.tool_offset_x = StatusLabel(offset_dros_xyz)
+        self.tool_offset_x.setObjectName(u"tool_offset_x")
+        sizePolicy1.setHeightForWidth(self.tool_offset_x.sizePolicy().hasHeightForWidth())
+        self.tool_offset_x.setSizePolicy(sizePolicy1)
+        self.tool_offset_x.setMinimumSize(QSize(0, 38))
+        self.tool_offset_x.setMaximumSize(QSize(16777215, 38))
+        self.tool_offset_x.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+
+        self.x_axis_dro_offsets_layout.addWidget(self.tool_offset_x)
+
+
+        self.verticalLayout.addLayout(self.x_axis_dro_offsets_layout)
+
+        self.y_axis_dro_offsets_layout = QHBoxLayout()
+        self.y_axis_dro_offsets_layout.setSpacing(12)
+        self.y_axis_dro_offsets_layout.setObjectName(u"y_axis_dro_offsets_layout")
+        self.y_axis_dro_offsets_layout.setContentsMargins(-1, 1, -1, 1)
+        self.zero_y_button_offset = MDIButton(offset_dros_xyz)
+        self.zero_y_button_offset.setObjectName(u"zero_y_button_offset")
+        self.zero_y_button_offset.setEnabled(False)
+        self.zero_y_button_offset.setMinimumSize(QSize(55, 38))
+        self.zero_y_button_offset.setMaximumSize(QSize(55, 38))
+        self.zero_y_button_offset.setFocusPolicy(Qt.FocusPolicy.NoFocus)
+        self.zero_y_button_offset.setStyleSheet(u"MDIButton {\n"
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
+"}")
+
+        self.y_axis_dro_offsets_layout.addWidget(self.zero_y_button_offset)
+
+        self.axis_label_y = QLabel(offset_dros_xyz)
+        self.axis_label_y.setObjectName(u"axis_label_y")
+        self.axis_label_y.setMinimumSize(QSize(45, 35))
+        self.axis_label_y.setMaximumSize(QSize(45, 35))
+        self.axis_label_y.setStyleSheet(u"QLabel{\n"
+"    border-style: solid;\n"
+"    border-color: rgb(235, 235, 235);\n"
+"    border-width: 1px;\n"
+"    border-radius: 5px;\n"
+"    color: rgb(238, 238, 236);\n"
+"	font: 18pt \"Probe Basic Bebas Mono\";\n"
+"}")
+        self.axis_label_y.setAlignment(Qt.AlignmentFlag.AlignCenter)
+
+        self.y_axis_dro_offsets_layout.addWidget(self.axis_label_y)
+
+        self.dro_entry_offset_y = DROLineEdit(offset_dros_xyz)
+        self.dro_entry_offset_y.setObjectName(u"dro_entry_offset_y")
+        sizePolicy1.setHeightForWidth(self.dro_entry_offset_y.sizePolicy().hasHeightForWidth())
+        self.dro_entry_offset_y.setSizePolicy(sizePolicy1)
+        self.dro_entry_offset_y.setMinimumSize(QSize(0, 38))
+        self.dro_entry_offset_y.setMaximumSize(QSize(16777215, 38))
+        self.dro_entry_offset_y.setFont(font)
+        self.dro_entry_offset_y.setFocusPolicy(Qt.FocusPolicy.ClickFocus)
+        self.dro_entry_offset_y.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+        self.dro_entry_offset_y.setProperty(u"axisNumber", 1)
+
+        self.y_axis_dro_offsets_layout.addWidget(self.dro_entry_offset_y)
+
+        self.drolabel_work_y = DROLabel(offset_dros_xyz)
+        self.drolabel_work_y.setObjectName(u"drolabel_work_y")
+        sizePolicy1.setHeightForWidth(self.drolabel_work_y.sizePolicy().hasHeightForWidth())
+        self.drolabel_work_y.setSizePolicy(sizePolicy1)
+        self.drolabel_work_y.setMinimumSize(QSize(0, 38))
+        self.drolabel_work_y.setMaximumSize(QSize(16777215, 38))
+        self.drolabel_work_y.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+        self.drolabel_work_y.setProperty(u"referenceType", 0)
+        self.drolabel_work_y.setProperty(u"axisNumber", 1)
+        self.drolabel_work_y.setProperty(u"latheMode", 0)
+
+        self.y_axis_dro_offsets_layout.addWidget(self.drolabel_work_y)
+
+        self.work_offset_y = StatusLabel(offset_dros_xyz)
+        self.work_offset_y.setObjectName(u"work_offset_y")
+        sizePolicy1.setHeightForWidth(self.work_offset_y.sizePolicy().hasHeightForWidth())
+        self.work_offset_y.setSizePolicy(sizePolicy1)
+        self.work_offset_y.setMinimumSize(QSize(0, 38))
+        self.work_offset_y.setMaximumSize(QSize(16777215, 38))
+        self.work_offset_y.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+
+        self.y_axis_dro_offsets_layout.addWidget(self.work_offset_y)
+
+        self.g52_g92_y = StatusLabel(offset_dros_xyz)
+        self.g52_g92_y.setObjectName(u"g52_g92_y")
+        sizePolicy1.setHeightForWidth(self.g52_g92_y.sizePolicy().hasHeightForWidth())
+        self.g52_g92_y.setSizePolicy(sizePolicy1)
+        self.g52_g92_y.setMinimumSize(QSize(0, 38))
+        self.g52_g92_y.setMaximumSize(QSize(16777215, 38))
+        self.g52_g92_y.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+
+        self.y_axis_dro_offsets_layout.addWidget(self.g52_g92_y)
+
+        self.tool_offset_y = StatusLabel(offset_dros_xyz)
+        self.tool_offset_y.setObjectName(u"tool_offset_y")
+        sizePolicy1.setHeightForWidth(self.tool_offset_y.sizePolicy().hasHeightForWidth())
+        self.tool_offset_y.setSizePolicy(sizePolicy1)
+        self.tool_offset_y.setMinimumSize(QSize(0, 38))
+        self.tool_offset_y.setMaximumSize(QSize(16777215, 38))
+        self.tool_offset_y.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+
+        self.y_axis_dro_offsets_layout.addWidget(self.tool_offset_y)
+
+
+        self.verticalLayout.addLayout(self.y_axis_dro_offsets_layout)
+
+        self.z_axis_dro_offsets_layout = QHBoxLayout()
+        self.z_axis_dro_offsets_layout.setSpacing(12)
+        self.z_axis_dro_offsets_layout.setObjectName(u"z_axis_dro_offsets_layout")
+        self.z_axis_dro_offsets_layout.setContentsMargins(-1, 1, -1, 1)
+        self.zero_z_button_offset = MDIButton(offset_dros_xyz)
+        self.zero_z_button_offset.setObjectName(u"zero_z_button_offset")
+        self.zero_z_button_offset.setEnabled(False)
+        self.zero_z_button_offset.setMinimumSize(QSize(55, 38))
+        self.zero_z_button_offset.setMaximumSize(QSize(55, 38))
+        self.zero_z_button_offset.setFocusPolicy(Qt.FocusPolicy.NoFocus)
+        self.zero_z_button_offset.setStyleSheet(u"MDIButton {\n"
+"   	font: 15pt \"Probe Basic Bebas Mono\";\n"
+"}")
+
+        self.z_axis_dro_offsets_layout.addWidget(self.zero_z_button_offset)
+
+        self.axis_label_z = QLabel(offset_dros_xyz)
+        self.axis_label_z.setObjectName(u"axis_label_z")
+        self.axis_label_z.setMinimumSize(QSize(45, 35))
+        self.axis_label_z.setMaximumSize(QSize(45, 35))
+        self.axis_label_z.setStyleSheet(u"QLabel{\n"
+"    border-style: solid;\n"
+"    border-color: rgb(235, 235, 235);\n"
+"    border-width: 1px;\n"
+"    border-radius: 5px;\n"
+"    color: rgb(238, 238, 236);\n"
+"	font: 18pt \"Probe Basic Bebas Mono\";\n"
+"}")
+        self.axis_label_z.setAlignment(Qt.AlignmentFlag.AlignCenter)
+
+        self.z_axis_dro_offsets_layout.addWidget(self.axis_label_z)
+
+        self.dro_entry_offset_z = DROLineEdit(offset_dros_xyz)
+        self.dro_entry_offset_z.setObjectName(u"dro_entry_offset_z")
+        sizePolicy1.setHeightForWidth(self.dro_entry_offset_z.sizePolicy().hasHeightForWidth())
+        self.dro_entry_offset_z.setSizePolicy(sizePolicy1)
+        self.dro_entry_offset_z.setMinimumSize(QSize(0, 38))
+        self.dro_entry_offset_z.setMaximumSize(QSize(16777215, 38))
+        self.dro_entry_offset_z.setFont(font)
+        self.dro_entry_offset_z.setFocusPolicy(Qt.FocusPolicy.ClickFocus)
+        self.dro_entry_offset_z.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+        self.dro_entry_offset_z.setProperty(u"axisNumber", 2)
+
+        self.z_axis_dro_offsets_layout.addWidget(self.dro_entry_offset_z)
+
+        self.drolabel_work_z = DROLabel(offset_dros_xyz)
+        self.drolabel_work_z.setObjectName(u"drolabel_work_z")
+        sizePolicy1.setHeightForWidth(self.drolabel_work_z.sizePolicy().hasHeightForWidth())
+        self.drolabel_work_z.setSizePolicy(sizePolicy1)
+        self.drolabel_work_z.setMinimumSize(QSize(0, 38))
+        self.drolabel_work_z.setMaximumSize(QSize(16777215, 38))
+        self.drolabel_work_z.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+        self.drolabel_work_z.setProperty(u"referenceType", 0)
+        self.drolabel_work_z.setProperty(u"axisNumber", 2)
+        self.drolabel_work_z.setProperty(u"latheMode", 0)
+
+        self.z_axis_dro_offsets_layout.addWidget(self.drolabel_work_z)
+
+        self.work_offset_z = StatusLabel(offset_dros_xyz)
+        self.work_offset_z.setObjectName(u"work_offset_z")
+        sizePolicy1.setHeightForWidth(self.work_offset_z.sizePolicy().hasHeightForWidth())
+        self.work_offset_z.setSizePolicy(sizePolicy1)
+        self.work_offset_z.setMinimumSize(QSize(0, 38))
+        self.work_offset_z.setMaximumSize(QSize(16777215, 38))
+        self.work_offset_z.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+
+        self.z_axis_dro_offsets_layout.addWidget(self.work_offset_z)
+
+        self.g52_g92_z = StatusLabel(offset_dros_xyz)
+        self.g52_g92_z.setObjectName(u"g52_g92_z")
+        sizePolicy1.setHeightForWidth(self.g52_g92_z.sizePolicy().hasHeightForWidth())
+        self.g52_g92_z.setSizePolicy(sizePolicy1)
+        self.g52_g92_z.setMinimumSize(QSize(0, 38))
+        self.g52_g92_z.setMaximumSize(QSize(16777215, 38))
+        self.g52_g92_z.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+
+        self.z_axis_dro_offsets_layout.addWidget(self.g52_g92_z)
+
+        self.tool_offset_z = StatusLabel(offset_dros_xyz)
+        self.tool_offset_z.setObjectName(u"tool_offset_z")
+        sizePolicy1.setHeightForWidth(self.tool_offset_z.sizePolicy().hasHeightForWidth())
+        self.tool_offset_z.setSizePolicy(sizePolicy1)
+        self.tool_offset_z.setMinimumSize(QSize(0, 38))
+        self.tool_offset_z.setMaximumSize(QSize(16777215, 38))
+        self.tool_offset_z.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
+
+        self.z_axis_dro_offsets_layout.addWidget(self.tool_offset_z)
+
+
+        self.verticalLayout.addLayout(self.z_axis_dro_offsets_layout)
+
+
+        self.retranslateUi(offset_dros_xyz)
+
+        QMetaObject.connectSlotsByName(offset_dros_xyz)
+    # setupUi
+
+    def retranslateUi(self, offset_dros_xyz):
+        offset_dros_xyz.setWindowTitle(QCoreApplication.translate("offset_dros_xyz", u"offset_dros_xyz", None))
+        self.zero_x_button_offset.setText(QCoreApplication.translate("offset_dros_xyz", u"ZERO", None))
+        self.zero_x_button_offset.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[\n"
+"    {\n"
+"        \"channels\": [\n"
+"            {\n"
+"                \"url\": \"status:g5x_index\",\n"
+"                \"trigger\": true,\n"
+"                \"type\": \"int\"\n"
+"            }\n"
+"        ],\n"
+"        \"expression\": \"\",\n"
+"        \"name\": \"G5x Index\",\n"
+"        \"property\": \"None\"\n"
+"    }\n"
+"]", None))
+        self.zero_x_button_offset.setProperty(u"MDICommand", QCoreApplication.translate("offset_dros_xyz", u"G10 L20 P{ch[0]} X0.0", None))
+        self.axis_label_x.setText(QCoreApplication.translate("offset_dros_xyz", u"X", None))
+        self.dro_entry_offset_x.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.drolabel_work_x.setProperty(u"inchFormat", QCoreApplication.translate("offset_dros_xyz", u"%9.4f", None))
+        self.drolabel_work_x.setProperty(u"millimeterFormat", QCoreApplication.translate("offset_dros_xyz", u"%10.3f", None))
+        self.drolabel_work_x.setProperty(u"degreeFormat", QCoreApplication.translate("offset_dros_xyz", u"%10.2f", None))
+        self.drolabel_work_x.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.work_offset_x.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g5x_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][0])\", \"name\": \"New Rule\"}]", None))
+        self.work_offset_x.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.g52_g92_x.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g92_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][0])\", \"name\": \"New Rule\"}]", None))
+        self.g52_g92_x.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.tool_offset_x.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:tool_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][0])\", \"name\": \"New Rule\"}]", None))
+        self.tool_offset_x.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.zero_y_button_offset.setText(QCoreApplication.translate("offset_dros_xyz", u"ZERO", None))
+        self.zero_y_button_offset.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[\n"
+"    {\n"
+"        \"channels\": [\n"
+"            {\n"
+"                \"url\": \"status:g5x_index\",\n"
+"                \"trigger\": true,\n"
+"                \"type\": \"int\"\n"
+"            }\n"
+"        ],\n"
+"        \"expression\": \"\",\n"
+"        \"name\": \"G5x Index\",\n"
+"        \"property\": \"None\"\n"
+"    }\n"
+"]", None))
+        self.zero_y_button_offset.setProperty(u"MDICommand", QCoreApplication.translate("offset_dros_xyz", u"G10 L20 P{ch[0]} Y0.0", None))
+        self.axis_label_y.setText(QCoreApplication.translate("offset_dros_xyz", u"Y", None))
+        self.dro_entry_offset_y.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.drolabel_work_y.setProperty(u"inchFormat", QCoreApplication.translate("offset_dros_xyz", u"%9.4f", None))
+        self.drolabel_work_y.setProperty(u"millimeterFormat", QCoreApplication.translate("offset_dros_xyz", u"%10.3f", None))
+        self.drolabel_work_y.setProperty(u"degreeFormat", QCoreApplication.translate("offset_dros_xyz", u"%10.2f", None))
+        self.drolabel_work_y.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.work_offset_y.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g5x_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][1])\", \"name\": \"New Rule\"}]", None))
+        self.work_offset_y.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.g52_g92_y.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g92_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][1])\", \"name\": \"New Rule\"}]", None))
+        self.g52_g92_y.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.tool_offset_y.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:tool_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][1])\", \"name\": \"New Rule\"}]", None))
+        self.tool_offset_y.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.zero_z_button_offset.setText(QCoreApplication.translate("offset_dros_xyz", u"ZERO", None))
+        self.zero_z_button_offset.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[\n"
+"    {\n"
+"        \"channels\": [\n"
+"            {\n"
+"                \"url\": \"status:g5x_index\",\n"
+"                \"trigger\": true,\n"
+"                \"type\": \"int\"\n"
+"            }\n"
+"        ],\n"
+"        \"expression\": \"\",\n"
+"        \"name\": \"G5x Index\",\n"
+"        \"property\": \"None\"\n"
+"    }\n"
+"]", None))
+        self.zero_z_button_offset.setProperty(u"MDICommand", QCoreApplication.translate("offset_dros_xyz", u"G10 L20 P{ch[0]} Z0.0", None))
+        self.axis_label_z.setText(QCoreApplication.translate("offset_dros_xyz", u"Z", None))
+        self.dro_entry_offset_z.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.drolabel_work_z.setProperty(u"inchFormat", QCoreApplication.translate("offset_dros_xyz", u"%9.4f", None))
+        self.drolabel_work_z.setProperty(u"millimeterFormat", QCoreApplication.translate("offset_dros_xyz", u"%10.3f", None))
+        self.drolabel_work_z.setProperty(u"degreeFormat", QCoreApplication.translate("offset_dros_xyz", u"%10.2f", None))
+        self.drolabel_work_z.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.work_offset_z.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g5x_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][2])\", \"name\": \"New Rule\"}]", None))
+        self.work_offset_z.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.g52_g92_z.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[{\"channels\": [{\"trigger\": true, \"type\": \"tuple\", \"url\": \"status:g92_offset\"}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][2])\", \"name\": \"New Rule\"}]", None))
+        self.g52_g92_z.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+        self.tool_offset_z.setProperty(u"rules", QCoreApplication.translate("offset_dros_xyz", u"[{\"channels\": [{\"url\": \"status:tool_offset\", \"trigger\": true}], \"property\": \"Text\", \"expression\": \"\\\"{:.4f}\\\".format(ch[0][2])\", \"name\": \"tool offset\"}]", None))
+        self.tool_offset_z.setProperty(u"styleSet", QCoreApplication.translate("offset_dros_xyz", u"dataField17", None))
+    # retranslateUi
+

user_dro_display/xyza_dros/dros_xyza.py

@@ -1,23 +1,47 @@
 import os
+import sys
+sys.path.insert(0, "/usr/lib/python3/dist-packages/probe_basic")
+from probe_basic_rc import *
 import linuxcnc
 
-from qtpy import uic
+from PySide6.QtCore import Qt
-from qtpy.QtCore import Qt
+from PySide6.QtWidgets import QWidget
-from qtpy.QtWidgets import QWidget
 
 from qtpyvcp.plugins import getPlugin
 from qtpyvcp.utilities import logger
+from qtpyvcp.utilities.runtime_ui_loader import load_ui as load_runtime_ui
 
 LOG = logger.getLogger(__name__)
 
-STATUS = getPlugin('status')
+# Detect if we're running in Qt Designer
-TOOL_TABLE = getPlugin('tooltable')
+IN_DESIGNER = os.getenv('DESIGNER', False)
 
-INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME'))
+# Defer plugin imports to avoid issues in designer
+STATUS = None
+TOOL_TABLE = None
+
+def _get_status():
+    global STATUS
+    if STATUS is None:
+        STATUS = getPlugin('status')
+    return STATUS
+
+def _get_tool_table():
+    global TOOL_TABLE
+    if TOOL_TABLE is None:
+        TOOL_TABLE = getPlugin('tooltable')
+    return TOOL_TABLE
+
+INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME')) if not IN_DESIGNER else None
+
+
+def _load_ui(ui_path, parent):
+    return load_runtime_ui(ui_path, parent)
 
 
 class UserDRO(QWidget):
     def __init__(self, parent=None):
         super(UserDRO, self).__init__(parent)
         ui_file = os.path.splitext(os.path.basename(__file__))[0] + ".ui"
-        uic.loadUi(os.path.join(os.path.dirname(__file__), ui_file), self)
+        ui_path = os.path.join(os.path.dirname(__file__), ui_file)
+        self.ui = _load_ui(ui_path, self)

user_dro_display/xyza_dros/dros_xyza.ui

@@ -20,7 +20,7 @@
    <string>dros_xyza</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -104,10 +104,10 @@
 }</string>
           </property>
           <property name="frameShape">
-           <enum>QFrame::StyledPanel</enum>
+           <enum>QFrame::Shape::StyledPanel</enum>
           </property>
           <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
+           <enum>QFrame::Shadow::Raised</enum>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_144">
            <property name="spacing">
@@ -142,7 +142,7 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
     padding-left: 1px;
     padding-right: 20px;
 }</string>
@@ -151,7 +151,7 @@
               <string>AXIS</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
              <property name="rules" stdset="0">
               <string>[]</string>
@@ -181,12 +181,12 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
     padding-left: 6px;
 }</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
              <property name="rules" stdset="0">
               <string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:g5x_index?text&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;ch[0] + ' WORK'\n&quot;, &quot;name&quot;: &quot;WCS Header&quot;}]</string>
@@ -219,14 +219,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>MACHINE</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -253,14 +253,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>DTG</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -287,7 +287,7 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
     padding-left: 6px;
 }</string>
              </property>
@@ -295,7 +295,7 @@
               <string>REF</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
              <property name="rules" stdset="0">
               <string>[]</string>
@@ -348,14 +348,14 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -408,36 +408,20 @@
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-          </property>
-          <property name="text">
-           <string>     0.000</string>
           </property>
           <property name="cursorPosition">
-           <number>10</number>
+           <number>0</number>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
@@ -457,6 +441,9 @@
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -479,28 +466,8 @@
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -520,6 +487,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -542,20 +512,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -575,6 +533,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -598,11 +559,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -659,11 +620,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -716,34 +677,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>1</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -766,28 +717,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -807,6 +738,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -829,20 +763,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -862,6 +784,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -885,11 +810,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -946,11 +871,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1003,34 +928,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>2</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1053,28 +968,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1094,6 +989,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1116,20 +1014,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1149,6 +1035,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1172,11 +1061,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1233,11 +1122,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1289,34 +1178,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>3</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1339,28 +1218,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1380,6 +1239,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1402,20 +1264,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1435,6 +1285,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1458,11 +1311,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1519,14 +1372,14 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1580,11 +1433,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">

user_dro_display/xyza_dros/offset_dros_xyza.ui

@@ -20,7 +20,7 @@
    <string>offset_dros_xyza</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -67,11 +67,11 @@
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -125,14 +125,14 @@
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>X</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -158,27 +158,20 @@
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+       </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
        </property>
       </widget>
      </item>
@@ -202,28 +195,8 @@
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -243,6 +216,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -265,23 +241,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -304,23 +272,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -343,23 +303,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -393,11 +345,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -445,14 +397,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>Y</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -478,31 +430,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>1</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -525,28 +470,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -566,6 +491,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -588,23 +516,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -627,23 +547,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -666,23 +578,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -716,11 +620,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -768,14 +672,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>Z</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -801,31 +705,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>2</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -848,28 +745,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -889,6 +766,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -911,23 +791,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -950,23 +822,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -989,23 +853,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:tool_offset&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;tool offset&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -1039,11 +895,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -1090,14 +946,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>A</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -1123,31 +979,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>3</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1170,28 +1019,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -1211,6 +1040,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1233,23 +1065,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][3])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1272,23 +1096,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][3])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1311,23 +1127,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][3])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>

user_dro_display/xyzab_dros/dros_xyzab.py

@@ -1,23 +1,47 @@
 import os
+import sys
+sys.path.insert(0, "/usr/lib/python3/dist-packages/probe_basic")
+from probe_basic_rc import *
 import linuxcnc
 
-from qtpy import uic
+from PySide6.QtCore import Qt
-from qtpy.QtCore import Qt
+from PySide6.QtWidgets import QWidget
-from qtpy.QtWidgets import QWidget
 
 from qtpyvcp.plugins import getPlugin
 from qtpyvcp.utilities import logger
+from qtpyvcp.utilities.runtime_ui_loader import load_ui as load_runtime_ui
 
 LOG = logger.getLogger(__name__)
 
-STATUS = getPlugin('status')
+# Detect if we're running in Qt Designer
-TOOL_TABLE = getPlugin('tooltable')
+IN_DESIGNER = os.getenv('DESIGNER', False)
 
-INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME'))
+# Defer plugin imports to avoid issues in designer
+STATUS = None
+TOOL_TABLE = None
+
+def _get_status():
+    global STATUS
+    if STATUS is None:
+        STATUS = getPlugin('status')
+    return STATUS
+
+def _get_tool_table():
+    global TOOL_TABLE
+    if TOOL_TABLE is None:
+        TOOL_TABLE = getPlugin('tooltable')
+    return TOOL_TABLE
+
+INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME')) if not IN_DESIGNER else None
+
+
+def _load_ui(ui_path, parent):
+    return load_runtime_ui(ui_path, parent)
 
 
 class UserDRO(QWidget):
     def __init__(self, parent=None):
         super(UserDRO, self).__init__(parent)
         ui_file = os.path.splitext(os.path.basename(__file__))[0] + ".ui"
-        uic.loadUi(os.path.join(os.path.dirname(__file__), ui_file), self)
+        ui_path = os.path.join(os.path.dirname(__file__), ui_file)
+        self.ui = _load_ui(ui_path, self)

user_dro_display/xyzab_dros/dros_xyzab.ui

@@ -20,7 +20,7 @@
    <string>dros_xyzab</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -97,14 +97,14 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 14pt &quot;Bebas Kai&quot;;
+   	font: 14pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -172,10 +172,10 @@
 }</string>
           </property>
           <property name="frameShape">
-           <enum>QFrame::StyledPanel</enum>
+           <enum>QFrame::Shape::StyledPanel</enum>
           </property>
           <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
+           <enum>QFrame::Shadow::Raised</enum>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_103">
            <property name="spacing">
@@ -210,12 +210,12 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
     padding-left: 6px;
 }</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
              <property name="rules" stdset="0">
               <string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:g5x_index?text&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;ch[0] + ' WORK'\n&quot;, &quot;name&quot;: &quot;WCS Header&quot;}]</string>
@@ -248,14 +248,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>MACHINE</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -282,14 +282,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>DTG</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -317,11 +317,11 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -378,14 +378,14 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -438,33 +438,17 @@
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-          </property>
-          <property name="text">
-           <string>     0.000</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
@@ -484,6 +468,9 @@
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -506,28 +493,8 @@
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -547,6 +514,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -569,20 +539,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -602,6 +560,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -625,11 +586,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -686,11 +647,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -743,34 +704,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>1</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -793,28 +744,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -834,6 +765,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -856,20 +790,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -889,6 +811,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -912,11 +837,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -973,11 +898,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1030,34 +955,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>2</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1080,28 +995,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1121,6 +1016,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1143,20 +1041,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1176,6 +1062,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1199,11 +1088,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1260,11 +1149,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1316,34 +1205,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>3</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1366,28 +1245,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1407,6 +1266,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1429,20 +1291,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1462,6 +1312,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1485,11 +1338,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1546,11 +1399,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1603,30 +1456,17 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
@@ -1646,6 +1486,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1668,28 +1511,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1709,6 +1532,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1731,20 +1557,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1764,6 +1578,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1787,11 +1604,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">

user_dro_display/xyzab_dros/offset_dros_xyzab.ui

@@ -20,7 +20,7 @@
    <string>offset_dros_xyzab</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -67,11 +67,11 @@
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -125,14 +125,14 @@
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>X</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -158,27 +158,20 @@
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+       </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
        </property>
       </widget>
      </item>
@@ -202,28 +195,8 @@
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -243,6 +216,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -265,23 +241,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -304,23 +272,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -343,23 +303,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -393,11 +345,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -445,14 +397,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>Y</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -478,31 +430,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>1</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -525,28 +470,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -566,6 +491,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -588,23 +516,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -627,23 +547,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -666,23 +578,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -716,11 +620,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -768,14 +672,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>Z</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -801,31 +705,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>2</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -848,28 +745,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -889,6 +766,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -911,23 +791,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -950,23 +822,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -989,23 +853,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:tool_offset&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;tool offset&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -1039,11 +895,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -1090,14 +946,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>A</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -1123,31 +979,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>3</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1170,28 +1019,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -1211,6 +1040,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1233,23 +1065,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][3])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1272,23 +1096,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][3])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1311,23 +1127,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][3])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -1361,11 +1169,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -1413,14 +1221,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>B</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -1446,31 +1254,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>4</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1493,28 +1294,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -1534,6 +1315,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1556,23 +1340,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][4])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1595,23 +1371,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][4])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1634,23 +1402,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][4])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>

user_dro_display/xyzac_dros/dros_xyzac.py

@@ -1,12 +1,15 @@
 import os
+import sys
+sys.path.insert(0, "/usr/lib/python3/dist-packages/probe_basic")
+from probe_basic_rc import *
 import linuxcnc
 
-from qtpy import uic
+from PySide6.QtCore import Qt
-from qtpy.QtCore import Qt
+from PySide6.QtWidgets import QWidget
-from qtpy.QtWidgets import QWidget
 
 from qtpyvcp.plugins import getPlugin
 from qtpyvcp.utilities import logger
+from qtpyvcp.utilities.runtime_ui_loader import load_ui as load_runtime_ui
 
 LOG = logger.getLogger(__name__)
 
@@ -16,8 +19,13 @@ TOOL_TABLE = getPlugin('tooltable')
 INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME'))
 
 
+def _load_ui(ui_path, parent):
+    return load_runtime_ui(ui_path, parent)
+
+
 class UserDRO(QWidget):
     def __init__(self, parent=None):
         super(UserDRO, self).__init__(parent)
         ui_file = os.path.splitext(os.path.basename(__file__))[0] + ".ui"
-        uic.loadUi(os.path.join(os.path.dirname(__file__), ui_file), self)
+        ui_path = os.path.join(os.path.dirname(__file__), ui_file)
+        self.ui = _load_ui(ui_path, self)

user_dro_display/xyzac_dros/dros_xyzac.ui

@@ -20,7 +20,7 @@
    <string>dros_xyzac</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="y_axis_dro_layout_2">
    <property name="spacing">
@@ -45,7 +45,7 @@
        <number>4</number>
       </property>
       <property name="sizeConstraint">
-       <enum>QLayout::SetDefaultConstraint</enum>
+       <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
       </property>
       <property name="leftMargin">
        <number>0</number>
@@ -100,14 +100,14 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 14pt &quot;Bebas Kai&quot;;
+   	font: 14pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -175,10 +175,10 @@
 }</string>
           </property>
           <property name="frameShape">
-           <enum>QFrame::StyledPanel</enum>
+           <enum>QFrame::Shape::StyledPanel</enum>
           </property>
           <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
+           <enum>QFrame::Shadow::Raised</enum>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_131">
            <property name="spacing">
@@ -213,12 +213,12 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
     padding-left: 6px;
 }</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
              <property name="rules" stdset="0">
               <string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:g5x_index?text&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;ch[0] + ' WORK'\n&quot;, &quot;name&quot;: &quot;WCS Header&quot;}]</string>
@@ -251,14 +251,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>MACHINE</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -285,14 +285,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>DTG</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -320,11 +320,11 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -381,14 +381,14 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -441,33 +441,20 @@
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="text">
-           <string>     0.000</string>
+           <string/>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
@@ -487,6 +474,9 @@
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -509,28 +499,8 @@
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -550,6 +520,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -572,20 +545,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -605,6 +566,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -628,11 +592,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -689,11 +653,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -746,34 +710,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>1</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -796,28 +750,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -837,6 +771,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -859,20 +796,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -892,6 +817,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -915,11 +843,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -976,11 +904,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1033,34 +961,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>2</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1083,28 +1001,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1124,6 +1022,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1146,20 +1047,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1179,6 +1068,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1202,11 +1094,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1263,11 +1155,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1319,34 +1211,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>3</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1369,28 +1251,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1410,6 +1272,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1432,20 +1297,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1465,6 +1318,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1488,11 +1344,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1549,11 +1405,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1591,7 +1447,7 @@ QLabel[style=&quot;homing&quot;]{
          </widget>
         </item>
         <item>
-         <widget class="DROLineEdit" name="dro_entry_main_b">
+         <widget class="DROLineEdit" name="dro_entry_main_c">
           <property name="minimumSize">
            <size>
             <width>100</width>
@@ -1606,36 +1462,23 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
           </property>
           <property name="axisNumber" stdset="0">
-           <number>4</number>
+           <number>5</number>
           </property>
           <property name="inchFormat" stdset="0">
            <string>%9.4f</string>
@@ -1649,6 +1492,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1671,34 +1517,14 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
           </property>
           <property name="axisNumber" stdset="0">
-           <number>4</number>
+           <number>5</number>
           </property>
           <property name="inchFormat" stdset="0">
            <string>%9.4f</string>
@@ -1712,6 +1538,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1734,26 +1563,14 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
           </property>
           <property name="axisNumber" stdset="0">
-           <number>4</number>
+           <number>5</number>
           </property>
           <property name="inchFormat" stdset="0">
            <string>%9.4f</string>
@@ -1767,6 +1584,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1790,11 +1610,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">

user_dro_display/xyzac_dros/offset_dros_xyzac.ui

@@ -20,7 +20,7 @@
    <string>offset_dros_xyzac</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -67,11 +67,11 @@
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -125,14 +125,14 @@
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>X</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -156,29 +156,32 @@
          <height>38</height>
         </size>
        </property>
-       <property name="font">
+       <property name="focusPolicy">
-        <font>
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-         <family>Bebas Kai</family>
-         <pointsize>17</pointsize>
-         <weight>50</weight>
-         <italic>false</italic>
-         <bold>false</bold>
-        </font>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+       </property>
+       <property name="referenceType" stdset="0">
+        <number>1</number>
+       </property>
+       <property name="axisNumber" stdset="0">
+        <number>0</number>
+       </property>
+       <property name="inchFormat" stdset="0">
+        <string>%9.4f</string>
+       </property>
+       <property name="millimeterFormat" stdset="0">
+        <string>%10.3f</string>
+       </property>
+       <property name="degreeFormat" stdset="0">
+        <string>%10.2f</string>
+       </property>
+       <property name="latheMode" stdset="0">
+        <number>0</number>
+       </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
        </property>
       </widget>
      </item>
@@ -202,28 +205,8 @@
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -243,6 +226,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -265,23 +251,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -304,23 +282,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -343,23 +313,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][0])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -393,11 +355,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -445,14 +407,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>Y</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -478,31 +440,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>1</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -525,28 +480,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -566,6 +501,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -588,23 +526,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -627,23 +557,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -666,23 +588,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][1])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -716,11 +630,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -768,14 +682,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>Z</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -801,31 +715,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>2</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -848,28 +755,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -889,6 +776,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -911,23 +801,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -950,23 +832,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -989,23 +863,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:tool_offset&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][2])&quot;, &quot;name&quot;: &quot;tool offset&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -1039,11 +905,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -1090,14 +956,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>A</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -1123,31 +989,24 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="axisNumber" stdset="0">
         <number>3</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1170,28 +1029,8 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
@@ -1211,6 +1050,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1233,23 +1075,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][3])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1272,23 +1106,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][3])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1311,23 +1137,15 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
         <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][3])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -1361,11 +1179,11 @@ QLabel[style=&quot;homing&quot;]{
         </size>
        </property>
        <property name="focusPolicy">
-        <enum>Qt::NoFocus</enum>
+        <enum>Qt::FocusPolicy::NoFocus</enum>
        </property>
        <property name="styleSheet">
         <string notr="true">MDIButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
@@ -1413,14 +1231,14 @@ QLabel[style=&quot;homing&quot;]{
     border-width: 1px;
     border-radius: 5px;
     color: rgb(238, 238, 236);
-	font: 18pt &quot;Bebas Kai&quot;;
+	font: 18pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
        </property>
        <property name="text">
         <string>C</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignCenter</set>
+        <set>Qt::AlignmentFlag::AlignCenter</set>
        </property>
       </widget>
      </item>
@@ -1446,33 +1264,23 @@ QLabel[style=&quot;homing&quot;]{
        </property>
        <property name="font">
         <font>
-         <family>Bebas Kai</family>
+         <family>Probe Basic Bebas Mono</family>
          <pointsize>17</pointsize>
-         <weight>50</weight>
          <italic>false</italic>
          <bold>false</bold>
         </font>
        </property>
-       <property name="styleSheet">
+       <property name="focusPolicy">
-        <string notr="true">QLineEdit{
+        <enum>Qt::FocusPolicy::ClickFocus</enum>
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>1</number>
        </property>
        <property name="axisNumber" stdset="0">
-        <number>4</number>
+        <number>5</number>
        </property>
        <property name="inchFormat" stdset="0">
         <string>%9.4f</string>
@@ -1486,6 +1294,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1508,34 +1319,14 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="referenceType" stdset="0">
         <number>0</number>
        </property>
        <property name="axisNumber" stdset="0">
-        <number>4</number>
+        <number>5</number>
        </property>
        <property name="inchFormat" stdset="0">
         <string>%9.4f</string>
@@ -1549,6 +1340,9 @@ QLabel[style=&quot;homing&quot;]{
        <property name="latheMode" stdset="0">
         <number>0</number>
        </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
+       </property>
       </widget>
      </item>
      <item>
@@ -1571,22 +1365,14 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
-        <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][4])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
+        <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g92_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][5])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
+       </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
        </property>
       </widget>
      </item>
@@ -1610,22 +1396,14 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
-        <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][4])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
+        <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:g5x_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][5])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
+       </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
        </property>
       </widget>
      </item>
@@ -1649,22 +1427,14 @@ QLabel[style=&quot;homing&quot;]{
          <height>38</height>
         </size>
        </property>
-       <property name="styleSheet">
-        <string notr="true">StatusLabel{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-       </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
        </property>
        <property name="rules" stdset="0">
-        <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][4])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
+        <string>[{&quot;channels&quot;: [{&quot;trigger&quot;: true, &quot;type&quot;: &quot;tuple&quot;, &quot;url&quot;: &quot;status:tool_offset&quot;}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;\&quot;{:.4f}\&quot;.format(ch[0][5])&quot;, &quot;name&quot;: &quot;New Rule&quot;}]</string>
+       </property>
+       <property name="styleSet" stdset="0">
+        <string>dataField17</string>
        </property>
       </widget>
      </item>

user_dro_display/xyzbc_dros/dros_xyzbc.py

@@ -1,23 +1,47 @@
 import os
+import sys
+sys.path.insert(0, "/usr/lib/python3/dist-packages/probe_basic")
+from probe_basic_rc import *
 import linuxcnc
 
-from qtpy import uic
+from PySide6.QtCore import Qt
-from qtpy.QtCore import Qt
+from PySide6.QtWidgets import QWidget
-from qtpy.QtWidgets import QWidget
 
 from qtpyvcp.plugins import getPlugin
 from qtpyvcp.utilities import logger
+from qtpyvcp.utilities.runtime_ui_loader import load_ui as load_runtime_ui
 
 LOG = logger.getLogger(__name__)
 
-STATUS = getPlugin('status')
+# Detect if we're running in Qt Designer
-TOOL_TABLE = getPlugin('tooltable')
+IN_DESIGNER = os.getenv('DESIGNER', False)
 
-INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME'))
+# Defer plugin imports to avoid issues in designer
+STATUS = None
+TOOL_TABLE = None
+
+def _get_status():
+    global STATUS
+    if STATUS is None:
+        STATUS = getPlugin('status')
+    return STATUS
+
+def _get_tool_table():
+    global TOOL_TABLE
+    if TOOL_TABLE is None:
+        TOOL_TABLE = getPlugin('tooltable')
+    return TOOL_TABLE
+
+INI_FILE = linuxcnc.ini(os.getenv('INI_FILE_NAME')) if not IN_DESIGNER else None
+
+
+def _load_ui(ui_path, parent):
+    return load_runtime_ui(ui_path, parent)
 
 
 class UserDRO(QWidget):
     def __init__(self, parent=None):
         super(UserDRO, self).__init__(parent)
         ui_file = os.path.splitext(os.path.basename(__file__))[0] + ".ui"
-        uic.loadUi(os.path.join(os.path.dirname(__file__), ui_file), self)
+        ui_path = os.path.join(os.path.dirname(__file__), ui_file)
+        self.ui = _load_ui(ui_path, self)

user_dro_display/xyzbc_dros/dros_xyzbc.ui

@@ -20,7 +20,7 @@
    <string>dros_xyzbc</string>
   </property>
   <property name="layoutDirection">
-   <enum>Qt::LeftToRight</enum>
+   <enum>Qt::LayoutDirection::LeftToRight</enum>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
@@ -97,14 +97,14 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 14pt &quot;Bebas Kai&quot;;
+   	font: 14pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -137,7 +137,7 @@
 ]</string>
           </property>
           <property name="MDICommand" stdset="0">
-           <string>G10 L20 P{ch[0]} X0.0 Y0.0 Z0.0 A0.0 B0.0</string>
+           <string>G10 L20 P{ch[0]} X0.0 Y0.0 Z0.0 B0.0 C0.0</string>
           </property>
          </widget>
         </item>
@@ -172,10 +172,10 @@
 }</string>
           </property>
           <property name="frameShape">
-           <enum>QFrame::StyledPanel</enum>
+           <enum>QFrame::Shape::StyledPanel</enum>
           </property>
           <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
+           <enum>QFrame::Shadow::Raised</enum>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_103">
            <property name="spacing">
@@ -210,12 +210,12 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
     padding-left: 6px;
 }</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
              <property name="rules" stdset="0">
               <string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:g5x_index?text&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;ch[0] + ' WORK'\n&quot;, &quot;name&quot;: &quot;WCS Header&quot;}]</string>
@@ -248,14 +248,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>MACHINE</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -282,14 +282,14 @@
              <property name="styleSheet">
               <string notr="true">QLabel{
     color: rgb(238, 238, 236);
-	font: 16pt &quot;Bebas Kai&quot;;
+	font: 16pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
              </property>
              <property name="text">
               <string>DTG</string>
              </property>
              <property name="alignment">
-              <set>Qt::AlignCenter</set>
+              <set>Qt::AlignmentFlag::AlignCenter</set>
              </property>
             </widget>
            </item>
@@ -317,11 +317,11 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -378,14 +378,14 @@
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
+           <enum>Qt::LayoutDirection::LeftToRight</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -438,33 +438,17 @@
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
-          </property>
-          <property name="text">
-           <string>     0.000</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
@@ -484,6 +468,9 @@
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -506,28 +493,8 @@
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -547,6 +514,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -569,20 +539,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -602,6 +560,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -625,11 +586,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -686,11 +647,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -743,34 +704,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>1</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -793,28 +744,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -834,6 +765,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -856,20 +790,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -889,6 +811,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -912,11 +837,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -973,11 +898,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1030,34 +955,24 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="axisNumber" stdset="0">
            <number>2</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1080,28 +995,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
@@ -1121,6 +1016,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1143,20 +1041,8 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
@@ -1176,6 +1062,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1199,11 +1088,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1260,11 +1149,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1317,36 +1206,23 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
           </property>
           <property name="axisNumber" stdset="0">
-           <number>3</number>
+           <number>4</number>
           </property>
           <property name="inchFormat" stdset="0">
            <string>%9.4f</string>
@@ -1360,6 +1236,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1382,34 +1261,14 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
           </property>
           <property name="axisNumber" stdset="0">
-           <number>3</number>
+           <number>4</number>
           </property>
           <property name="inchFormat" stdset="0">
            <string>%9.4f</string>
@@ -1423,6 +1282,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1445,26 +1307,14 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
           </property>
           <property name="axisNumber" stdset="0">
-           <number>3</number>
+           <number>4</number>
           </property>
           <property name="inchFormat" stdset="0">
            <string>%9.4f</string>
@@ -1478,6 +1328,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1501,11 +1354,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1562,11 +1415,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">MDIButton {
-   	font: 17pt &quot;Bebas Kai&quot;;
+   	font: 17pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">
@@ -1619,36 +1472,23 @@ QLabel[style=&quot;homing&quot;]{
           </property>
           <property name="font">
            <font>
-            <family>Bebas Kai</family>
+            <family>Probe Basic Bebas Mono</family>
             <pointsize>17</pointsize>
-            <weight>50</weight>
             <italic>false</italic>
             <bold>false</bold>
            </font>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
+           <enum>Qt::FocusPolicy::ClickFocus</enum>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">QLineEdit{
-    border-style: transparant;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-    padding-right: 2px;
-    font: 17pt &quot;Bebas Kai&quot;;
-}</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>1</number>
           </property>
           <property name="axisNumber" stdset="0">
-           <number>4</number>
+           <number>5</number>
           </property>
           <property name="inchFormat" stdset="0">
            <string>%9.4f</string>
@@ -1662,6 +1502,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1684,34 +1527,14 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}
-
-QLabel[style=&quot;unhomed&quot;]{
-   color: red;
-}
-
-QLabel[style=&quot;homing&quot;]{
-   color: rgb(196, 160, 0);
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>0</number>
           </property>
           <property name="axisNumber" stdset="0">
-           <number>4</number>
+           <number>5</number>
           </property>
           <property name="inchFormat" stdset="0">
            <string>%9.4f</string>
@@ -1725,6 +1548,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1747,26 +1573,14 @@ QLabel[style=&quot;homing&quot;]{
             <height>35</height>
            </size>
           </property>
-          <property name="styleSheet">
-           <string notr="true">QLabel{
-    border-style: transparent;
-    border-color: rgb(235, 235, 235);
-    border-width: 1px;
-    border-radius: 5px;
-    color: black;
-    background: rgb(235, 235, 235);
-	font: 17pt &quot;Bebas Kai&quot;;
-    padding-right: 2px;
-}</string>
-          </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
           <property name="referenceType" stdset="0">
            <number>2</number>
           </property>
           <property name="axisNumber" stdset="0">
-           <number>4</number>
+           <number>5</number>
           </property>
           <property name="inchFormat" stdset="0">
            <string>%9.4f</string>
@@ -1780,6 +1594,9 @@ QLabel[style=&quot;homing&quot;]{
           <property name="latheMode" stdset="0">
            <number>0</number>
           </property>
+          <property name="styleSet" stdset="0">
+           <string>dataField17</string>
+          </property>
          </widget>
         </item>
         <item>
@@ -1803,11 +1620,11 @@ QLabel[style=&quot;homing&quot;]{
            </size>
           </property>
           <property name="focusPolicy">
-           <enum>Qt::NoFocus</enum>
+           <enum>Qt::FocusPolicy::NoFocus</enum>
           </property>
           <property name="styleSheet">
            <string notr="true">QPushButton {
-   	font: 15pt &quot;Bebas Kai&quot;;
+   	font: 15pt &quot;Probe Basic Bebas Mono&quot;;
 }</string>
           </property>
           <property name="text">