diff --git a/Makefile b/Makefile
index 9f0b4cb23599615801d92b84b2ad4d72a905ffcc..ff1d9537a11763438cb1d0b475e9fbdfe8c64ff1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 include $(EPICS_ENV_PATH)/module.Makefile
 
-STARTUPS += startup/EMU_Motor1.cmd
+STARTUPS += startup/EMU.cmd
 #STARTUPS += startup/EMU_testMRF.cmd
 DOC = doc/README.md
 
diff --git a/db/EMU.substitutions b/db/EMU.substitutions
index 940dce1ec53c27395a1243626114d52c6a7183ac..8d06811eb8e8165099a8a8c3345781047e3515cb 100644
--- a/db/EMU.substitutions
+++ b/db/EMU.substitutions
@@ -1,11 +1,13 @@
-
 # File wireScanner.substitutions
 # Author: Alexander Soderqvist <alexander.soderqvist@esss.se>
 # 
 # Prototype allison scanner. Compilations of components from scanning module.
 #
 
-# OUTER SCAN: With motor
+##########################################################################
+################################ OUTER SCAN: MOTOR #######################
+##########################################################################
+
 file "scanBase.db"
 {
 	pattern {
@@ -123,6 +125,9 @@ file "scanBase.db"
 
 }
 
+##########################################################################
+################################ INNER SCAN: DAC   #######################
+##########################################################################
 
 # INNER SCAN: Electrical field
 file "scanBase.db"
@@ -132,10 +137,15 @@ file "scanBase.db"
 		SCAN,
 		MAX_POINTS,
 		
-# MAIN POSITIONER INTERFACE: Positioner 4 on sscan.
+# Power supply PS1
 		POS_SP_PV,
 		POS_SCALAR_RBV_PV,
 
+# Power supply PS2
+  	     	POS1_SP_PV,
+  	     	POS1_RBV_PV,
+		POS1_MODE,
+
 # INTERFACE: TIMING RECEIVER
   	     	TR_TL1,
 		TR_TLTSEL,  	     	
@@ -182,10 +192,16 @@ file "scanBase.db"
 		"$(SCAN_EF)",
 		"$(MAX_POINTS_EF)",
 
-# INTERFACE POSITIONER: External interface to Power Supply
+# PS1 POSITIONER INTERFACE
   	    	"$(PSU_SP)",
 		"$(PSU_RBV)",
 
+
+# PS2 POSITIONER INTERFACE
+  	    	"$(PSU2_SP)",
+		"$(PSU2_RBV)",
+		"LINEAR",
+
 # INTERFACE: Timing receiver Action in ESS timing
   	     	"$(TR_TL) PP",
 		"$(TR_TLTSEL)",
@@ -237,6 +253,10 @@ file "scanBase.db"
 
 }
 
+
+##########################################################################
+################################ OUTER SCAN: MOTOR #######################
+##########################################################################
 #
 # Detector trigger control
 #
@@ -274,24 +294,25 @@ file "scanDAQDetTrig.template"
 
 		"3",
 
-		"$(DAQNDSPREFIX):CARD0-STAT",
+		"$(DAQNDSPREFIX):AI-STAT",
 		"ON",
 
-		"$(DAQNDSPREFIX):CARD0-STAT",
+		"$(DAQNDSPREFIX):AI-STAT",
 		"RUNNING",
 		
 		"$(DEVICE):$(SCAN_EF)-SAVE_TS",
 		
-		"$(DAQNDSPREFIX):CARD0-STAT-RB",
+		"$(DAQNDSPREFIX):AI-STAT-RB",
 		"4"
 	}
 }
 
-#
-# Detector 1
-#
 
-file "scanDAQDetWithAverage.db"
+##########################################################################
+################################ DETECTOR 1: Faraday CUP #################
+##########################################################################
+
+file "scanDAQDet.template"
 {
 
 	pattern {
@@ -314,17 +335,17 @@ file "scanDAQDetWithAverage.db"
 		"55"
 		
 		"$(DAQBUFSIZE)",
-		"$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
+		"$(DAQNDSPREFIX):AI-TRGR-RB",
 		"$(DAQNDSPREFIX):$(DET1WF)",
 		"$(DAQNDSPREFIX):$(DET1WF).NORD"
 	}
 }
 
-#
-# Detector 2
-#
 
-file "scanDAQDetWithAverage.db"
+##########################################################################
+################################ DETECTOR 2: PS1 #########################
+##########################################################################
+file "scanDAQDet.template"
 {
 
 	pattern {
@@ -347,17 +368,17 @@ file "scanDAQDetWithAverage.db"
 		"55"
 		
 		"$(DAQBUFSIZE)",
-		"$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
+		"$(DAQNDSPREFIX):AI-TRGR-RB",
 		"$(DAQNDSPREFIX):$(DET2WF)",
 		"$(DAQNDSPREFIX):$(DET2WF).NORD"
 	}
 }
 
-#
-# Detector 3
-#
+##########################################################################
+################################ DETECTOR 3: PS2 #########################
+##########################################################################
 
-file "scanDAQDetWithAverage.db"
+file "scanDAQDet.template"
 {
 
 	pattern {
@@ -380,9 +401,8 @@ file "scanDAQDetWithAverage.db"
 		"55"
 		
 		"$(DAQBUFSIZE)",
-		"$(DAQNDSPREFIX):CARD0:TriggerRepeat-RB",
+		"$(DAQNDSPREFIX):AI-TRGR-RB",
 		"$(DAQNDSPREFIX):$(DET3WF)",
 		"$(DAQNDSPREFIX):$(DET3WF).NORD"
 	}
 }
-
diff --git a/opi/EMU.opi b/opi/EMU.opi
index 448b62407487bd9bd650e288c7a1123a4522bfd3..088959802c6a4b6c938b5fba79931ae73924a830 100644
--- a/opi/EMU.opi
+++ b/opi/EMU.opi
@@ -6,17 +6,17 @@
   <show_grid>true</show_grid>
   <auto_zoom_to_fit_all>false</auto_zoom_to_fit_all>
   <scripts />
-  <height>1200</height>
+  <height>1600</height>
   <macros>
     <include_parent_macros>true</include_parent_macros>
-    <DTACQ-NAME>INFN-Src:CARD0</DTACQ-NAME>
+    <DTACQ-NAME>DACQ</DTACQ-NAME>
     <SIGNAL_FC>CurR</SIGNAL_FC>
-    <PREFIX_SIG>INFN-Src:PBI-EM-FC1</PREFIX_SIG>
+    <PREFIX_SIG>DACQ</PREFIX_SIG>
     <PREFIX_MTR>PMAC</PREFIX_MTR>
     <NAME_MTR>MTR</NAME_MTR>
     <NAME_PS>PS</NAME_PS>
-    <PREFIX_PS>INFN-Src:PBI-EM:HV</PREFIX_PS>
-    <PREFIX_SCAN>INFN-Src:PBI-EM-SCAN</PREFIX_SCAN>
+    <PREFIX_PS>LNS-ISRC-010:PBI-EM:HV</PREFIX_PS>
+    <PREFIX_SCAN>SCAN</PREFIX_SCAN>
     <SCAN>MOTOR</SCAN>
   </macros>
   <boy_version>4.0.103.201506251634</boy_version>
@@ -30,7 +30,7 @@
   <background_color>
     <color red="240" green="240" blue="240" />
   </background_color>
-  <width>2000</width>
+  <width>2510</width>
   <x>-1</x>
   <name></name>
   <grid_space>6</grid_space>
@@ -45,7 +45,7 @@
     <active_tab>0</active_tab>
     <tooltip></tooltip>
     <tab_3_icon_path></tab_3_icon_path>
-    <height>997</height>
+    <height>1165</height>
     <tab_2_icon_path></tab_2_icon_path>
     <border_width>1</border_width>
     <border_color>
@@ -67,20 +67,20 @@
       <color red="0" green="0" blue="0" />
     </tab_2_foreground_color>
     <tab_1_font>
-      <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+      <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
     </tab_1_font>
-    <tab_3_title>SCANNING</tab_3_title>
+    <tab_3_title>TREK6096E</tab_3_title>
     <tab_2_enabled>true</tab_2_enabled>
     <background_color>
       <color red="240" green="240" blue="240" />
     </background_color>
-    <width>1945</width>
+    <width>2491</width>
     <x>18</x>
     <horizontal_tabs>true</horizontal_tabs>
     <y>102</y>
     <rules />
     <tab_3_font>
-      <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+      <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
     </tab_3_font>
     <macros>
       <include_parent_macros>true</include_parent_macros>
@@ -94,7 +94,7 @@
     </tab_3_foreground_color>
     <widget_type>Tabbed Container</widget_type>
     <tab_2_font>
-      <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+      <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
     </tab_2_font>
     <tab_3_background_color>
       <color red="255" green="255" blue="255" />
@@ -102,18 +102,18 @@
     <tab_3_enabled>true</tab_3_enabled>
     <name></name>
     <minimum_tab_height>10</minimum_tab_height>
-    <tab_2_title>TREK6096E</tab_2_title>
+    <tab_2_title>MOTOR</tab_2_title>
     <tab_0_font>
-      <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+      <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
     </tab_0_font>
     <tab_2_background_color>
       <color red="255" green="255" blue="255" />
     </tab_2_background_color>
-    <tab_0_title>DTACQ</tab_0_title>
+    <tab_0_title>SCANNING</tab_0_title>
     <tab_1_foreground_color>
       <color red="0" green="0" blue="0" />
     </tab_1_foreground_color>
-    <tab_1_title>MOTOR</tab_1_title>
+    <tab_1_title>DTACQ</tab_1_title>
     <scripts />
     <tab_count>4</tab_count>
     <scale_options>
@@ -131,11 +131,11 @@
       <tooltip></tooltip>
       <rules />
       <enabled>true</enabled>
-      <wuid>2fea3147:153609206ed:-7765</wuid>
+      <wuid>-4f668e34:1537ecf193c:-7f8d</wuid>
       <transparent>true</transparent>
       <lock_children>false</lock_children>
       <scripts />
-      <height>965</height>
+      <height>1130</height>
       <border_width>1</border_width>
       <scale_options>
         <width_scalable>true</width_scalable>
@@ -153,9 +153,9 @@
       <background_color>
         <color red="240" green="240" blue="240" />
       </background_color>
-      <width>1943</width>
+      <width>2489</width>
       <x>1</x>
-      <name>DTACQ</name>
+      <name>SCANNING</name>
       <y>1</y>
       <foreground_color>
         <color red="192" green="192" blue="192" />
@@ -164,9 +164,9 @@
       <fc>false</fc>
       <show_scrollbar>true</show_scrollbar>
       <font>
-        <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+        <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
       </font>
-      <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <line_width>0</line_width>
@@ -176,16 +176,17 @@
 $(pv_value)</tooltip>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-663a</wuid>
+        <wuid>1e771979:1565068c2e3:-4ace</wuid>
         <transparent>false</transparent>
         <pv_value />
         <alpha>255</alpha>
+        <corner_height>16</corner_height>
         <bg_gradient_color>
           <color red="255" green="255" blue="255" />
         </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>20</height>
+        <height>1078</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -199,8 +200,9 @@ $(pv_value)</tooltip>
           <color red="0" green="128" blue="255" />
         </border_color>
         <anti_alias>true</anti_alias>
+        <corner_width>16</corner_width>
         <line_style>0</line_style>
-        <widget_type>Rectangle</widget_type>
+        <widget_type>Rounded Rectangle</widget_type>
         <fg_gradient_color>
           <color red="255" green="255" blue="255" />
         </fg_gradient_color>
@@ -208,210 +210,81 @@ $(pv_value)</tooltip>
         <background_color>
           <color red="186" green="189" blue="182" />
         </background_color>
-        <width>160</width>
-        <x>450</x>
-        <name>Rectangle_2</name>
-        <y>690</y>
+        <width>349</width>
+        <x>30</x>
+        <name>Rounded Rectangle_5</name>
+        <y>39</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
         <line_color>
           <color red="128" green="0" blue="255" />
         </line_color>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.xyGraph" version="1.0.0">
-        <axis_1_scale_format></axis_1_scale_format>
-        <trace_2_x_axis_index>0</trace_2_x_axis_index>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(trace_0_y_pv)
-$(trace_0_y_pv_value)</tooltip>
-        <trace_0_concatenate_data>false</trace_0_concatenate_data>
-        <trace_0_trace_type>0</trace_0_trace_type>
-        <border_width>1</border_width>
-        <trace_1_x_axis_index>0</trace_1_x_axis_index>
+      <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
         <border_style>0</border_style>
-        <axis_0_grid_color>
-          <color red="78" green="154" blue="6" />
-        </axis_0_grid_color>
-        <axis_2_visible>false</axis_2_visible>
-        <trace_0_name>$(trace_0_y_pv)</trace_0_name>
-        <axis_2_minimum>0.0</axis_2_minimum>
-        <trace_0_update_mode>0</trace_0_update_mode>
-        <trace_1_x_pv>$(PREFIX_SIG):$(SIGNAL_FC):RCURSOR_X</trace_1_x_pv>
-        <wuid>-3f6498d2:15645d229d4:-6639</wuid>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>4ad471b5:157e1276406:-7831</wuid>
         <transparent>false</transparent>
-        <trace_1_update_mode>0</trace_1_update_mode>
-        <axis_0_title_font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
-        </axis_0_title_font>
-        <trace_2_update_mode>0</trace_2_update_mode>
-        <background_color>
-          <color red="186" green="189" blue="182" />
-        </background_color>
-        <x>450</x>
-        <y>84</y>
-        <trace_0_x_axis_index>0</trace_0_x_axis_index>
-        <axis_count>3</axis_count>
-        <trace_1_point_size>4</trace_1_point_size>
-        <trace_1_anti_alias>true</trace_1_anti_alias>
         <pv_value />
-        <axis_2_grid_color>
-          <color red="200" green="200" blue="200" />
-        </axis_2_grid_color>
-        <trace_0_buffer_size>520</trace_0_buffer_size>
-        <trace_2_buffer_size>2</trace_2_buffer_size>
-        <axis_1_maximum>20.0</axis_1_maximum>
-        <axis_0_scale_font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-        </axis_0_scale_font>
-        <trigger_pv></trigger_pv>
-        <widget_type>XY Graph</widget_type>
-        <trace_2_line_width>2</trace_2_line_width>
-        <axis_1_axis_color>
-          <color red="0" green="0" blue="0" />
-        </axis_1_axis_color>
-        <axis_0_scale_format></axis_0_scale_format>
-        <axis_1_log_scale>false</axis_1_log_scale>
-        <title></title>
-        <trace_0_visible>true</trace_0_visible>
-        <trace_1_name>$(trace_1_y_pv)</trace_1_name>
-        <trace_1_y_pv_value />
-        <axis_2_auto_scale>true</axis_2_auto_scale>
-        <show_legend>false</show_legend>
-        <axis_0_axis_title>ms</axis_0_axis_title>
-        <axis_0_axis_color>
-          <color red="0" green="0" blue="0" />
-        </axis_0_axis_color>
-        <axis_2_scale_font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-        </axis_2_scale_font>
-        <trace_2_update_delay>100</trace_2_update_delay>
-        <axis_0_dash_grid_line>false</axis_0_dash_grid_line>
-        <trace_0_point_style>2</trace_0_point_style>
-        <trace_1_point_style>0</trace_1_point_style>
-        <trace_0_line_width>1</trace_0_line_width>
-        <axis_2_y_axis>false</axis_2_y_axis>
-        <axis_0_time_format>0</axis_0_time_format>
-        <trace_count>3</trace_count>
-        <axis_1_show_grid>true</axis_1_show_grid>
-        <trace_2_trace_color>
-          <color name="Major" red="255" green="0" blue="0" />
-        </trace_2_trace_color>
-        <axis_1_dash_grid_line>true</axis_1_dash_grid_line>
-        <trace_2_trace_type>0</trace_2_trace_type>
-        <show_toolbar>false</show_toolbar>
-        <axis_0_visible>true</axis_0_visible>
-        <axis_0_show_grid>true</axis_0_show_grid>
-        <trace_0_y_axis_index>1</trace_0_y_axis_index>
+        <alpha>255</alpha>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>145</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>true</keep_wh_ratio>
+          <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <trace_1_y_pv>loc://val(-100,100)</trace_1_y_pv>
-        <trace_2_concatenate_data>false</trace_2_concatenate_data>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <trace_2_y_pv_value />
-        <trace_2_anti_alias>true</trace_2_anti_alias>
-        <axis_0_maximum>100.0</axis_0_maximum>
-        <trace_1_y_axis_index>1</trace_1_y_axis_index>
-        <trace_2_name>$(trace_2_y_pv)</trace_2_name>
-        <height>607</height>
-        <trace_2_visible>true</trace_2_visible>
-        <trigger_pv_value />
-        <axis_1_grid_color>
-          <color red="78" green="154" blue="6" />
-        </axis_1_grid_color>
-        <actions hook="false" hook_all="false" />
-        <trace_2_point_size>4</trace_2_point_size>
-        <axis_2_axis_color>
-          <color red="0" green="0" blue="0" />
-        </axis_2_axis_color>
-        <axis_0_log_scale>false</axis_0_log_scale>
-        <trace_0_x_pv_value />
-        <axis_0_auto_scale_threshold>0.0</axis_0_auto_scale_threshold>
-        <rules />
-        <axis_1_visible>true</axis_1_visible>
-        <axis_2_show_grid>false</axis_2_show_grid>
-        <trace_0_update_delay>1</trace_0_update_delay>
-        <trace_1_concatenate_data>false</trace_1_concatenate_data>
-        <trace_1_trace_color>
-          <color red="242" green="26" blue="26" />
-        </trace_1_trace_color>
+        <visible>true</visible>
         <pv_name></pv_name>
-        <axis_2_log_scale>false</axis_2_log_scale>
-        <axis_2_auto_scale_threshold>0.0</axis_2_auto_scale_threshold>
-        <name>XY Graph</name>
-        <trace_1_trace_type>0</trace_1_trace_type>
-        <axis_0_auto_scale>true</axis_0_auto_scale>
-        <axis_0_minimum>0.0</axis_0_minimum>
-        <trace_2_y_axis_index>1</trace_2_y_axis_index>
-        <trace_1_update_delay>10</trace_1_update_delay>
-        <axis_2_dash_grid_line>false</axis_2_dash_grid_line>
-        <axis_1_axis_title>mA</axis_1_axis_title>
-        <trace_2_x_pv_value />
-        <axis_1_auto_scale>false</axis_1_auto_scale>
-        <trace_1_line_width>2</trace_1_line_width>
-        <trace_2_y_pv>loc://val(-100,100)</trace_2_y_pv>
-        <trace_1_plot_mode>0</trace_1_plot_mode>
+        <gradient>false</gradient>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <axis_2_title_font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
-        </axis_2_title_font>
-        <trace_0_y_pv>$(PREFIX_SIG):$(SIGNAL_FC)</trace_0_y_pv>
-        <trace_2_point_style>0</trace_2_point_style>
-        <trace_0_plot_mode>0</trace_0_plot_mode>
-        <enabled>true</enabled>
-        <trace_0_x_pv>$(PREFIX_SIG):$(SIGNAL_FC)_XMS</trace_0_x_pv>
-        <axis_1_scale_font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-        </axis_1_scale_font>
-        <axis_1_time_format>0</axis_1_time_format>
-        <axis_2_time_format>0</axis_2_time_format>
-        <axis_2_left_bottom_side>false</axis_2_left_bottom_side>
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <axis_2_maximum>22.0</axis_2_maximum>
-        <show_plot_area_border>false</show_plot_area_border>
-        <width>853</width>
-        <trace_1_x_pv_value />
-        <axis_1_minimum>-1.0</axis_1_minimum>
-        <title_font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
-        </title_font>
-        <trace_0_y_pv_value />
-        <trace_1_visible>true</trace_1_visible>
-        <plot_area_background_color>
-          <color red="0" green="0" blue="0" />
-        </plot_area_background_color>
-        <axis_1_title_font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
-        </axis_1_title_font>
-        <visible>true</visible>
-        <axis_2_axis_title>ms</axis_2_axis_title>
-        <trace_1_buffer_size>2</trace_1_buffer_size>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <axis_2_scale_format></axis_2_scale_format>
-        <scripts />
-        <trace_0_point_size>3</trace_0_point_size>
-        <trace_0_trace_color>
-          <color red="0" green="255" blue="0" />
-        </trace_0_trace_color>
-        <trace_0_anti_alias>true</trace_0_anti_alias>
-        <axis_1_auto_scale_threshold>0.0</axis_1_auto_scale_threshold>
-        <trace_2_plot_mode>0</trace_2_plot_mode>
-        <trace_2_x_pv>$(PREFIX_SIG):$(SIGNAL_FC):LCURSOR_X</trace_2_x_pv>
+        <anti_alias>true</anti_alias>
+        <line_style>0</line_style>
+        <widget_type>Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <background_color>
+          <color name="Container Border Grey" red="150" green="150" blue="150" />
+        </background_color>
+        <width>319</width>
+        <x>48</x>
+        <name>Rectangle</name>
+        <y>828</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color red="0" green="0" blue="255" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <line_width>0</line_width>
@@ -421,17 +294,16 @@ $(trace_0_y_pv_value)</tooltip>
 $(pv_value)</tooltip>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6638</wuid>
+        <wuid>4ad471b5:157e1276406:-794d</wuid>
         <transparent>false</transparent>
         <pv_value />
         <alpha>255</alpha>
-        <corner_height>16</corner_height>
         <bg_gradient_color>
           <color red="255" green="255" blue="255" />
         </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>97</height>
+        <height>92</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -445,88 +317,84 @@ $(pv_value)</tooltip>
           <color red="0" green="128" blue="255" />
         </border_color>
         <anti_alias>true</anti_alias>
-        <corner_width>16</corner_width>
         <line_style>0</line_style>
-        <widget_type>Rounded Rectangle</widget_type>
+        <widget_type>Rectangle</widget_type>
         <fg_gradient_color>
           <color red="255" green="255" blue="255" />
         </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color red="186" green="189" blue="182" />
+          <color name="Container Border Grey" red="150" green="150" blue="150" />
         </background_color>
-        <width>349</width>
+        <width>319</width>
         <x>48</x>
-        <name>Rounded Rectangle_4</name>
-        <y>90</y>
+        <name>Rectangle</name>
+        <y>355</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
         <line_color>
           <color red="128" green="0" blue="255" />
         </line_color>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
         <rules />
+        <effect_3d>true</effect_3d>
+        <bit>-1</bit>
         <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>false</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
+        <height>36</height>
         <border_width>1</border_width>
         <visible>true</visible>
-        <pv_name>$(DTACQ-NAME):TRIGGER:PRETRIGGER_ms</pv_name>
-        <selector_type>0</selector_type>
+        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv_name>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input</name>
-        <style>0</style>
+        <widget_type>LED</widget_type>
+        <name>LED</name>
         <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
+        <show_boolean_label>false</show_boolean_label>
+        <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>false</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6637</wuid>
-        <transparent>false</transparent>
+        <enabled>true</enabled>
+        <wuid>1e771979:1565068c2e3:-4cec</wuid>
+        <on_color>
+          <color red="0" green="255" blue="0" />
+        </on_color>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <on_label>ON</on_label>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
+          <keep_wh_ratio>true</keep_wh_ratio>
         </scale_options>
+        <off_color>
+          <color red="0" green="100" blue="0" />
+        </off_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color red="240" green="240" blue="240" />
         </background_color>
-        <width>85</width>
-        <x>66</x>
-        <y>136</y>
-        <maximum>1.7976931348623157E308</maximum>
+        <square_led>true</square_led>
+        <width>32</width>
+        <x>293</x>
+        <data_type>0</data_type>
+        <y>994</y>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color red="192" green="192" blue="192" />
         </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
+        <off_label>OFF</off_label>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
@@ -534,10 +402,10 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6636</wuid>
+        <wuid>1e771979:1565068c2e3:-4ac6</wuid>
         <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>Display interval</text>
+        <text>CONTROL</text>
         <scripts />
         <height>32</height>
         <border_width>1</border_width>
@@ -557,9 +425,9 @@ $(pv_value)</tooltip>
           <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
         <width>349</width>
-        <x>48</x>
+        <x>30</x>
         <name>Label_15</name>
-        <y>85</y>
+        <y>54</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
@@ -569,80 +437,25 @@ $(pv_value)</tooltip>
           <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>2</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>false</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>$(DTACQ-NAME):NSAMPLES_ms</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>false</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input_15</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6635</wuid>
-        <transparent>false</transparent>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
-        <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
-        </background_color>
-        <width>85</width>
-        <x>216</x>
-        <y>136</y>
-        <maximum>1.7976931348623157E308</maximum>
-        <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
-        </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
-        <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
-        </font>
-      </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>2</line_width>
+        <line_width>1</line_width>
         <horizontal_fill>true</horizontal_fill>
         <alarm_pulsing>false</alarm_pulsing>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <arrows>1</arrows>
+        <arrows>0</arrows>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6634</wuid>
+        <wuid>1e771979:1565068c2e3:-4a2d</wuid>
         <transparent>false</transparent>
         <points>
-          <point x="214" y="144" />
-          <point x="157" y="144" />
-          <point x="157" y="144" />
+          <point x="30" y="119" />
+          <point x="378" y="119" />
+          <point x="378" y="119" />
+          <point x="378" y="119" />
+          <point x="378" y="119" />
         </points>
         <fill_arrow>true</fill_arrow>
         <pv_value />
@@ -660,27 +473,27 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <pv_name></pv_name>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="Black" red="0" green="0" blue="0" />
         </border_color>
         <anti_alias>true</anti_alias>
-        <line_style>2</line_style>
+        <line_style>0</line_style>
         <arrow_length>20</arrow_length>
         <widget_type>Polyline</widget_type>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color red="0" green="0" blue="0" />
+          <color name="Black" red="0" green="0" blue="0" />
         </background_color>
-        <width>58</width>
-        <x>157</x>
-        <name>Polyline_1</name>
-        <y>144</y>
+        <width>349</width>
+        <x>30</x>
+        <name>Polyline</name>
+        <y>119</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -689,10 +502,10 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6633</wuid>
-        <transparent>true</transparent>
+        <wuid>1e771979:1565068c2e3:-4ab2</wuid>
+        <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>ms</text>
+        <text>Motor</text>
         <scripts />
         <height>20</height>
         <border_width>1</border_width>
@@ -709,83 +522,63 @@ $(pv_value)</tooltip>
         <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="panelArea" red="240" green="240" blue="240" />
         </background_color>
-        <width>40</width>
-        <x>324</x>
-        <name>Label_16</name>
-        <y>142</y>
+        <width>229</width>
+        <x>96</x>
+        <name>Label_156</name>
+        <y>110</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>0</line_width>
-        <horizontal_fill>true</horizontal_fill>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6632</wuid>
-        <transparent>false</transparent>
-        <pv_value />
-        <alpha>255</alpha>
-        <corner_height>16</corner_height>
-        <bg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </bg_gradient_color>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-3e44</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>Start position</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>97</height>
-        <border_width>1</border_width>
+        <height>20</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name></pv_name>
-        <gradient>false</gradient>
+        <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <anti_alias>true</anti_alias>
-        <corner_width>16</corner_width>
-        <line_style>0</line_style>
-        <widget_type>Rounded Rectangle</widget_type>
-        <fg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </fg_gradient_color>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color red="186" green="189" blue="182" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>349</width>
-        <x>48</x>
-        <name>Rounded Rectangle_5</name>
-        <y>228</y>
-        <fill_level>0.0</fill_level>
+        <width>151</width>
+        <x>42</x>
+        <name>Label Orientation_7</name>
+        <y>149</y>
         <foreground_color>
-          <color red="255" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
-        <line_color>
-          <color red="128" green="0" blue="255" />
-        </line_color>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>2</precision>
+        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
@@ -799,21 +592,21 @@ $(pv_value)</tooltip>
         <multiline_input>false</multiline_input>
         <border_width>1</border_width>
         <visible>true</visible>
-        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):LCURSOR_ms</pv_name>
+        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).P4SP</pv_name>
         <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <precision_from_pv>false</precision_from_pv>
+        <precision_from_pv>true</precision_from_pv>
         <widget_type>Text Input</widget_type>
         <confirm_message></confirm_message>
-        <name>Text Input_16</name>
+        <name>Text Input</name>
         <style>0</style>
         <actions hook="false" hook_all="false" />
         <border_style>3</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6631</wuid>
+        <wuid>1e771979:1565068c2e3:-3e43</wuid>
         <transparent>false</transparent>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -828,16 +621,16 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>85</width>
-        <x>66</x>
-        <y>274</y>
+        <width>100</width>
+        <x>228</x>
+        <y>143</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
         <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -845,14 +638,14 @@ $(pv_value)</tooltip>
         <tooltip></tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6630</wuid>
-        <transparent>false</transparent>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-3d91</wuid>
+        <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>Measure interval</text>
+        <text>End position</text>
         <scripts />
-        <height>32</height>
-        <border_width>1</border_width>
+        <height>20</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -861,29 +654,28 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="SubPanel" red="176" green="218" blue="249" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>349</width>
-        <x>48</x>
-        <name>Label_17</name>
-        <y>223</y>
+        <width>93</width>
+        <x>71</x>
+        <name>Label Orientation_7</name>
+        <y>191</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
           <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>2</precision>
+        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
@@ -897,21 +689,21 @@ $(pv_value)</tooltip>
         <multiline_input>false</multiline_input>
         <border_width>1</border_width>
         <visible>true</visible>
-        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):RCURSOR_ms</pv_name>
+        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).P4EP</pv_name>
         <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <precision_from_pv>false</precision_from_pv>
+        <precision_from_pv>true</precision_from_pv>
         <widget_type>Text Input</widget_type>
         <confirm_message></confirm_message>
-        <name>Text Input_17</name>
+        <name>Text Input</name>
         <style>0</style>
         <actions hook="false" hook_all="false" />
         <border_style>3</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662f</wuid>
+        <wuid>1e771979:1565068c2e3:-3d90</wuid>
         <transparent>false</transparent>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -926,35 +718,119 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>85</width>
-        <x>216</x>
-        <y>274</y>
+        <width>100</width>
+        <x>228</x>
+        <y>185</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
         <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-359e</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>After SCAN Position</text>
+        <scripts />
+        <height>20</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>199</width>
+        <x>34</x>
+        <name>Label Orientation_7</name>
+        <y>318</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.combo" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>1e771979:1565068c2e3:-3589</wuid>
+        <pv_value />
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>20</height>
+        <border_width>0</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>false</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <items_from_pv>true</items_from_pv>
+        <visible>true</visible>
+        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).PASM</pv_name>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Combo Box</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <background_color>
+          <color name="IO Grid" red="215" green="215" blue="215" />
+        </background_color>
+        <width>100</width>
+        <x>228</x>
+        <name>channel_name</name>
+        <y>318</y>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <fontdata fontName="Sans" height="10" style="0" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>2</line_width>
+        <line_width>1</line_width>
         <horizontal_fill>true</horizontal_fill>
         <alarm_pulsing>false</alarm_pulsing>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <arrows>1</arrows>
+        <arrows>0</arrows>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662e</wuid>
+        <wuid>1e771979:1565068c2e3:-33bf</wuid>
         <transparent>false</transparent>
         <points>
-          <point x="214" y="282" />
-          <point x="157" y="282" />
-          <point x="157" y="282" />
+          <point x="30" y="477" />
+          <point x="378" y="477" />
+          <point x="378" y="477" />
+          <point x="378" y="477" />
+          <point x="378" y="477" />
         </points>
         <fill_arrow>true</fill_arrow>
         <pv_value />
@@ -972,27 +848,27 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <pv_name></pv_name>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="Black" red="0" green="0" blue="0" />
         </border_color>
         <anti_alias>true</anti_alias>
-        <line_style>2</line_style>
+        <line_style>0</line_style>
         <arrow_length>20</arrow_length>
         <widget_type>Polyline</widget_type>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color red="0" green="0" blue="0" />
+          <color name="Black" red="0" green="0" blue="0" />
         </background_color>
-        <width>58</width>
-        <x>157</x>
-        <name>Polyline_2</name>
-        <y>282</y>
+        <width>349</width>
+        <x>30</x>
+        <name>Polyline</name>
+        <y>477</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -1001,10 +877,10 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662d</wuid>
-        <transparent>true</transparent>
+        <wuid>1e771979:1565068c2e3:-33be</wuid>
+        <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>ms</text>
+        <text>Plates Power Supply</text>
         <scripts />
         <height>20</height>
         <border_width>1</border_width>
@@ -1021,18 +897,18 @@ $(pv_value)</tooltip>
         <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="panelArea" red="240" green="240" blue="240" />
         </background_color>
-        <width>40</width>
-        <x>324</x>
-        <name>Label_18</name>
-        <y>280</y>
+        <width>229</width>
+        <x>84</x>
+        <name>Label_156</name>
+        <y>468</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -1040,14 +916,14 @@ $(pv_value)</tooltip>
         <tooltip></tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662c</wuid>
-        <transparent>false</transparent>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-33b3</wuid>
+        <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>FC Curr</text>
+        <text>Number of points</text>
         <scripts />
-        <height>24</height>
-        <border_width>1</border_width>
+        <height>20</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -1056,252 +932,192 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
         <background_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>160</width>
-        <x>450</x>
-        <name>Label_11</name>
-        <y>710</y>
+        <width>199</width>
+        <x>30</x>
+        <name>Label Orientation_7</name>
+        <y>231</y>
         <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>3</precision>
+        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662b</wuid>
-        <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
-        <text>######</text>
+        <text></text>
         <rotation_angle>0.0</rotation_angle>
-        <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
         <show_units>true</show_units>
-        <height>24</height>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
         <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).NPTS</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>1e771979:1565068c2e3:-33a9</wuid>
+        <transparent>false</transparent>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):AVG</pv_name>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>false</precision_from_pv>
-        <widget_type>Text Update</widget_type>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <wrap_words>false</wrap_words>
         <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>150</width>
-        <x>609</x>
-        <name>Text Update_3</name>
-        <y>710</y>
+        <width>100</width>
+        <x>228</x>
+        <y>225</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>3</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+        <tooltip></tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-662a</wuid>
-        <transparent>false</transparent>
-        <pv_value />
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-335c</wuid>
+        <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>######</text>
-        <rotation_angle>0.0</rotation_angle>
+        <text>Step size</text>
         <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
-        <show_units>true</show_units>
-        <height>24</height>
-        <border_width>1</border_width>
+        <height>20</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):MAX</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <precision_from_pv>false</precision_from_pv>
-        <widget_type>Text Update</widget_type>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
-        <format_type>0</format_type>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>150</width>
-        <x>758</x>
-        <name>Text Update_1</name>
-        <y>710</y>
-        <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
-        </foreground_color>
+        <width>199</width>
+        <x>30</x>
+        <name>Label Orientation_7</name>
+        <y>276</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>3</precision>
+        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6629</wuid>
-        <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
-        <text>######</text>
+        <text></text>
         <rotation_angle>0.0</rotation_angle>
-        <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
         <show_units>true</show_units>
-        <height>24</height>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
         <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
         <visible>true</visible>
-        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):MIN</pv_name>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).P4SI</pv_name>
+        <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <precision_from_pv>false</precision_from_pv>
-        <widget_type>Text Update</widget_type>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <wrap_words>false</wrap_words>
-        <format_type>0</format_type>
-        <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
-        </background_color>
-        <width>150</width>
-        <x>907</x>
-        <name>Text Update_2</name>
-        <y>710</y>
-        <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
-        </foreground_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
         <actions hook="false" hook_all="false" />
-        <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
-        <border_style>0</border_style>
+        <border_style>3</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>1</line_width>
-        <horizontal_fill>true</horizontal_fill>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6628</wuid>
+        <wuid>1e771979:1565068c2e3:-335b</wuid>
         <transparent>false</transparent>
-        <pv_value />
-        <alpha>255</alpha>
-        <bg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>22</height>
-        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <pv_name></pv_name>
-        <gradient>false</gradient>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <anti_alias>true</anti_alias>
-        <line_style>0</line_style>
-        <widget_type>Rectangle</widget_type>
-        <fg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="186" green="189" blue="182" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>448</width>
-        <x>609</x>
-        <name>Rectangle_1</name>
-        <y>689</y>
-        <fill_level>0.0</fill_level>
+        <width>100</width>
+        <x>228</x>
+        <y>270</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color red="255" green="0" blue="0" />
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
-        <line_color>
-          <color red="0" green="0" blue="0" />
-        </line_color>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6627</wuid>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-31f0</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>Max</text>
+        <text>Nb Pts</text>
         <scripts />
         <height>20</height>
-        <border_width>1</border_width>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -1310,194 +1126,260 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>150</width>
-        <x>758</x>
-        <name>Label_5</name>
-        <y>690</y>
+        <width>73</width>
+        <x>34</x>
+        <name>Label Orientation_2</name>
+        <y>792</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6626</wuid>
-        <transparent>true</transparent>
+        <pv_value />
         <auto_size>false</auto_size>
-        <text>Min</text>
-        <scripts />
-        <height>20</height>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
         <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
         <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name>${PREFIX_SCAN}:$(NAME_PS).NPTS</pv_name>
+        <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
-        <background_color>
-          <color red="255" green="255" blue="255" />
-        </background_color>
-        <width>150</width>
-        <x>907</x>
-        <name>Label_22</name>
-        <y>690</y>
-        <foreground_color>
-          <color red="0" green="0" blue="0" />
-        </foreground_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input_2</name>
+        <style>0</style>
         <actions hook="false" hook_all="false" />
-        <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-6625</wuid>
-        <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>Average</text>
+        <wuid>1e771979:1565068c2e3:-31ef</wuid>
+        <transparent>false</transparent>
         <scripts />
-        <height>20</height>
-        <border_width>1</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>150</width>
-        <x>609</x>
-        <name>Label_21</name>
-        <y>690</y>
+        <width>100</width>
+        <x>106</x>
+        <y>786</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.BoolButton" version="1.0.0">
-        <toggle_button>true</toggle_button>
-        <border_style>0</border_style>
+      <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+        <toggle_button>false</toggle_button>
+        <border_style>6</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <alarm_pulsing>false</alarm_pulsing>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <push_action_index>1</push_action_index>
+        <push_action_index>0</push_action_index>
         <rules />
-        <effect_3d>true</effect_3d>
-        <bit>-1</bit>
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-3a0d</wuid>
-        <on_color>
-          <color red="0" green="255" blue="0" />
-        </on_color>
-        <show_confirm_dialog>0</show_confirm_dialog>
-        <password></password>
+        <wuid>1e771979:1565068c2e3:-2a00</wuid>
         <pv_value />
-        <released_action_index>0</released_action_index>
-        <square_button>true</square_button>
-        <show_led>true</show_led>
+        <text>Abort</text>
         <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
-        <height>35</height>
-        <on_label>ON</on_label>
-        <border_width>1</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>55</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>true</keep_wh_ratio>
+          <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
+        <image></image>
         <visible>true</visible>
-        <pv_name>SYS0-EVR0:FrontOut0-Ena-SP</pv_name>
+        <pv_name></pv_name>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <widget_type>Boolean Button</widget_type>
-        <off_color>
-          <color red="0" green="100" blue="0" />
-        </off_color>
-        <confirm_message>Are your sure you want to do this?</confirm_message>
+        <widget_type>Action Button</widget_type>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color red="240" green="240" blue="240" />
+          <color name="IO Button" red="178" green="178" blue="178" />
         </background_color>
-        <width>109</width>
-        <x>289</x>
-        <name>Boolean Button</name>
-        <data_type>0</data_type>
-        <y>370</y>
+        <width>139</width>
+        <x>129</x>
+        <name>Abort Scan</name>
+        <y>1053</y>
+        <style>0</style>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
-        <actions hook="false" hook_all="false">
+        <actions hook="false" hook_all="true">
           <action type="WRITE_PV">
-            <pv_name>$(pv_name)</pv_name>
-            <value>0</value>
+            <pv_name>${PREFIX_SCAN}:$(NAME_MTR)-ABORT.PROC</pv_name>
+            <value>1</value>
             <timeout>10</timeout>
             <confirm_message></confirm_message>
-            <description></description>
+            <description>Abort Scan</description>
           </action>
+        </actions>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+        <toggle_button>false</toggle_button>
+        <border_style>6</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <push_action_index>0</push_action_index>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>1e771979:1565068c2e3:-2a01</wuid>
+        <pv_value />
+        <text>Start scan</text>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>55</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <image></image>
+        <visible>true</visible>
+        <pv_name></pv_name>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Action Button</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <background_color>
+          <color name="IO Button" red="178" green="178" blue="178" />
+        </background_color>
+        <width>139</width>
+        <x>129</x>
+        <name>Start Scan</name>
+        <y>984</y>
+        <style>0</style>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false">
           <action type="WRITE_PV">
-            <pv_name>$(pv_name)</pv_name>
+            <pv_name>${PREFIX_SCAN}:$(NAME_MTR).EXSC</pv_name>
             <value>1</value>
             <timeout>10</timeout>
             <confirm_message></confirm_message>
-            <description></description>
+            <description>Start Scan</description>
           </action>
         </actions>
-        <show_boolean_label>true</show_boolean_label>
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>${PREFIX_SCAN}:$(NAME_PS).PDLY</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>-6b2ac396:15659b62087:-789d</wuid>
+        <transparent>false</transparent>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color name="TextBackground" red="70" green="70" blue="70" />
+        </background_color>
+        <width>81</width>
+        <x>278</x>
+        <y>786</y>
+        <maximum>1.7976931348623157E308</maximum>
+        <foreground_color>
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+        </foreground_color>
+        <minimum>-1.7976931348623157E308</minimum>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
-        <off_label>OFF</off_label>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-38f7</wuid>
-        <transparent>false</transparent>
+        <enabled>false</enabled>
+        <wuid>-6b2ac396:15659b62087:-5a56</wuid>
+        <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>Fast Acquisition</text>
+        <text>Delay</text>
         <scripts />
-        <height>43</height>
-        <border_width>1</border_width>
+        <height>20</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -1506,24 +1388,23 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="IO Shape Fill" red="188" green="188" blue="188" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>1357</width>
-        <x>0</x>
-        <name>Label_124</name>
-        <y>12</y>
+        <width>71</width>
+        <x>208</x>
+        <name>Label Orientation_2</name>
+        <y>792</y>
         <foreground_color>
-          <color name="IO Label" red="0" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="Sans" height="12" style="1">Header 3</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -1531,14 +1412,14 @@ $(pv_value)</tooltip>
         <tooltip></tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-348a</wuid>
+        <enabled>false</enabled>
+        <wuid>79429b6c:157dd491a6d:-7de6</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>Activate timing System</text>
+        <text>Nb Positions</text>
         <scripts />
         <height>20</height>
-        <border_width>1</border_width>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -1547,408 +1428,286 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
         <width>199</width>
-        <x>54</x>
-        <name>Label_18</name>
-        <y>378</y>
+        <x>30</x>
+        <name>Label Orientation_7</name>
+        <y>412</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
         <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-483e</wuid>
-        <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
-        <text>######</text>
+        <text></text>
         <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>${PREFIX_SCAN}:$(NAME_MTR)-NORD_POS</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>79429b6c:157dd491a6d:-7de5</wuid>
+        <transparent>false</transparent>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <show_units>true</show_units>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color name="TextBackground" red="70" green="70" blue="70" />
+        </background_color>
+        <width>100</width>
+        <x>228</x>
+        <y>406</y>
+        <maximum>1.7976931348623157E308</maximum>
+        <foreground_color>
+          <color name="Green On" red="0" green="255" blue="0" />
+        </foreground_color>
+        <minimum>-1.7976931348623157E308</minimum>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>79429b6c:157dd491a6d:-7dd7</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>Position</text>
+        <scripts />
         <height>20</height>
-        <border_width>1</border_width>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>$(DTACQ-NAME)-STAT-RB</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Update</widget_type>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
-        <format_type>0</format_type>
         <background_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>148</width>
-        <x>1188</x>
-        <name>Text Update</name>
-        <y>24</y>
+        <width>199</width>
+        <x>46</x>
+        <name>Label Orientation_7</name>
+        <y>930</y>
         <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-    </widget>
-    <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
-      <border_style>0</border_style>
-      <tooltip></tooltip>
-      <rules />
-      <enabled>true</enabled>
-      <wuid>-5b5af26c:15364c41bca:-785a</wuid>
-      <transparent>true</transparent>
-      <lock_children>false</lock_children>
-      <scripts />
-      <height>965</height>
-      <border_width>1</border_width>
-      <scale_options>
-        <width_scalable>true</width_scalable>
-        <height_scalable>true</height_scalable>
-        <keep_wh_ratio>false</keep_wh_ratio>
-      </scale_options>
-      <macros>
-        <include_parent_macros>true</include_parent_macros>
-      </macros>
-      <visible>false</visible>
-      <border_color>
-        <color red="0" green="128" blue="255" />
-      </border_color>
-      <widget_type>Grouping Container</widget_type>
-      <background_color>
-        <color red="240" green="240" blue="240" />
-      </background_color>
-      <width>1943</width>
-      <x>1</x>
-      <name>MOTOR</name>
-      <y>1</y>
-      <foreground_color>
-        <color red="192" green="192" blue="192" />
-      </foreground_color>
-      <actions hook="false" hook_all="false" />
-      <fc>false</fc>
-      <show_scrollbar>true</show_scrollbar>
-      <font>
-        <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-      </font>
-      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>0</line_width>
-        <horizontal_fill>true</horizontal_fill>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-7000</wuid>
-        <transparent>false</transparent>
         <pv_value />
-        <alpha>255</alpha>
-        <corner_height>16</corner_height>
-        <bg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </bg_gradient_color>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>243</height>
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
         <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
         <visible>true</visible>
-        <pv_name></pv_name>
-        <gradient>false</gradient>
+        <pv_name>${PREFIX_SCAN}:$(NAME_PS)-NORD_POS</pv_name>
+        <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <anti_alias>true</anti_alias>
-        <corner_width>16</corner_width>
-        <line_style>0</line_style>
-        <widget_type>Rounded Rectangle</widget_type>
-        <fg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </fg_gradient_color>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <background_color>
-          <color red="186" green="189" blue="182" />
-        </background_color>
-        <width>493</width>
-        <x>392</x>
-        <name>Rounded Rectangle_4</name>
-        <y>96</y>
-        <fill_level>0.0</fill_level>
-        <foreground_color>
-          <color red="255" green="0" blue="0" />
-        </foreground_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
         <actions hook="false" hook_all="false" />
-        <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-        </font>
-        <line_color>
-          <color red="128" green="0" blue="255" />
-        </line_color>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
-        <border_style>0</border_style>
+        <border_style>3</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>0</line_width>
-        <horizontal_fill>true</horizontal_fill>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <rules />
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-268a</wuid>
+        <wuid>79429b6c:157dd491a6d:-7dd6</wuid>
         <transparent>false</transparent>
-        <pv_value />
-        <alpha>255</alpha>
-        <corner_height>16</corner_height>
-        <bg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>106</height>
-        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <pv_name></pv_name>
-        <gradient>false</gradient>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <anti_alias>true</anti_alias>
-        <corner_width>16</corner_width>
-        <line_style>0</line_style>
-        <widget_type>Rounded Rectangle</widget_type>
-        <fg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="186" green="189" blue="182" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>337</width>
-        <x>38</x>
-        <name>Rounded Rectangle_4</name>
-        <y>95</y>
-        <fill_level>0.0</fill_level>
+        <width>100</width>
+        <x>228</x>
+        <y>924</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color red="255" green="0" blue="0" />
+          <color name="Green On" red="0" green="255" blue="0" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
-        <line_color>
-          <color red="128" green="0" blue="255" />
-        </line_color>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+        <tooltip></tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>-5b5af26c:15364c41bca:-7593</wuid>
-        <transparent>false</transparent>
-        <pv_value />
+        <enabled>false</enabled>
+        <wuid>79429b6c:157dd491a6d:-7c39</wuid>
+        <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>######</text>
-        <rotation_angle>0.0</rotation_angle>
+        <text>Position</text>
         <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
-        <show_units>true</show_units>
         <height>20</height>
-        <border_width>0</border_width>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>$(PREFIX_MTR):$(NAME_MTR).RBV</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Update</widget_type>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
-        <format_type>0</format_type>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>140</width>
-        <x>584</x>
-        <name>Text Update Template_16</name>
-        <y>200</y>
+        <width>199</width>
+        <x>30</x>
+        <name>Label Orientation_7</name>
+        <y>373</y>
         <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="arial" height="10" style="1">IO Input 1</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <effect_3d>true</effect_3d>
-        <bit>0</bit>
         <pv_value />
-        <height>20</height>
-        <border_width>0</border_width>
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
         <visible>true</visible>
-        <pv_name>$(PREFIX_MTR):$(NAME_MTR).MOVN</pv_name>
+        <pv_name>${PREFIX_MTR}:MTR1.RBV</pv_name>
+        <selector_type>0</selector_type>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>LED</widget_type>
-        <name>LED Template_3</name>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
         <actions hook="false" hook_all="false" />
-        <show_boolean_label>true</show_boolean_label>
-        <border_style>0</border_style>
+        <border_style>3</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>-5b5af26c:15364c41bca:-758f</wuid>
-        <on_color>
-          <color name="Major" red="255" green="0" blue="0" />
-        </on_color>
+        <wuid>79429b6c:157dd491a6d:-7c38</wuid>
+        <transparent>false</transparent>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <on_label></on_label>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>true</keep_wh_ratio>
+          <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <off_color>
-          <color name="IO PV OFF" red="77" green="77" blue="77" />
-        </off_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <square_led>true</square_led>
-        <width>20</width>
-        <x>841</x>
-        <data_type>0</data_type>
-        <y>165</y>
+        <width>100</width>
+        <x>228</x>
+        <y>367</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color name="IO InputPV Fg" red="0" green="32" blue="92" />
+          <color name="Green On" red="0" green="255" blue="0" />
         </foreground_color>
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
-        <off_label></off_label>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <rules />
-        <effect_3d>true</effect_3d>
-        <bit>0</bit>
-        <pv_value />
-        <height>20</height>
-        <border_width>2</border_width>
-        <visible>true</visible>
-        <pv_name>$(PREFIX_MTR):$(NAME_MTR).DMOV</pv_name>
-        <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
-        </border_color>
-        <widget_type>LED</widget_type>
-        <name>LED Template_2</name>
-        <actions hook="false" hook_all="false" />
-        <show_boolean_label>true</show_boolean_label>
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>-5b5af26c:15364c41bca:-758e</wuid>
-        <on_color>
-          <color red="0" green="255" blue="0" />
-        </on_color>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <on_label></on_label>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>true</keep_wh_ratio>
-        </scale_options>
-        <off_color>
-          <color red="77" green="77" blue="77" />
-        </off_color>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
-        </background_color>
-        <square_led>true</square_led>
-        <width>20</width>
-        <x>841</x>
-        <data_type>0</data_type>
-        <y>135</y>
-        <foreground_color>
-          <color name="IO InputPV Fg" red="0" green="32" blue="92" />
-        </foreground_color>
-        <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-        </font>
-        <off_label></off_label>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>false</enabled>
-        <wuid>-5b5af26c:15364c41bca:-7587</wuid>
+        <wuid>4ad471b5:157e1276406:-781e</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>Done moving</text>
+        <text>PS Horizontal</text>
         <scripts />
         <height>20</height>
         <border_width>2</border_width>
@@ -1967,68 +1726,85 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>80</width>
-        <x>746</x>
-        <name>Label Orientation_1</name>
-        <y>135</y>
+        <width>125</width>
+        <x>84</x>
+        <name>Label Orientation_7</name>
+        <y>846</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>-5b5af26c:15364c41bca:-7586</wuid>
-        <transparent>true</transparent>
+        <pv_value />
         <auto_size>false</auto_size>
-        <text>Moving</text>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>$(PREFIX_PS)hor-SP</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>4ad471b5:157e1276406:-781d</wuid>
+        <transparent>false</transparent>
         <scripts />
-        <height>20</height>
-        <border_width>2</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>86</width>
-        <x>746</x>
-        <name>Label Orientation_2</name>
-        <y>165</y>
+        <width>100</width>
+        <x>228</x>
+        <y>840</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color name="Green On" red="0" green="255" blue="0" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>false</enabled>
-        <wuid>-5b5af26c:15364c41bca:-7580</wuid>
+        <wuid>4ad471b5:157e1276406:-780f</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text> Command</text>
+        <text>PS Vertical</text>
         <scripts />
         <height>20</height>
         <border_width>2</border_width>
@@ -2047,57 +1823,16 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>87</width>
-        <x>48</x>
+        <width>127</width>
+        <x>82</x>
         <name>Label Orientation_7</name>
-        <y>146</y>
+        <y>888</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="11" style="1" />
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <enabled>true</enabled>
-        <wuid>-5b5af26c:15364c41bca:-758b</wuid>
-        <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>Motor Record</text>
-        <scripts />
-        <height>43</height>
-        <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="0" blue="0" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
-        <background_color>
-          <color name="IO Shape Fill" red="188" green="188" blue="188" />
-        </background_color>
-        <width>1357</width>
-        <x>0</x>
-        <name>Label_124</name>
-        <y>12</y>
-        <foreground_color>
-          <color name="IO Label" red="0" green="0" blue="0" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
-        <font>
-          <opifont.name fontName="Sans" height="12" style="1">Header 3</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -2116,7 +1851,7 @@ $(pv_value)</tooltip>
         <multiline_input>false</multiline_input>
         <border_width>1</border_width>
         <visible>true</visible>
-        <pv_name>$(PREFIX_MTR):$(NAME_MTR).VAL</pv_name>
+        <pv_name>$(PREFIX_PS)ver-SP</pv_name>
         <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
@@ -2130,7 +1865,7 @@ $(pv_value)</tooltip>
         <border_style>3</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-2689</wuid>
+        <wuid>4ad471b5:157e1276406:-780e</wuid>
         <transparent>false</transparent>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2145,146 +1880,1399 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>140</width>
-        <x>166</x>
-        <y>140</y>
+        <width>100</width>
+        <x>228</x>
+        <y>882</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color name="Green On" red="0" green="255" blue="0" />
         </foreground_color>
         <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.xyGraph" version="1.0.0">
+        <axis_1_scale_format></axis_1_scale_format>
+        <trace_2_x_axis_index>0</trace_2_x_axis_index>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(trace_0_y_pv)
+$(trace_0_y_pv_value)</tooltip>
+        <trace_0_concatenate_data>true</trace_0_concatenate_data>
+        <trace_0_trace_type>0</trace_0_trace_type>
+        <border_width>1</border_width>
+        <trace_1_x_axis_index>0</trace_1_x_axis_index>
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <enabled>true</enabled>
-        <wuid>-3f6498d2:15645d229d4:-2688</wuid>
+        <axis_0_grid_color>
+          <color red="200" green="200" blue="200" />
+        </axis_0_grid_color>
+        <trace_0_name>$(trace_0_y_pv)</trace_0_name>
+        <trace_0_update_mode>0</trace_0_update_mode>
+        <trace_1_x_pv></trace_1_x_pv>
+        <wuid>4ad471b5:157e1276406:-7497</wuid>
         <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>Position</text>
-        <scripts />
-        <height>32</height>
-        <border_width>1</border_width>
+        <trace_1_update_mode>0</trace_1_update_mode>
+        <axis_0_title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </axis_0_title_font>
+        <trace_2_update_mode>0</trace_2_update_mode>
+        <background_color>
+          <color red="240" green="240" blue="240" />
+        </background_color>
+        <x>528</x>
+        <y>39</y>
+        <trace_0_x_axis_index>0</trace_0_x_axis_index>
+        <axis_count>2</axis_count>
+        <trace_1_point_size>4</trace_1_point_size>
+        <trace_1_anti_alias>true</trace_1_anti_alias>
+        <pv_value />
+        <trace_0_buffer_size>5000</trace_0_buffer_size>
+        <trace_2_buffer_size>5000</trace_2_buffer_size>
+        <axis_1_maximum>100.0</axis_1_maximum>
+        <axis_0_scale_font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </axis_0_scale_font>
+        <trigger_pv></trigger_pv>
+        <widget_type>XY Graph</widget_type>
+        <trace_2_line_width>1</trace_2_line_width>
+        <axis_1_axis_color>
+          <color red="0" green="0" blue="0" />
+        </axis_1_axis_color>
+        <axis_0_scale_format></axis_0_scale_format>
+        <axis_1_log_scale>false</axis_1_log_scale>
+        <title></title>
+        <trace_0_visible>true</trace_0_visible>
+        <trace_1_name>$(trace_1_y_pv)</trace_1_name>
+        <trace_1_y_pv_value />
+        <show_legend>true</show_legend>
+        <axis_0_axis_title>Primary X Axis (0)</axis_0_axis_title>
+        <axis_0_axis_color>
+          <color red="0" green="0" blue="0" />
+        </axis_0_axis_color>
+        <trace_2_update_delay>100</trace_2_update_delay>
+        <axis_0_dash_grid_line>true</axis_0_dash_grid_line>
+        <trace_0_point_style>0</trace_0_point_style>
+        <trace_1_point_style>0</trace_1_point_style>
+        <trace_0_line_width>1</trace_0_line_width>
+        <axis_0_time_format>0</axis_0_time_format>
+        <trace_count>3</trace_count>
+        <axis_1_show_grid>true</axis_1_show_grid>
+        <trace_2_trace_color>
+          <color red="33" green="179" blue="33" />
+        </trace_2_trace_color>
+        <axis_1_dash_grid_line>true</axis_1_dash_grid_line>
+        <trace_2_trace_type>0</trace_2_trace_type>
+        <show_toolbar>true</show_toolbar>
+        <axis_0_visible>true</axis_0_visible>
+        <axis_0_show_grid>true</axis_0_show_grid>
+        <trace_0_y_axis_index>1</trace_0_y_axis_index>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
-        <background_color>
-          <color name="SubPanel" red="176" green="218" blue="249" />
+        <trace_1_y_pv>SCANNINGDAQ:AI-CH1-DATA</trace_1_y_pv>
+        <trace_2_concatenate_data>true</trace_2_concatenate_data>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <trace_2_y_pv_value />
+        <trace_2_anti_alias>true</trace_2_anti_alias>
+        <axis_0_maximum>100.0</axis_0_maximum>
+        <trace_1_y_axis_index>1</trace_1_y_axis_index>
+        <trace_2_name>$(trace_2_y_pv)</trace_2_name>
+        <height>313</height>
+        <trace_2_visible>true</trace_2_visible>
+        <trigger_pv_value />
+        <axis_1_grid_color>
+          <color red="200" green="200" blue="200" />
+        </axis_1_grid_color>
+        <actions hook="false" hook_all="false" />
+        <trace_2_point_size>4</trace_2_point_size>
+        <axis_0_log_scale>false</axis_0_log_scale>
+        <trace_0_x_pv_value />
+        <axis_0_auto_scale_threshold>0.0</axis_0_auto_scale_threshold>
+        <rules />
+        <axis_1_visible>true</axis_1_visible>
+        <trace_0_update_delay>100</trace_0_update_delay>
+        <trace_1_concatenate_data>true</trace_1_concatenate_data>
+        <trace_1_trace_color>
+          <color red="242" green="26" blue="26" />
+        </trace_1_trace_color>
+        <pv_name></pv_name>
+        <name>XY Graph</name>
+        <trace_1_trace_type>0</trace_1_trace_type>
+        <axis_0_auto_scale>true</axis_0_auto_scale>
+        <axis_0_minimum>0.0</axis_0_minimum>
+        <trace_2_y_axis_index>1</trace_2_y_axis_index>
+        <trace_1_update_delay>100</trace_1_update_delay>
+        <axis_1_axis_title>Primary Y Axis (1)</axis_1_axis_title>
+        <trace_2_x_pv_value />
+        <axis_1_auto_scale>true</axis_1_auto_scale>
+        <trace_1_line_width>1</trace_1_line_width>
+        <trace_2_y_pv>SCANNINGDAQ:AI-CH3-DATA</trace_2_y_pv>
+        <trace_1_plot_mode>0</trace_1_plot_mode>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <trace_0_y_pv>SCANNINGDAQ:AI-CH0-DATA</trace_0_y_pv>
+        <trace_2_point_style>0</trace_2_point_style>
+        <trace_0_plot_mode>0</trace_0_plot_mode>
+        <enabled>true</enabled>
+        <trace_0_x_pv></trace_0_x_pv>
+        <axis_1_scale_font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </axis_1_scale_font>
+        <axis_1_time_format>0</axis_1_time_format>
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <show_plot_area_border>false</show_plot_area_border>
+        <width>829</width>
+        <trace_1_x_pv_value />
+        <axis_1_minimum>0.0</axis_1_minimum>
+        <title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </title_font>
+        <trace_0_y_pv_value />
+        <trace_1_visible>true</trace_1_visible>
+        <plot_area_background_color>
+          <color red="255" green="255" blue="255" />
+        </plot_area_background_color>
+        <axis_1_title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </axis_1_title_font>
+        <visible>true</visible>
+        <trace_1_buffer_size>5000</trace_1_buffer_size>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <scripts />
+        <trace_0_point_size>4</trace_0_point_size>
+        <trace_0_trace_color>
+          <color red="21" green="21" blue="196" />
+        </trace_0_trace_color>
+        <trace_0_anti_alias>true</trace_0_anti_alias>
+        <axis_1_auto_scale_threshold>0.0</axis_1_auto_scale_threshold>
+        <trace_2_plot_mode>0</trace_2_plot_mode>
+        <trace_2_x_pv></trace_2_x_pv>
+        <foreground_color>
+          <color red="0" green="0" blue="255" />
+        </foreground_color>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>4ad471b5:157e1276406:-70e1</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <alpha>255</alpha>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>108</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name></pv_name>
+        <gradient>false</gradient>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <anti_alias>true</anti_alias>
+        <line_style>0</line_style>
+        <widget_type>Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <background_color>
+          <color name="Field Background Grey" red="240" green="240" blue="240" />
         </background_color>
-        <width>337</width>
-        <x>38</x>
-        <name>Label_15</name>
-        <y>90</y>
+        <width>319</width>
+        <x>48</x>
+        <name>Rectangle_2</name>
+        <y>517</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color red="255" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-31f4</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>Start</text>
+        <scripts />
+        <height>25</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>67</width>
+        <x>40</x>
+        <name>Label Orientation_7</name>
+        <y>531</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
           <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.progressbar" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <effect_3d>true</effect_3d>
-        <scale_font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-        </scale_font>
-        <horizontal>true</horizontal>
         <pv_value />
-        <show_scale>true</show_scale>
-        <scale_format></scale_format>
-        <show_label>false</show_label>
-        <height>109</height>
-        <fill_color>
-          <color red="0" green="0" blue="255" />
-        </fill_color>
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
         <border_width>1</border_width>
-        <value_label_format></value_label_format>
         <visible>true</visible>
-        <pv_name>$(PREFIX_MTR):$(NAME_MTR).RBV</pv_name>
+        <pv_name>${PREFIX_SCAN}:$(NAME_PS).P4SP</pv_name>
+        <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Progress Bar</widget_type>
-        <name>Progress Bar</name>
-        <show_hi>false</show_hi>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
         <actions hook="false" hook_all="false" />
-        <show_lo>false</show_lo>
-        <border_style>0</border_style>
-        <show_lolo>false</show_lolo>
-        <show_minor_ticks>true</show_minor_ticks>
+        <border_style>3</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <show_markers>true</show_markers>
-        <color_hihi>
-          <color red="255" green="0" blue="0" />
-        </color_hihi>
-        <origin>0.0</origin>
-        <show_hihi>false</show_hihi>
-        <log_scale>false</log_scale>
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-7c9c</wuid>
-        <indicator_mode>false</indicator_mode>
-        <level_hihi>90.0</level_hihi>
-        <origin_ignored>true</origin_ignored>
-        <color_hi>
-          <color red="255" green="128" blue="0" />
-        </color_hi>
-        <color_lo>
-          <color red="255" green="128" blue="0" />
-        </color_lo>
+        <wuid>1e771979:1565068c2e3:-31f3</wuid>
+        <transparent>false</transparent>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color name="TextBackground" red="70" green="70" blue="70" />
+        </background_color>
+        <width>100</width>
+        <x>97</x>
+        <y>528</y>
+        <maximum>1.7976931348623157E308</maximum>
+        <foreground_color>
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+        </foreground_color>
+        <minimum>-1.7976931348623157E308</minimum>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>-cae44c:157dd221fed:-75d1</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>Step size</text>
+        <scripts />
+        <height>20</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>95</width>
+        <x>40</x>
+        <name>Label Orientation_2</name>
+        <y>582</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>${PREFIX_SCAN}:$(NAME_PS).P4SI</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input_2</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>-cae44c:157dd221fed:-75d0</wuid>
+        <transparent>false</transparent>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color name="TextBackground" red="70" green="70" blue="70" />
+        </background_color>
+        <width>100</width>
+        <x>159</x>
+        <y>576</y>
+        <maximum>1.7976931348623157E308</maximum>
+        <foreground_color>
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+        </foreground_color>
+        <minimum>-1.7976931348623157E308</minimum>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>4ad471b5:157e1276406:-740b</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>End</text>
+        <scripts />
+        <height>25</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>52</width>
+        <x>208</x>
+        <name>Label Orientation_1</name>
+        <y>531</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>${PREFIX_SCAN}:$(NAME_PS).P4EP</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>4ad471b5:157e1276406:-740a</wuid>
+        <transparent>false</transparent>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color name="TextBackground" red="70" green="70" blue="70" />
+        </background_color>
+        <width>100</width>
+        <x>259</x>
+        <y>528</y>
+        <maximum>1.7976931348623157E308</maximum>
+        <foreground_color>
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+        </foreground_color>
+        <minimum>-1.7976931348623157E308</minimum>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>4ad471b5:157e1276406:-70cf</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>Horizontal</text>
+        <scripts />
+        <height>31</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color red="255" green="255" blue="255" />
+        </background_color>
+        <width>80</width>
+        <x>155</x>
+        <name>Label</name>
+        <y>487</y>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>4ad471b5:157e1276406:-70c5</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <alpha>255</alpha>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>108</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name></pv_name>
+        <gradient>false</gradient>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <anti_alias>true</anti_alias>
+        <line_style>0</line_style>
+        <widget_type>Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <background_color>
+          <color name="Field Background Grey" red="240" green="240" blue="240" />
+        </background_color>
+        <width>319</width>
+        <x>48</x>
+        <name>Rectangle_2</name>
+        <y>668</y>
+        <fill_level>0.0</fill_level>
+        <foreground_color>
+          <color red="255" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>4ad471b5:157e1276406:-70bd</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>Vertical</text>
+        <scripts />
+        <height>27</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color red="255" green="255" blue="255" />
+        </background_color>
+        <width>80</width>
+        <x>159</x>
+        <name>Label</name>
+        <y>642</y>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>4ad471b5:157e1276406:-739b</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>Start</text>
+        <scripts />
+        <height>25</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>67</width>
+        <x>40</x>
+        <name>Label Orientation_1</name>
+        <y>681</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>${PREFIX_SCAN}:$(NAME_PS).P1SP</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>4ad471b5:157e1276406:-739a</wuid>
+        <transparent>false</transparent>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color name="TextBackground" red="70" green="70" blue="70" />
+        </background_color>
+        <width>100</width>
+        <x>97</x>
+        <y>678</y>
+        <maximum>1.7976931348623157E308</maximum>
+        <foreground_color>
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+        </foreground_color>
+        <minimum>-1.7976931348623157E308</minimum>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>4ad471b5:157e1276406:-7395</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>Step size</text>
+        <scripts />
+        <height>20</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>95</width>
+        <x>42</x>
+        <name>Label Orientation_4</name>
+        <y>732</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>${PREFIX_SCAN}:$(NAME_PS).P1SI</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input_4</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>4ad471b5:157e1276406:-7394</wuid>
+        <transparent>false</transparent>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color name="TextBackground" red="70" green="70" blue="70" />
+        </background_color>
+        <width>100</width>
+        <x>145</x>
+        <y>726</y>
+        <maximum>1.7976931348623157E308</maximum>
+        <foreground_color>
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+        </foreground_color>
+        <minimum>-1.7976931348623157E308</minimum>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>4ad471b5:157e1276406:-7393</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>End</text>
+        <scripts />
+        <height>25</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>52</width>
+        <x>208</x>
+        <name>Label Orientation_5</name>
+        <y>681</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
+        <rules />
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>${PREFIX_SCAN}:$(NAME_PS).P1EP</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input_5</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>4ad471b5:157e1276406:-7392</wuid>
+        <transparent>false</transparent>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
+        <background_color>
+          <color name="TextBackground" red="70" green="70" blue="70" />
+        </background_color>
+        <width>100</width>
+        <x>259</x>
+        <y>678</y>
+        <maximum>1.7976931348623157E308</maximum>
+        <foreground_color>
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+        </foreground_color>
+        <minimum>-1.7976931348623157E308</minimum>
+        <font>
+          <fontdata fontName="Sans" height="10" style="1" />
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>4</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>68a2b1f3:157e73a347e:-7d89</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
+        <scripts />
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <show_units>true</show_units>
+        <height>20</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name>SCAN:DET1-COMP</pv_name>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
+        <background_color>
+          <color red="255" green="255" blue="255" />
+        </background_color>
+        <width>100</width>
+        <x>891</x>
+        <name>Text Update</name>
+        <y>408</y>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>68a2b1f3:157e73a347e:-7d86</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
+        <scripts />
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <show_units>true</show_units>
+        <height>20</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name></pv_name>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
+        <background_color>
+          <color red="255" green="255" blue="255" />
+        </background_color>
+        <width>100</width>
+        <x>893</x>
+        <name>Text Update_1</name>
+        <y>468</y>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>68a2b1f3:157e73a347e:-7d83</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
+        <scripts />
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <show_units>true</show_units>
+        <height>20</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name></pv_name>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
+        <background_color>
+          <color red="255" green="255" blue="255" />
+        </background_color>
+        <width>100</width>
+        <x>893</x>
+        <name>Text Update_2</name>
+        <y>517</y>
+        <foreground_color>
+          <color red="0" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </font>
+      </widget>
+    </widget>
+    <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
+      <border_style>0</border_style>
+      <tooltip></tooltip>
+      <rules />
+      <enabled>true</enabled>
+      <wuid>2fea3147:153609206ed:-7765</wuid>
+      <transparent>true</transparent>
+      <lock_children>false</lock_children>
+      <scripts />
+      <height>1130</height>
+      <border_width>1</border_width>
+      <scale_options>
+        <width_scalable>true</width_scalable>
+        <height_scalable>true</height_scalable>
+        <keep_wh_ratio>false</keep_wh_ratio>
+      </scale_options>
+      <macros>
+        <include_parent_macros>true</include_parent_macros>
+      </macros>
+      <visible>false</visible>
+      <border_color>
+        <color red="0" green="128" blue="255" />
+      </border_color>
+      <widget_type>Grouping Container</widget_type>
+      <background_color>
+        <color red="240" green="240" blue="240" />
+      </background_color>
+      <width>2489</width>
+      <x>1</x>
+      <name>DTACQ</name>
+      <y>1</y>
+      <foreground_color>
+        <color red="192" green="192" blue="192" />
+      </foreground_color>
+      <actions hook="false" hook_all="false" />
+      <fc>false</fc>
+      <show_scrollbar>true</show_scrollbar>
+      <font>
+        <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+      </font>
+      <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <rules />
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-663a</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <alpha>255</alpha>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>20</height>
+        <border_width>1</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
+        <visible>true</visible>
+        <pv_name></pv_name>
+        <gradient>false</gradient>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <anti_alias>true</anti_alias>
+        <line_style>0</line_style>
+        <widget_type>Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <background_color>
+          <color red="186" green="189" blue="182" />
+        </background_color>
+        <width>160</width>
+        <x>450</x>
+        <name>Rectangle_2</name>
+        <y>690</y>
+        <fill_level>0.0</fill_level>
+        <foreground_color>
+          <color red="255" green="0" blue="0" />
+        </foreground_color>
+        <actions hook="false" hook_all="false" />
+        <font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.xyGraph" version="1.0.0">
+        <axis_1_scale_format></axis_1_scale_format>
+        <trace_2_x_axis_index>0</trace_2_x_axis_index>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(trace_0_y_pv)
+$(trace_0_y_pv_value)</tooltip>
+        <trace_0_concatenate_data>false</trace_0_concatenate_data>
+        <trace_0_trace_type>0</trace_0_trace_type>
+        <border_width>1</border_width>
+        <trace_1_x_axis_index>0</trace_1_x_axis_index>
+        <border_style>0</border_style>
+        <axis_0_grid_color>
+          <color red="78" green="154" blue="6" />
+        </axis_0_grid_color>
+        <axis_2_visible>false</axis_2_visible>
+        <trace_0_name>$(trace_0_y_pv)</trace_0_name>
+        <axis_2_minimum>0.0</axis_2_minimum>
+        <trace_0_update_mode>0</trace_0_update_mode>
+        <trace_1_x_pv>$(PREFIX_SIG):$(SIGNAL_FC):RCURSOR_X</trace_1_x_pv>
+        <wuid>-3f6498d2:15645d229d4:-6639</wuid>
+        <transparent>false</transparent>
+        <trace_1_update_mode>0</trace_1_update_mode>
+        <axis_0_title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </axis_0_title_font>
+        <trace_2_update_mode>0</trace_2_update_mode>
+        <background_color>
+          <color red="186" green="189" blue="182" />
+        </background_color>
+        <x>450</x>
+        <y>84</y>
+        <trace_0_x_axis_index>0</trace_0_x_axis_index>
+        <axis_count>3</axis_count>
+        <trace_1_point_size>4</trace_1_point_size>
+        <trace_1_anti_alias>true</trace_1_anti_alias>
+        <pv_value />
+        <axis_2_grid_color>
+          <color red="200" green="200" blue="200" />
+        </axis_2_grid_color>
+        <trace_0_buffer_size>520</trace_0_buffer_size>
+        <trace_2_buffer_size>2</trace_2_buffer_size>
+        <axis_1_maximum>20.0</axis_1_maximum>
+        <axis_0_scale_font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </axis_0_scale_font>
+        <trigger_pv></trigger_pv>
+        <widget_type>XY Graph</widget_type>
+        <trace_2_line_width>2</trace_2_line_width>
+        <axis_1_axis_color>
+          <color red="0" green="0" blue="0" />
+        </axis_1_axis_color>
+        <axis_0_scale_format></axis_0_scale_format>
+        <axis_1_log_scale>false</axis_1_log_scale>
+        <title></title>
+        <trace_0_visible>true</trace_0_visible>
+        <trace_1_name>$(trace_1_y_pv)</trace_1_name>
+        <trace_1_y_pv_value />
+        <axis_2_auto_scale>true</axis_2_auto_scale>
+        <show_legend>false</show_legend>
+        <axis_0_axis_title>ms</axis_0_axis_title>
+        <axis_0_axis_color>
+          <color red="0" green="0" blue="0" />
+        </axis_0_axis_color>
+        <axis_2_scale_font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </axis_2_scale_font>
+        <trace_2_update_delay>100</trace_2_update_delay>
+        <axis_0_dash_grid_line>false</axis_0_dash_grid_line>
+        <trace_0_point_style>2</trace_0_point_style>
+        <trace_1_point_style>0</trace_1_point_style>
+        <trace_0_line_width>1</trace_0_line_width>
+        <axis_2_y_axis>false</axis_2_y_axis>
+        <axis_0_time_format>0</axis_0_time_format>
+        <trace_count>3</trace_count>
+        <axis_1_show_grid>true</axis_1_show_grid>
+        <trace_2_trace_color>
+          <color name="Major" red="255" green="0" blue="0" />
+        </trace_2_trace_color>
+        <axis_1_dash_grid_line>true</axis_1_dash_grid_line>
+        <trace_2_trace_type>0</trace_2_trace_type>
+        <show_toolbar>false</show_toolbar>
+        <axis_0_visible>true</axis_0_visible>
+        <axis_0_show_grid>true</axis_0_show_grid>
+        <trace_0_y_axis_index>1</trace_0_y_axis_index>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>true</keep_wh_ratio>
+        </scale_options>
+        <trace_1_y_pv>loc://val(-100,100)</trace_1_y_pv>
+        <trace_2_concatenate_data>false</trace_2_concatenate_data>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <trace_2_y_pv_value />
+        <trace_2_anti_alias>true</trace_2_anti_alias>
+        <axis_0_maximum>100.0</axis_0_maximum>
+        <trace_1_y_axis_index>1</trace_1_y_axis_index>
+        <trace_2_name>$(trace_2_y_pv)</trace_2_name>
+        <height>607</height>
+        <trace_2_visible>true</trace_2_visible>
+        <trigger_pv_value />
+        <axis_1_grid_color>
+          <color red="78" green="154" blue="6" />
+        </axis_1_grid_color>
+        <actions hook="false" hook_all="false" />
+        <trace_2_point_size>4</trace_2_point_size>
+        <axis_2_axis_color>
+          <color red="0" green="0" blue="0" />
+        </axis_2_axis_color>
+        <axis_0_log_scale>false</axis_0_log_scale>
+        <trace_0_x_pv_value />
+        <axis_0_auto_scale_threshold>0.0</axis_0_auto_scale_threshold>
+        <rules />
+        <axis_1_visible>true</axis_1_visible>
+        <axis_2_show_grid>false</axis_2_show_grid>
+        <trace_0_update_delay>1</trace_0_update_delay>
+        <trace_1_concatenate_data>false</trace_1_concatenate_data>
+        <trace_1_trace_color>
+          <color red="242" green="26" blue="26" />
+        </trace_1_trace_color>
+        <pv_name></pv_name>
+        <axis_2_log_scale>false</axis_2_log_scale>
+        <axis_2_auto_scale_threshold>0.0</axis_2_auto_scale_threshold>
+        <name>XY Graph</name>
+        <trace_1_trace_type>0</trace_1_trace_type>
+        <axis_0_auto_scale>true</axis_0_auto_scale>
+        <axis_0_minimum>0.0</axis_0_minimum>
+        <trace_2_y_axis_index>1</trace_2_y_axis_index>
+        <trace_1_update_delay>10</trace_1_update_delay>
+        <axis_2_dash_grid_line>false</axis_2_dash_grid_line>
+        <axis_1_axis_title>mA</axis_1_axis_title>
+        <trace_2_x_pv_value />
+        <axis_1_auto_scale>false</axis_1_auto_scale>
+        <trace_1_line_width>2</trace_1_line_width>
+        <trace_2_y_pv>loc://val(-100,100)</trace_2_y_pv>
+        <trace_1_plot_mode>0</trace_1_plot_mode>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <axis_2_title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </axis_2_title_font>
+        <trace_0_y_pv>$(PREFIX_SIG):$(SIGNAL_FC)</trace_0_y_pv>
+        <trace_2_point_style>0</trace_2_point_style>
+        <trace_0_plot_mode>0</trace_0_plot_mode>
+        <enabled>true</enabled>
+        <trace_0_x_pv>$(PREFIX_SIG):$(SIGNAL_FC)_XMS</trace_0_x_pv>
+        <axis_1_scale_font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </axis_1_scale_font>
+        <axis_1_time_format>0</axis_1_time_format>
+        <axis_2_time_format>0</axis_2_time_format>
+        <axis_2_left_bottom_side>false</axis_2_left_bottom_side>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <axis_2_maximum>22.0</axis_2_maximum>
+        <show_plot_area_border>false</show_plot_area_border>
+        <width>853</width>
+        <trace_1_x_pv_value />
+        <axis_1_minimum>-1.0</axis_1_minimum>
+        <title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </title_font>
+        <trace_0_y_pv_value />
+        <trace_1_visible>true</trace_1_visible>
+        <plot_area_background_color>
+          <color red="0" green="0" blue="0" />
+        </plot_area_background_color>
+        <axis_1_title_font>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
+        </axis_1_title_font>
+        <visible>true</visible>
+        <axis_2_axis_title>ms</axis_2_axis_title>
+        <trace_1_buffer_size>2</trace_1_buffer_size>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <axis_2_scale_format></axis_2_scale_format>
         <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <fillcolor_alarm_sensitive>false</fillcolor_alarm_sensitive>
-        <color_fillbackground>
-          <color red="200" green="200" blue="200" />
-        </color_fillbackground>
-        <major_tick_step_hint>50</major_tick_step_hint>
-        <level_hi>80.0</level_hi>
-        <transparent_background>true</transparent_background>
-        <level_lo>20.0</level_lo>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <limits_from_pv>false</limits_from_pv>
-        <background_color>
-          <color red="240" green="240" blue="240" />
-        </background_color>
-        <level_lolo>10.0</level_lolo>
-        <width>464</width>
-        <x>409</x>
-        <y>200</y>
-        <maximum>200.0</maximum>
-        <color_lolo>
-          <color red="255" green="0" blue="0" />
-        </color_lolo>
+        <trace_0_point_size>3</trace_0_point_size>
+        <trace_0_trace_color>
+          <color red="0" green="255" blue="0" />
+        </trace_0_trace_color>
+        <trace_0_anti_alias>true</trace_0_anti_alias>
+        <axis_1_auto_scale_threshold>0.0</axis_1_auto_scale_threshold>
+        <trace_2_plot_mode>0</trace_2_plot_mode>
+        <trace_2_x_pv>$(PREFIX_SIG):$(SIGNAL_FC):LCURSOR_X</trace_2_x_pv>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="255" />
         </foreground_color>
-        <minimum>0.0</minimum>
-        <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-        </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
         <border_style>0</border_style>
@@ -2296,7 +3284,7 @@ $(pv_value)</tooltip>
 $(pv_value)</tooltip>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-78c5</wuid>
+        <wuid>-3f6498d2:15645d229d4:-6638</wuid>
         <transparent>false</transparent>
         <pv_value />
         <alpha>255</alpha>
@@ -2306,7 +3294,7 @@ $(pv_value)</tooltip>
         </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>103</height>
+        <height>97</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -2330,103 +3318,22 @@ $(pv_value)</tooltip>
         <background_color>
           <color red="186" green="189" blue="182" />
         </background_color>
-        <width>337</width>
-        <x>38</x>
+        <width>349</width>
+        <x>48</x>
         <name>Rounded Rectangle_4</name>
-        <y>230</y>
+        <y>90</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
         <line_color>
           <color red="128" green="0" blue="255" />
         </line_color>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
-        <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-78c4</wuid>
-        <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>Velocity</text>
-        <scripts />
-        <height>20</height>
-        <border_width>2</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
-        <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
-        </background_color>
-        <width>111</width>
-        <x>48</x>
-        <name>Label Orientation_7</name>
-        <y>281</y>
-        <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <font>
-          <fontdata fontName="Sans" height="11" style="1" />
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-78c2</wuid>
-        <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>Motor settings</text>
-        <scripts />
-        <height>32</height>
-        <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
-        <background_color>
-          <color name="SubPanel" red="176" green="218" blue="249" />
-        </background_color>
-        <width>337</width>
-        <x>38</x>
-        <name>Label_15</name>
-        <y>225</y>
-        <foreground_color>
-          <color red="0" green="0" blue="0" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
-        <font>
-          <fontdata fontName="Sans" height="10" style="1" />
-        </font>
-      </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
         <precision>0</precision>
@@ -2438,12 +3345,12 @@ $(pv_value)</tooltip>
         <auto_size>false</auto_size>
         <text></text>
         <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
+        <show_units>false</show_units>
         <height>31</height>
         <multiline_input>false</multiline_input>
         <border_width>1</border_width>
         <visible>true</visible>
-        <pv_name>$(PREFIX_MTR):$(NAME_MTR).VELO</pv_name>
+        <pv_name>$(DTACQ-NAME):TRIGGER:PRETRIGGER_ms</pv_name>
         <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
@@ -2456,8 +3363,8 @@ $(pv_value)</tooltip>
         <actions hook="false" hook_all="false" />
         <border_style>3</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-7099</wuid>
+        <enabled>false</enabled>
+        <wuid>-3f6498d2:15645d229d4:-6637</wuid>
         <transparent>false</transparent>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -2472,16 +3379,16 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>140</width>
-        <x>166</x>
-        <y>275</y>
+        <width>85</width>
+        <x>66</x>
+        <y>136</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
         <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -2490,10 +3397,10 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-6fff</wuid>
+        <wuid>-3f6498d2:15645d229d4:-6636</wuid>
         <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>Motion</text>
+        <text>Display interval</text>
         <scripts />
         <height>32</height>
         <border_width>1</border_width>
@@ -2512,10 +3419,10 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
-        <width>493</width>
-        <x>392</x>
+        <width>349</width>
+        <x>48</x>
         <name>Label_15</name>
-        <y>91</y>
+        <y>85</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
@@ -2525,174 +3432,133 @@ $(pv_value)</tooltip>
           <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>0</line_width>
-        <horizontal_fill>true</horizontal_fill>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
+        <precision>2</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-6f55</wuid>
-        <transparent>false</transparent>
         <pv_value />
-        <alpha>255</alpha>
-        <corner_height>16</corner_height>
-        <bg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </bg_gradient_color>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>363</height>
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>false</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
         <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
         <visible>true</visible>
-        <pv_name></pv_name>
-        <gradient>false</gradient>
+        <pv_name>$(DTACQ-NAME):NSAMPLES_ms</pv_name>
+        <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <anti_alias>true</anti_alias>
-        <corner_width>16</corner_width>
-        <line_style>0</line_style>
-        <widget_type>Rounded Rectangle</widget_type>
-        <fg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </fg_gradient_color>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <background_color>
-          <color red="186" green="189" blue="182" />
-        </background_color>
-        <width>440</width>
-        <x>900</x>
-        <name>Rounded Rectangle_4</name>
-        <y>96</y>
-        <fill_level>0.0</fill_level>
-        <foreground_color>
-          <color red="255" green="0" blue="0" />
-        </foreground_color>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input_15</name>
+        <style>0</style>
         <actions hook="false" hook_all="false" />
-        <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-        </font>
-        <line_color>
-          <color red="128" green="0" blue="255" />
-        </line_color>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-6f54</wuid>
+        <wuid>-3f6498d2:15645d229d4:-6635</wuid>
         <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>Motion</text>
         <scripts />
-        <height>32</height>
-        <border_width>1</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color name="SubPanel" red="176" green="218" blue="249" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>440</width>
-        <x>900</x>
-        <name>Label_15</name>
-        <y>90</y>
+        <width>85</width>
+        <x>216</x>
+        <y>136</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>2</line_width>
+        <horizontal_fill>true</horizontal_fill>
         <alarm_pulsing>false</alarm_pulsing>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
+        <arrows>1</arrows>
         <rules />
-        <effect_3d>true</effect_3d>
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-6b0b</wuid>
-        <on_color>
-          <color name="IO OK" red="0" green="255" blue="0" />
-        </on_color>
-        <horizontal>false</horizontal>
+        <wuid>-3f6498d2:15645d229d4:-6634</wuid>
+        <transparent>false</transparent>
+        <points>
+          <point x="214" y="144" />
+          <point x="157" y="144" />
+          <point x="157" y="144" />
+        </points>
+        <fill_arrow>true</fill_arrow>
         <pv_value />
-        <numBits>15</numBits>
+        <alpha>255</alpha>
+        <rotation_angle>0.0</rotation_angle>
         <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
-        <height>320</height>
-        <border_width>0</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>1</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
+          <keep_wh_ratio>true</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>$(PREFIX_MTR):$(NAME_MTR).MSTA</pv_name>
+        <pv_name></pv_name>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <bitReverse>true</bitReverse>
-        <label />
-        <widget_type>Byte Monitor</widget_type>
-        <off_color>
-          <color name="IO Grid" red="215" green="215" blue="215" />
-        </off_color>
+        <anti_alias>true</anti_alias>
+        <line_style>2</line_style>
+        <arrow_length>20</arrow_length>
+        <widget_type>Polyline</widget_type>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color red="0" green="0" blue="0" />
         </background_color>
-        <square_led>true</square_led>
-        <startBit>0</startBit>
-        <width>25</width>
-        <x>932</x>
-        <name>Byte Monitor Template</name>
-        <y>131</y>
+        <width>58</width>
+        <x>157</x>
+        <name>Polyline_1</name>
+        <y>144</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color name="IO InputPV Fg" red="0" green="32" blue="92" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a44</wuid>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-6633</wuid>
         <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>DONE: Motion is complete.</text>
+        <auto_size>false</auto_size>
+        <text>ms</text>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <height>20</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -2701,121 +3567,155 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color red="255" green="255" blue="255" />
         </background_color>
-        <width>159</width>
-        <x>968</x>
-        <name>Label Template_4</name>
-        <y>156</y>
+        <width>40</width>
+        <x>324</x>
+        <name>Label_16</name>
+        <y>142</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a43</wuid>
-        <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>PLUS_LS: Plus limit switch has been hit.</text>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-6632</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <alpha>255</alpha>
+        <corner_height>16</corner_height>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>97</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name></pv_name>
+        <gradient>false</gradient>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <anti_alias>true</anti_alias>
+        <corner_width>16</corner_width>
+        <line_style>0</line_style>
+        <widget_type>Rounded Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color red="186" green="189" blue="182" />
         </background_color>
-        <width>239</width>
-        <x>968</x>
-        <name>Label Template_5</name>
-        <y>177</y>
+        <width>349</width>
+        <x>48</x>
+        <name>Rounded Rectangle_5</name>
+        <y>228</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>2</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a42</wuid>
-        <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>HOMELS: Sate of the home limit switch.</text>
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):LCURSOR_ms</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input_16</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-6631</wuid>
+        <transparent>false</transparent>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>235</width>
-        <x>968</x>
-        <name>Label Template_6</name>
-        <y>198</y>
+        <width>85</width>
+        <x>66</x>
+        <y>274</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a41</wuid>
-        <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>Unused.</text>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-6630</wuid>
+        <transparent>false</transparent>
+        <auto_size>false</auto_size>
+        <text>Measure interval</text>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <height>32</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -2824,121 +3724,153 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
         <wrap_words>true</wrap_words>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
-        <width>48</width>
-        <x>968</x>
-        <name>Label Template_7</name>
-        <y>219</y>
+        <width>349</width>
+        <x>48</x>
+        <name>Label_17</name>
+        <y>223</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>2</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a40</wuid>
-        <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>POSITION: Closed-loop position control is enabled.</text>
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
+        <border_width>1</border_width>
+        <visible>true</visible>
+        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):RCURSOR_ms</pv_name>
+        <selector_type>0</selector_type>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input_17</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-662f</wuid>
+        <transparent>false</transparent>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>295</width>
-        <x>968</x>
-        <name>Label Template_8</name>
-        <y>240</y>
+        <width>85</width>
+        <x>216</x>
+        <y>274</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>2</line_width>
+        <horizontal_fill>true</horizontal_fill>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <arrows>1</arrows>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a3f</wuid>
-        <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>SLIP_STALL: Slip/Stall detected (eg. fatal following error).</text>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-662e</wuid>
+        <transparent>false</transparent>
+        <points>
+          <point x="214" y="282" />
+          <point x="157" y="282" />
+          <point x="157" y="282" />
+        </points>
+        <fill_arrow>true</fill_arrow>
+        <pv_value />
+        <alpha>255</alpha>
+        <rotation_angle>0.0</rotation_angle>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>1</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
+          <keep_wh_ratio>true</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name></pv_name>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <anti_alias>true</anti_alias>
+        <line_style>2</line_style>
+        <arrow_length>20</arrow_length>
+        <widget_type>Polyline</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color red="0" green="0" blue="0" />
         </background_color>
-        <width>332</width>
-        <x>968</x>
-        <name>Label Template_9</name>
-        <y>261</y>
+        <width>58</width>
+        <x>157</x>
+        <name>Polyline_2</name>
+        <y>282</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a3e</wuid>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-662d</wuid>
         <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>HOME: If at home position.</text>
+        <auto_size>false</auto_size>
+        <text>ms</text>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <height>20</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -2947,39 +3879,38 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color red="255" green="255" blue="255" />
         </background_color>
-        <width>157</width>
-        <x>968</x>
-        <name>Label Template_10</name>
-        <y>282</y>
+        <width>40</width>
+        <x>324</x>
+        <name>Label_18</name>
+        <y>280</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a3d</wuid>
-        <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>PRESENT: Encoder is present.</text>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-662c</wuid>
+        <transparent>false</transparent>
+        <auto_size>false</auto_size>
+        <text>FC Curr</text>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <height>24</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -2988,203 +3919,252 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color red="0" green="0" blue="0" />
         </background_color>
-        <width>181</width>
-        <x>968</x>
-        <name>Label Template_22</name>
-        <y>303</y>
+        <width>160</width>
+        <x>450</x>
+        <name>Label_11</name>
+        <y>710</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color name="TextDynamic" red="0" green="244" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>3</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a3c</wuid>
-        <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>PROBLEM: Driver stopped polling, or hardware problem.</text>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-662b</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <show_units>true</show_units>
+        <height>24</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
+        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):AVG</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>324</width>
-        <x>968</x>
-        <name>Label Template_23</name>
-        <y>324</y>
+        <width>150</width>
+        <x>609</x>
+        <name>Text Update_3</name>
+        <y>710</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color name="TextDynamic" red="0" green="244" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>3</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a3b</wuid>
-        <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>MOVING: Non-zero velocity present.</text>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-662a</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <show_units>true</show_units>
+        <height>24</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
+        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):MAX</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>210</width>
-        <x>968</x>
-        <name>Label Template_13</name>
-        <y>345</y>
+        <width>150</width>
+        <x>758</x>
+        <name>Text Update_1</name>
+        <y>710</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color name="TextDynamic" red="0" green="244" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>3</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a3a</wuid>
-        <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>GAIN_SUPPORT: Motor supports closed-loop pos. control.</text>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-6629</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <auto_size>false</auto_size>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <show_units>true</show_units>
+        <height>24</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
+        <pv_name>$(PREFIX_SIG):$(SIGNAL_FC):MIN</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>340</width>
-        <x>968</x>
-        <name>Label Template_14</name>
-        <y>366</y>
+        <width>150</width>
+        <x>907</x>
+        <name>Text Update_2</name>
+        <y>710</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color name="TextDynamic" red="0" green="244" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>1</line_width>
+        <horizontal_fill>true</horizontal_fill>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a39</wuid>
-        <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>COMM_ERR: Controller communication error.</text>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-6628</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <alpha>255</alpha>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>22</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name></pv_name>
+        <gradient>false</gradient>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <anti_alias>true</anti_alias>
+        <line_style>0</line_style>
+        <widget_type>Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color red="186" green="189" blue="182" />
         </background_color>
-        <width>263</width>
-        <x>968</x>
-        <name>Label Template_15</name>
-        <y>387</y>
+        <width>448</width>
+        <x>609</x>
+        <name>Rectangle_1</name>
+        <y>689</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
+        <line_color>
+          <color red="0" green="0" blue="0" />
+        </line_color>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a38</wuid>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-6627</wuid>
         <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>MINUS_LS: Minus limit switch has been hit.</text>
+        <auto_size>false</auto_size>
+        <text>Max</text>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <height>20</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -3193,39 +4173,38 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color red="255" green="255" blue="255" />
         </background_color>
-        <width>255</width>
-        <x>968</x>
-        <name>Label Template_16</name>
-        <y>408</y>
+        <width>150</width>
+        <x>758</x>
+        <name>Label_5</name>
+        <y>690</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a37</wuid>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-6626</wuid>
         <transparent>true</transparent>
-        <auto_size>true</auto_size>
-        <text>HOMED: The motor has been homed.</text>
+        <auto_size>false</auto_size>
+        <text>Min</text>
         <scripts />
-        <height>15</height>
-        <border_width>2</border_width>
+        <height>20</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -3234,39 +4213,38 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color red="255" green="255" blue="255" />
         </background_color>
-        <width>218</width>
-        <x>968</x>
-        <name>Label Template_17</name>
-        <y>429</y>
+        <width>150</width>
+        <x>907</x>
+        <name>Label_22</name>
+        <y>690</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-6a36</wuid>
-        <transparent>false</transparent>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-6625</wuid>
+        <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>DIRECTION: Last raw direction; (Grey: Neg., Green: Pos.)</text>
+        <text>Average</text>
         <scripts />
         <height>20</height>
-        <border_width>2</border_width>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -3275,135 +4253,113 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="IO Shape Fill" red="188" green="188" blue="188" />
+          <color red="255" green="255" blue="255" />
         </background_color>
-        <width>350</width>
-        <x>968</x>
-        <name>Label Template_45</name>
-        <y>135</y>
+        <width>150</width>
+        <x>609</x>
+        <name>Label_21</name>
+        <y>690</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.BoolButton" version="1.0.0">
         <toggle_button>true</toggle_button>
-        <border_style>6</border_style>
+        <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <alarm_pulsing>false</alarm_pulsing>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
         <push_action_index>1</push_action_index>
         <rules />
+        <effect_3d>true</effect_3d>
+        <bit>-1</bit>
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-597a</wuid>
-        <release_action_index>0</release_action_index>
+        <wuid>-3f6498d2:15645d229d4:-3a0d</wuid>
+        <on_color>
+          <color red="0" green="255" blue="0" />
+        </on_color>
+        <show_confirm_dialog>0</show_confirm_dialog>
+        <password></password>
         <pv_value />
-        <text>STOP</text>
+        <released_action_index>0</released_action_index>
+        <square_button>true</square_button>
+        <show_led>true</show_led>
         <scripts />
         <border_alarm_sensitive>true</border_alarm_sensitive>
-        <height>64</height>
-        <border_width>2</border_width>
+        <height>35</height>
+        <on_label>ON</on_label>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
+          <keep_wh_ratio>true</keep_wh_ratio>
         </scale_options>
-        <image></image>
         <visible>true</visible>
-        <pv_name></pv_name>
+        <pv_name>SYS0-EVR0:FrontOut0-Ena-SP</pv_name>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Action Button</widget_type>
+        <widget_type>Boolean Button</widget_type>
+        <off_color>
+          <color red="0" green="100" blue="0" />
+        </off_color>
+        <confirm_message>Are your sure you want to do this?</confirm_message>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color name="Major" red="255" green="0" blue="0" />
+          <color red="240" green="240" blue="240" />
         </background_color>
-        <width>181</width>
-        <x>576</x>
-        <name>Action Button Template_1</name>
-        <y>380</y>
-        <style>0</style>
+        <width>109</width>
+        <x>289</x>
+        <name>Boolean Button</name>
+        <data_type>0</data_type>
+        <y>370</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="0" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
+        <actions hook="false" hook_all="false">
+          <action type="WRITE_PV">
+            <pv_name>$(pv_name)</pv_name>
+            <value>0</value>
+            <timeout>10</timeout>
+            <confirm_message></confirm_message>
+            <description></description>
+          </action>
+          <action type="WRITE_PV">
+            <pv_name>$(pv_name)</pv_name>
+            <value>1</value>
+            <timeout>10</timeout>
+            <confirm_message></confirm_message>
+            <description></description>
+          </action>
+        </actions>
+        <show_boolean_label>true</show_boolean_label>
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
+        <off_label>OFF</off_label>
       </widget>
-    </widget>
-    <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
-      <border_style>0</border_style>
-      <tooltip></tooltip>
-      <rules />
-      <enabled>true</enabled>
-      <wuid>-5b5af26c:15364c41bca:-6d20</wuid>
-      <transparent>true</transparent>
-      <lock_children>false</lock_children>
-      <scripts />
-      <height>965</height>
-      <border_width>1</border_width>
-      <scale_options>
-        <width_scalable>true</width_scalable>
-        <height_scalable>true</height_scalable>
-        <keep_wh_ratio>false</keep_wh_ratio>
-      </scale_options>
-      <macros>
-        <include_parent_macros>true</include_parent_macros>
-      </macros>
-      <visible>false</visible>
-      <border_color>
-        <color red="0" green="128" blue="255" />
-      </border_color>
-      <widget_type>Grouping Container</widget_type>
-      <background_color>
-        <color red="240" green="240" blue="240" />
-      </background_color>
-      <width>1943</width>
-      <x>1</x>
-      <name>TREK6096E</name>
-      <y>1</y>
-      <foreground_color>
-        <color red="192" green="192" blue="192" />
-      </foreground_color>
-      <actions hook="false" hook_all="false" />
-      <fc>false</fc>
-      <show_scrollbar>true</show_scrollbar>
-      <font>
-        <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-      </font>
-      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>0</line_width>
-        <horizontal_fill>true</horizontal_fill>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+        <tooltip></tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-5856</wuid>
+        <wuid>-3f6498d2:15645d229d4:-38f7</wuid>
         <transparent>false</transparent>
-        <pv_value />
-        <alpha>255</alpha>
-        <corner_height>16</corner_height>
-        <bg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </bg_gradient_color>
+        <auto_size>false</auto_size>
+        <text>Fast Acquisition</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>106</height>
+        <height>43</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -3411,51 +4367,41 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name></pv_name>
-        <gradient>false</gradient>
+        <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color red="0" green="0" blue="0" />
         </border_color>
-        <anti_alias>true</anti_alias>
-        <corner_width>16</corner_width>
-        <line_style>0</line_style>
-        <widget_type>Rounded Rectangle</widget_type>
-        <fg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </fg_gradient_color>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color red="186" green="189" blue="182" />
+          <color name="IO Shape Fill" red="188" green="188" blue="188" />
         </background_color>
-        <width>568</width>
-        <x>72</x>
-        <name>Rounded Rectangle_4</name>
-        <y>72</y>
-        <fill_level>0.0</fill_level>
+        <width>1357</width>
+        <x>0</x>
+        <name>Label_124</name>
+        <y>12</y>
         <foreground_color>
-          <color red="255" green="0" blue="0" />
+          <color name="IO Label" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="13" style="1">Header 3</opifont.name>
         </font>
-        <line_color>
-          <color red="128" green="0" blue="255" />
-        </line_color>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-5860</wuid>
+        <enabled>true</enabled>
+        <wuid>-3f6498d2:15645d229d4:-348a</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>Voltage</text>
+        <text>Activate timing System</text>
         <scripts />
         <height>20</height>
-        <border_width>2</border_width>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -3464,94 +4410,45 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color red="255" green="255" blue="255" />
         </background_color>
-        <width>87</width>
-        <x>93</x>
-        <name>Label Orientation_7</name>
-        <y>122</y>
+        <width>199</width>
+        <x>54</x>
+        <name>Label_18</name>
+        <y>378</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="11" style="1" />
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <alarm_pulsing>false</alarm_pulsing>
         <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
+        <enabled>true</enabled>
+        <wuid>1e771979:1565068c2e3:-483e</wuid>
+        <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
-        <text></text>
+        <text>######</text>
         <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>$(PREFIX_PS)hor-SP</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-585f</wuid>
-        <transparent>false</transparent>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
-        <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
-        </background_color>
-        <width>140</width>
-        <x>189</x>
-        <y>116</y>
-        <maximum>1.7976931348623157E308</maximum>
-        <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
-        </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
-        <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-585e</wuid>
-        <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>HORIZONTAL Power Supply</text>
-        <scripts />
-        <height>32</height>
+        <show_units>true</show_units>
+        <height>20</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -3559,48 +4456,93 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
+        <pv_name>$(DTACQ-NAME)-STAT-RB</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
         <background_color>
-          <color name="SubPanel" red="176" green="218" blue="249" />
+          <color red="0" green="0" blue="0" />
         </background_color>
-        <width>568</width>
-        <x>72</x>
-        <name>Label_15</name>
-        <y>66</y>
+        <width>148</width>
+        <x>1188</x>
+        <name>Text Update</name>
+        <y>24</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="TextDynamic" red="0" green="244" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    </widget>
+    <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
+      <border_style>0</border_style>
+      <tooltip></tooltip>
+      <rules />
+      <enabled>true</enabled>
+      <wuid>-5b5af26c:15364c41bca:-785a</wuid>
+      <transparent>true</transparent>
+      <lock_children>false</lock_children>
+      <scripts />
+      <height>1130</height>
+      <border_width>1</border_width>
+      <scale_options>
+        <width_scalable>true</width_scalable>
+        <height_scalable>true</height_scalable>
+        <keep_wh_ratio>false</keep_wh_ratio>
+      </scale_options>
+      <macros>
+        <include_parent_macros>true</include_parent_macros>
+      </macros>
+      <visible>true</visible>
+      <border_color>
+        <color red="0" green="128" blue="255" />
+      </border_color>
+      <widget_type>Grouping Container</widget_type>
+      <background_color>
+        <color red="240" green="240" blue="240" />
+      </background_color>
+      <width>2489</width>
+      <x>1</x>
+      <name>MOTOR</name>
+      <y>1</y>
+      <foreground_color>
+        <color red="192" green="192" blue="192" />
+      </foreground_color>
+      <actions hook="false" hook_all="false" />
+      <fc>false</fc>
+      <show_scrollbar>true</show_scrollbar>
+      <font>
+        <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+      </font>
+      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>3</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-5848</wuid>
+        <wuid>1e771979:1565068c2e3:-7000</wuid>
         <transparent>false</transparent>
         <pv_value />
-        <auto_size>false</auto_size>
-        <text>######</text>
-        <rotation_angle>0.0</rotation_angle>
+        <alpha>255</alpha>
+        <corner_height>16</corner_height>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <show_units>true</show_units>
-        <height>31</height>
+        <height>243</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -3608,30 +4550,37 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>$(PREFIX_PS)hor-RBV</pv_name>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name></pv_name>
+        <gradient>false</gradient>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <precision_from_pv>false</precision_from_pv>
-        <widget_type>Text Update</widget_type>
+        <anti_alias>true</anti_alias>
+        <corner_width>16</corner_width>
+        <line_style>0</line_style>
+        <widget_type>Rounded Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <wrap_words>false</wrap_words>
-        <format_type>0</format_type>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color red="186" green="189" blue="182" />
         </background_color>
-        <width>150</width>
-        <x>411</x>
-        <name>Text Update_3</name>
-        <y>116</y>
+        <width>493</width>
+        <x>392</x>
+        <name>Rounded Rectangle_4</name>
+        <y>96</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
         <border_style>0</border_style>
@@ -3643,7 +4592,7 @@ $(pv_value)</tooltip>
 $(pv_value)</tooltip>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-5732</wuid>
+        <wuid>-3f6498d2:15645d229d4:-268a</wuid>
         <transparent>false</transparent>
         <pv_value />
         <alpha>255</alpha>
@@ -3677,132 +4626,195 @@ $(pv_value)</tooltip>
         <background_color>
           <color red="186" green="189" blue="182" />
         </background_color>
-        <width>568</width>
-        <x>72</x>
+        <width>337</width>
+        <x>38</x>
         <name>Rounded Rectangle_4</name>
-        <y>246</y>
+        <y>95</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
         <line_color>
           <color red="128" green="0" blue="255" />
         </line_color>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-5731</wuid>
-        <transparent>true</transparent>
+        <enabled>true</enabled>
+        <wuid>-5b5af26c:15364c41bca:-7593</wuid>
+        <transparent>false</transparent>
+        <pv_value />
         <auto_size>false</auto_size>
-        <text>Voltage</text>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
         <scripts />
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <show_units>true</show_units>
         <height>20</height>
-        <border_width>2</border_width>
+        <border_width>0</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
+        <pv_name>$(PREFIX_MTR):$(NAME_MTR).RBV</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <widget_type>Label</widget_type>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Update</widget_type>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>87</width>
-        <x>93</x>
-        <name>Label Orientation_7</name>
-        <y>296</y>
+        <width>140</width>
+        <x>584</x>
+        <name>Text Update Template_16</name>
+        <y>200</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color name="TextDynamic" red="0" green="244" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="11" style="1" />
+          <opifont.name fontName="arial" height="10" style="1">IO Input 1</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
         <rules />
+        <effect_3d>true</effect_3d>
+        <bit>0</bit>
         <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
+        <height>20</height>
+        <border_width>0</border_width>
         <visible>true</visible>
-        <pv_name>$(PREFIX_PS)ver-SP</pv_name>
-        <selector_type>0</selector_type>
+        <pv_name>$(PREFIX_MTR):$(NAME_MTR).MOVN</pv_name>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input</name>
-        <style>0</style>
+        <widget_type>LED</widget_type>
+        <name>LED Template_3</name>
         <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
+        <show_boolean_label>true</show_boolean_label>
+        <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-5730</wuid>
-        <transparent>false</transparent>
+        <wuid>-5b5af26c:15364c41bca:-758f</wuid>
+        <on_color>
+          <color name="Major" red="255" green="0" blue="0" />
+        </on_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
+        <on_label></on_label>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
+          <keep_wh_ratio>true</keep_wh_ratio>
         </scale_options>
+        <off_color>
+          <color name="IO PV OFF" red="77" green="77" blue="77" />
+        </off_color>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <square_led>true</square_led>
+        <width>20</width>
+        <x>841</x>
+        <data_type>0</data_type>
+        <y>165</y>
+        <foreground_color>
+          <color name="IO InputPV Fg" red="0" green="32" blue="92" />
+        </foreground_color>
+        <font>
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+        </font>
+        <off_label></off_label>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+        <rules />
+        <effect_3d>true</effect_3d>
+        <bit>0</bit>
+        <pv_value />
+        <height>20</height>
+        <border_width>2</border_width>
+        <visible>true</visible>
+        <pv_name>$(PREFIX_MTR):$(NAME_MTR).DMOV</pv_name>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>LED</widget_type>
+        <name>LED Template_2</name>
+        <actions hook="false" hook_all="false" />
+        <show_boolean_label>true</show_boolean_label>
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>-5b5af26c:15364c41bca:-758e</wuid>
+        <on_color>
+          <color red="0" green="255" blue="0" />
+        </on_color>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <on_label></on_label>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>true</keep_wh_ratio>
+        </scale_options>
+        <off_color>
+          <color red="77" green="77" blue="77" />
+        </off_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>140</width>
-        <x>189</x>
-        <y>290</y>
-        <maximum>1.7976931348623157E308</maximum>
+        <square_led>true</square_led>
+        <width>20</width>
+        <x>841</x>
+        <data_type>0</data_type>
+        <y>135</y>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color name="IO InputPV Fg" red="0" green="32" blue="92" />
         </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="1">Default Bold</opifont.name>
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
+        <off_label></off_label>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-572f</wuid>
-        <transparent>false</transparent>
+        <enabled>false</enabled>
+        <wuid>-5b5af26c:15364c41bca:-7587</wuid>
+        <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>VERTICAL Power Supply</text>
+        <text>Done moving</text>
         <scripts />
-        <height>32</height>
-        <border_width>1</border_width>
+        <height>20</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -3811,245 +4823,117 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="SubPanel" red="176" green="218" blue="249" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>568</width>
-        <x>72</x>
-        <name>Label_15</name>
-        <y>240</y>
+        <width>80</width>
+        <x>746</x>
+        <name>Label Orientation_1</name>
+        <y>135</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>3</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <tooltip></tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-572e</wuid>
-        <transparent>false</transparent>
-        <pv_value />
+        <enabled>false</enabled>
+        <wuid>-5b5af26c:15364c41bca:-7586</wuid>
+        <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>######</text>
-        <rotation_angle>0.0</rotation_angle>
+        <text>Moving</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <show_units>true</show_units>
-        <height>31</height>
-        <border_width>1</border_width>
+        <height>20</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>$(PREFIX_PS)ver-RBV</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <precision_from_pv>false</precision_from_pv>
-        <widget_type>Text Update</widget_type>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
-        <format_type>0</format_type>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>150</width>
-        <x>411</x>
-        <name>Text Update_3</name>
-        <y>290</y>
+        <width>86</width>
+        <x>746</x>
+        <name>Label Orientation_2</name>
+        <y>165</y>
         <foreground_color>
-          <color name="TextDynamic" red="0" green="244" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
-    </widget>
-    <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
-      <border_style>0</border_style>
-      <tooltip></tooltip>
-      <rules />
-      <enabled>true</enabled>
-      <wuid>-4f668e34:1537ecf193c:-7f8d</wuid>
-      <transparent>true</transparent>
-      <lock_children>false</lock_children>
-      <scripts />
-      <height>965</height>
-      <border_width>1</border_width>
-      <scale_options>
-        <width_scalable>true</width_scalable>
-        <height_scalable>true</height_scalable>
-        <keep_wh_ratio>false</keep_wh_ratio>
-      </scale_options>
-      <macros>
-        <include_parent_macros>true</include_parent_macros>
-      </macros>
-      <visible>true</visible>
-      <border_color>
-        <color red="0" green="128" blue="255" />
-      </border_color>
-      <widget_type>Grouping Container</widget_type>
-      <background_color>
-        <color red="240" green="240" blue="240" />
-      </background_color>
-      <width>1943</width>
-      <x>1</x>
-      <name>SCANNING</name>
-      <y>1</y>
-      <foreground_color>
-        <color red="192" green="192" blue="192" />
-      </foreground_color>
-      <actions hook="false" hook_all="false" />
-      <fc>false</fc>
-      <show_scrollbar>true</show_scrollbar>
-      <font>
-        <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-      </font>
-      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>0</line_width>
-        <horizontal_fill>true</horizontal_fill>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+        <tooltip></tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4ace</wuid>
-        <transparent>false</transparent>
-        <pv_value />
-        <alpha>255</alpha>
-        <corner_height>16</corner_height>
-        <bg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </bg_gradient_color>
+        <enabled>false</enabled>
+        <wuid>-5b5af26c:15364c41bca:-7580</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text> Command</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>856</height>
-        <border_width>1</border_width>
+        <height>20</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name></pv_name>
-        <gradient>false</gradient>
+        <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <anti_alias>true</anti_alias>
-        <corner_width>16</corner_width>
-        <line_style>0</line_style>
-        <widget_type>Rounded Rectangle</widget_type>
-        <fg_gradient_color>
-          <color red="255" green="255" blue="255" />
-        </fg_gradient_color>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color red="186" green="189" blue="182" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>349</width>
-        <x>30</x>
-        <name>Rounded Rectangle_5</name>
-        <y>39</y>
-        <fill_level>0.0</fill_level>
+        <width>87</width>
+        <x>48</x>
+        <name>Label Orientation_7</name>
+        <y>146</y>
         <foreground_color>
-          <color red="255" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-        </font>
-        <line_color>
-          <color red="128" green="0" blue="255" />
-        </line_color>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <rules />
-        <effect_3d>true</effect_3d>
-        <bit>-1</bit>
-        <pv_value />
-        <height>18</height>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv_name>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>LED</widget_type>
-        <name>LED</name>
-        <actions hook="false" hook_all="false" />
-        <show_boolean_label>false</show_boolean_label>
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4cec</wuid>
-        <on_color>
-          <color red="0" green="255" blue="0" />
-        </on_color>
-        <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
-        <on_label>ON</on_label>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>true</keep_wh_ratio>
-        </scale_options>
-        <off_color>
-          <color red="0" green="100" blue="0" />
-        </off_color>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <background_color>
-          <color red="240" green="240" blue="240" />
-        </background_color>
-        <square_led>true</square_led>
-        <width>20</width>
-        <x>870</x>
-        <data_type>0</data_type>
-        <y>142</y>
-        <foreground_color>
-          <color red="192" green="192" blue="192" />
-        </foreground_color>
-        <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <fontdata fontName="Sans" height="11" style="1" />
         </font>
-        <off_label>OFF</off_label>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4ceb</wuid>
-        <transparent>true</transparent>
+        <wuid>-5b5af26c:15364c41bca:-758b</wuid>
+        <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>Scan Busy</text>
+        <text>Motor Record</text>
         <scripts />
-        <height>18</height>
+        <height>43</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -4059,92 +4943,95 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color red="0" green="0" blue="0" />
         </border_color>
         <widget_type>Label</widget_type>
         <wrap_words>true</wrap_words>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="IO Shape Fill" red="188" green="188" blue="188" />
         </background_color>
-        <width>115</width>
-        <x>726</x>
-        <name>Label_2</name>
-        <y>142</y>
+        <width>1357</width>
+        <x>0</x>
+        <name>Label_124</name>
+        <y>12</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Label" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="13" style="1">Header 3</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
+        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <effect_3d>true</effect_3d>
-        <bit>-1</bit>
         <pv_value />
-        <height>18</height>
+        <auto_size>false</auto_size>
+        <text></text>
+        <rotation_angle>0.0</rotation_angle>
+        <show_units>true</show_units>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
         <border_width>1</border_width>
         <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).DATA</pv_name>
+        <pv_name>$(PREFIX_MTR):$(NAME_MTR).VAL</pv_name>
+        <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>LED</widget_type>
-        <name>LED_1</name>
+        <precision_from_pv>true</precision_from_pv>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
         <actions hook="false" hook_all="false" />
-        <show_boolean_label>false</show_boolean_label>
-        <border_style>0</border_style>
+        <border_style>3</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4cea</wuid>
-        <on_color>
-          <color red="0" green="255" blue="0" />
-        </on_color>
+        <wuid>-3f6498d2:15645d229d4:-2689</wuid>
+        <transparent>false</transparent>
         <scripts />
-        <border_alarm_sensitive>true</border_alarm_sensitive>
-        <on_label>ON</on_label>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>true</keep_wh_ratio>
+          <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <off_color>
-          <color red="0" green="100" blue="0" />
-        </off_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="240" green="240" blue="240" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <square_led>true</square_led>
-        <width>20</width>
-        <x>870</x>
-        <data_type>0</data_type>
-        <y>165</y>
+        <width>140</width>
+        <x>166</x>
+        <y>140</y>
+        <maximum>10.0</maximum>
         <foreground_color>
-          <color red="192" green="192" blue="192" />
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
+        <minimum>-10.0</minimum>
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
-        <off_label>OFF</off_label>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4ce9</wuid>
-        <transparent>true</transparent>
+        <wuid>-3f6498d2:15645d229d4:-2688</wuid>
+        <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>Data Ready </text>
+        <text>Position</text>
         <scripts />
-        <height>18</height>
+        <height>32</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -4159,85 +5046,130 @@ $(pv_value)</tooltip>
         <widget_type>Label</widget_type>
         <wrap_words>true</wrap_words>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
-        <width>80</width>
-        <x>726</x>
-        <name>Label_3</name>
-        <y>165</y>
+        <width>337</width>
+        <x>38</x>
+        <name>Label_15</name>
+        <y>90</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+      <widget typeId="org.csstudio.opibuilder.widgets.progressbar" version="1.0.0">
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4ce3</wuid>
-        <transparent>false</transparent>
+        <effect_3d>true</effect_3d>
+        <scale_font>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+        </scale_font>
+        <horizontal>true</horizontal>
         <pv_value />
-        <auto_size>false</auto_size>
-        <text>######</text>
-        <rotation_angle>0.0</rotation_angle>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <show_units>true</show_units>
-        <height>20</height>
+        <show_scale>true</show_scale>
+        <scale_format></scale_format>
+        <show_label>false</show_label>
+        <height>109</height>
+        <fill_color>
+          <color red="0" green="0" blue="255" />
+        </fill_color>
         <border_width>1</border_width>
+        <value_label_format></value_label_format>
+        <visible>true</visible>
+        <pv_name>$(PREFIX_MTR):$(NAME_MTR).RBV</pv_name>
+        <border_color>
+          <color red="0" green="128" blue="255" />
+        </border_color>
+        <widget_type>Progress Bar</widget_type>
+        <name>Progress Bar</name>
+        <show_hi>false</show_hi>
+        <actions hook="false" hook_all="false" />
+        <show_lo>false</show_lo>
+        <border_style>0</border_style>
+        <show_lolo>false</show_lolo>
+        <show_minor_ticks>true</show_minor_ticks>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <show_markers>true</show_markers>
+        <color_hihi>
+          <color red="255" green="0" blue="0" />
+        </color_hihi>
+        <origin>0.0</origin>
+        <show_hihi>false</show_hihi>
+        <log_scale>false</log_scale>
+        <enabled>true</enabled>
+        <wuid>1e771979:1565068c2e3:-7c9c</wuid>
+        <indicator_mode>false</indicator_mode>
+        <level_hihi>90.0</level_hihi>
+        <origin_ignored>true</origin_ignored>
+        <color_hi>
+          <color red="255" green="128" blue="0" />
+        </color_hi>
+        <color_lo>
+          <color red="255" green="128" blue="0" />
+        </color_lo>
+        <scripts />
+        <border_alarm_sensitive>true</border_alarm_sensitive>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_PS).CPT</pv_name>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Update</widget_type>
+        <fillcolor_alarm_sensitive>false</fillcolor_alarm_sensitive>
+        <color_fillbackground>
+          <color red="200" green="200" blue="200" />
+        </color_fillbackground>
+        <major_tick_step_hint>50</major_tick_step_hint>
+        <level_hi>80.0</level_hi>
+        <transparent_background>true</transparent_background>
+        <level_lo>20.0</level_lo>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <wrap_words>false</wrap_words>
-        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color red="240" green="240" blue="240" />
         </background_color>
-        <width>80</width>
-        <x>600</x>
-        <name>Text Update_2</name>
-        <y>489</y>
+        <level_lolo>10.0</level_lolo>
+        <width>464</width>
+        <x>409</x>
+        <y>200</y>
+        <maximum>200.0</maximum>
+        <color_lolo>
+          <color red="255" green="0" blue="0" />
+        </color_lolo>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
+        <minimum>0.0</minimum>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
+        <alarm_pulsing>false</alarm_pulsing>
+        <tooltip>$(pv_name)
+$(pv_value)</tooltip>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4ce2</wuid>
-        <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>DAQ</text>
+        <wuid>1e771979:1565068c2e3:-78c5</wuid>
+        <transparent>false</transparent>
+        <pv_value />
+        <alpha>255</alpha>
+        <corner_height>16</corner_height>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
         <scripts />
-        <height>20</height>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>103</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -4245,92 +5177,90 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name></pv_name>
+        <gradient>false</gradient>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
-        <background_color>
+        <anti_alias>true</anti_alias>
+        <corner_width>16</corner_width>
+        <line_style>0</line_style>
+        <widget_type>Rounded Rectangle</widget_type>
+        <fg_gradient_color>
           <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <background_color>
+          <color red="186" green="189" blue="182" />
         </background_color>
-        <width>80</width>
-        <x>420</x>
-        <name>Label_7</name>
-        <y>489</y>
+        <width>337</width>
+        <x>38</x>
+        <name>Rounded Rectangle_4</name>
+        <y>230</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+        <tooltip></tooltip>
         <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4cd8</wuid>
-        <transparent>false</transparent>
-        <pv_value />
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-78c4</wuid>
+        <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text>######</text>
-        <rotation_angle>0.0</rotation_angle>
+        <text>Velocity</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <show_units>true</show_units>
         <height>20</height>
-        <border_width>1</border_width>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_PS).FAZE</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Update</widget_type>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
         <wrap_words>false</wrap_words>
-        <format_type>0</format_type>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>161</width>
-        <x>576</x>
-        <name>Text Update_4</name>
-        <y>421</y>
+        <width>111</width>
+        <x>48</x>
+        <name>Label Orientation_7</name>
+        <y>281</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <fontdata fontName="Sans" height="11" style="1" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4cd7</wuid>
-        <transparent>true</transparent>
+        <wuid>1e771979:1565068c2e3:-78c2</wuid>
+        <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text> Faze </text>
+        <text>Motor settings</text>
         <scripts />
-        <height>20</height>
+        <height>32</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -4345,112 +5275,76 @@ $(pv_value)</tooltip>
         <widget_type>Label</widget_type>
         <wrap_words>true</wrap_words>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
-        <width>100</width>
-        <x>439</x>
-        <name>Label_131</name>
-        <y>421</y>
+        <width>337</width>
+        <x>38</x>
+        <name>Label_15</name>
+        <y>225</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
         <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4ccf</wuid>
-        <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
-        <text>######</text>
+        <text></text>
         <rotation_angle>0.0</rotation_angle>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
         <show_units>true</show_units>
-        <height>20</height>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
         <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
         <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_PS)-NORD_POS</pv_name>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name>$(PREFIX_MTR):$(NAME_MTR).VELO</pv_name>
+        <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
         <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Update</widget_type>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <wrap_words>false</wrap_words>
-        <format_type>0</format_type>
-        <background_color>
-          <color red="255" green="255" blue="255" />
-        </background_color>
-        <width>80</width>
-        <x>570</x>
-        <name>Text Update_10</name>
-        <y>457</y>
-        <foreground_color>
-          <color red="0" green="0" blue="0" />
-        </foreground_color>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
         <actions hook="false" hook_all="false" />
-        <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4cce</wuid>
-        <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>Positions </text>
+        <wuid>1e771979:1565068c2e3:-7099</wuid>
+        <transparent>false</transparent>
         <scripts />
-        <height>20</height>
-        <border_width>1</border_width>
+        <border_alarm_sensitive>false</border_alarm_sensitive>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>80</width>
-        <x>432</x>
-        <name>Label_142</name>
-        <y>455</y>
+        <width>140</width>
+        <x>166</x>
+        <y>275</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -4459,10 +5353,10 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4ac6</wuid>
+        <wuid>1e771979:1565068c2e3:-6fff</wuid>
         <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>CONTROL</text>
+        <text>Motion</text>
         <scripts />
         <height>32</height>
         <border_width>1</border_width>
@@ -4481,10 +5375,10 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
-        <width>349</width>
-        <x>30</x>
+        <width>493</width>
+        <x>392</x>
         <name>Label_15</name>
-        <y>54</y>
+        <y>91</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
@@ -4494,64 +5388,65 @@ $(pv_value)</tooltip>
           <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>1</line_width>
+        <line_width>0</line_width>
         <horizontal_fill>true</horizontal_fill>
         <alarm_pulsing>false</alarm_pulsing>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <arrows>0</arrows>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4a2d</wuid>
+        <wuid>1e771979:1565068c2e3:-6f55</wuid>
         <transparent>false</transparent>
-        <points>
-          <point x="30" y="119" />
-          <point x="378" y="119" />
-          <point x="378" y="119" />
-          <point x="378" y="119" />
-          <point x="378" y="119" />
-        </points>
-        <fill_arrow>true</fill_arrow>
         <pv_value />
         <alpha>255</alpha>
-        <rotation_angle>0.0</rotation_angle>
+        <corner_height>16</corner_height>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>1</height>
+        <height>363</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>true</keep_wh_ratio>
+          <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
         <pv_name></pv_name>
+        <gradient>false</gradient>
         <border_color>
-          <color name="Black" red="0" green="0" blue="0" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <anti_alias>true</anti_alias>
+        <corner_width>16</corner_width>
         <line_style>0</line_style>
-        <arrow_length>20</arrow_length>
-        <widget_type>Polyline</widget_type>
+        <widget_type>Rounded Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color name="Black" red="0" green="0" blue="0" />
+          <color red="186" green="189" blue="182" />
         </background_color>
-        <width>349</width>
-        <x>30</x>
-        <name>Polyline</name>
-        <y>119</y>
+        <width>440</width>
+        <x>900</x>
+        <name>Rounded Rectangle_4</name>
+        <y>96</y>
         <fill_level>0.0</fill_level>
         <foreground_color>
           <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
@@ -4559,12 +5454,12 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-4ab2</wuid>
+        <wuid>1e771979:1565068c2e3:-6f54</wuid>
         <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>Motor</text>
+        <text>Motion</text>
         <scripts />
-        <height>20</height>
+        <height>32</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -4577,131 +5472,89 @@ $(pv_value)</tooltip>
           <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="panelArea" red="240" green="240" blue="240" />
+          <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
-        <width>229</width>
-        <x>96</x>
-        <name>Label_156</name>
-        <y>110</y>
+        <width>440</width>
+        <x>900</x>
+        <name>Label_15</name>
+        <y>90</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-3e44</wuid>
-        <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>Start position</text>
-        <scripts />
-        <height>20</height>
-        <border_width>2</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
-        <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
-        </background_color>
-        <width>151</width>
-        <x>42</x>
-        <name>Label Orientation_7</name>
-        <y>149</y>
-        <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
           <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.bytemonitor" version="1.0.0">
+        <border_style>0</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).P4SP</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <effect_3d>true</effect_3d>
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-3e43</wuid>
-        <transparent>false</transparent>
+        <wuid>1e771979:1565068c2e3:-6b0b</wuid>
+        <on_color>
+          <color name="IO OK" red="0" green="255" blue="0" />
+        </on_color>
+        <horizontal>false</horizontal>
+        <pv_value />
+        <numBits>15</numBits>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <height>320</height>
+        <border_width>0</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
+        <visible>true</visible>
+        <pv_name>$(PREFIX_MTR):$(NAME_MTR).MSTA</pv_name>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <bitReverse>true</bitReverse>
+        <label />
+        <widget_type>Byte Monitor</widget_type>
+        <off_color>
+          <color name="IO Grid" red="215" green="215" blue="215" />
+        </off_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>100</width>
-        <x>228</x>
-        <y>143</y>
-        <maximum>1.7976931348623157E308</maximum>
+        <square_led>true</square_led>
+        <startBit>0</startBit>
+        <width>25</width>
+        <x>932</x>
+        <name>Byte Monitor Template</name>
+        <y>131</y>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color name="IO InputPV Fg" red="0" green="32" blue="92" />
         </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
+        <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
         <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-3d91</wuid>
+        <wuid>1e771979:1565068c2e3:-6a44</wuid>
         <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>End position</text>
+        <auto_size>true</auto_size>
+        <text>DONE: Motion is complete.</text>
         <scripts />
-        <height>20</height>
+        <height>15</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -4714,91 +5567,117 @@ $(pv_value)</tooltip>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>93</width>
-        <x>71</x>
-        <name>Label Orientation_7</name>
-        <y>191</y>
+        <width>159</width>
+        <x>968</x>
+        <name>Label Template_4</name>
+        <y>156</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-6a43</wuid>
+        <transparent>true</transparent>
+        <auto_size>true</auto_size>
+        <text>PLUS_LS: Plus limit switch has been hit.</text>
+        <scripts />
+        <height>15</height>
+        <border_width>2</border_width>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
         <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).P4EP</pv_name>
-        <selector_type>0</selector_type>
+        <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input</name>
-        <style>0</style>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
+        <background_color>
+          <color name="IO Background" red="255" green="255" blue="205" />
+        </background_color>
+        <width>239</width>
+        <x>968</x>
+        <name>Label Template_5</name>
+        <y>177</y>
+        <foreground_color>
+          <color name="IO Foreground" red="0" green="0" blue="0" />
+        </foreground_color>
         <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-3d90</wuid>
-        <transparent>false</transparent>
+        <show_scrollbar>false</show_scrollbar>
+        <font>
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+        </font>
+      </widget>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
+        <rules />
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-6a42</wuid>
+        <transparent>true</transparent>
+        <auto_size>true</auto_size>
+        <text>HOMELS: Sate of the home limit switch.</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>15</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>100</width>
-        <x>228</x>
-        <y>185</y>
-        <maximum>1.7976931348623157E308</maximum>
+        <width>235</width>
+        <x>968</x>
+        <name>Label Template_6</name>
+        <y>198</y>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
+        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
         <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-359e</wuid>
+        <wuid>1e771979:1565068c2e3:-6a41</wuid>
         <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>After SCAN Position</text>
+        <auto_size>true</auto_size>
+        <text>Unused.</text>
         <scripts />
-        <height>20</height>
+        <height>15</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -4811,136 +5690,118 @@ $(pv_value)</tooltip>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>199</width>
-        <x>34</x>
-        <name>Label Orientation_7</name>
-        <y>318</y>
+        <width>48</width>
+        <x>968</x>
+        <name>Label Template_7</name>
+        <y>219</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.combo" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+        <tooltip></tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-3589</wuid>
-        <pv_value />
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-6a40</wuid>
+        <transparent>true</transparent>
+        <auto_size>true</auto_size>
+        <text>POSITION: Closed-loop position control is enabled.</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>20</height>
-        <border_width>0</border_width>
+        <height>15</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
-          <height_scalable>false</height_scalable>
+          <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <items_from_pv>true</items_from_pv>
         <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).PASM</pv_name>
+        <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <widget_type>Combo Box</widget_type>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="IO Grid" red="215" green="215" blue="215" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>100</width>
-        <x>228</x>
-        <name>channel_name</name>
-        <y>318</y>
+        <width>295</width>
+        <x>968</x>
+        <name>Label Template_8</name>
+        <y>240</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="0" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.polyline" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <line_width>1</line_width>
-        <horizontal_fill>true</horizontal_fill>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <arrows>0</arrows>
+        <tooltip></tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-33bf</wuid>
-        <transparent>false</transparent>
-        <points>
-          <point x="30" y="378" />
-          <point x="378" y="378" />
-          <point x="378" y="378" />
-          <point x="378" y="378" />
-          <point x="378" y="378" />
-        </points>
-        <fill_arrow>true</fill_arrow>
-        <pv_value />
-        <alpha>255</alpha>
-        <rotation_angle>0.0</rotation_angle>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>1</height>
-        <border_width>1</border_width>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-6a3f</wuid>
+        <transparent>true</transparent>
+        <auto_size>true</auto_size>
+        <text>SLIP_STALL: Slip/Stall detected (eg. fatal following error).</text>
+        <scripts />
+        <height>15</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
-          <keep_wh_ratio>true</keep_wh_ratio>
+          <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name></pv_name>
+        <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="Black" red="0" green="0" blue="0" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <anti_alias>true</anti_alias>
-        <line_style>0</line_style>
-        <arrow_length>20</arrow_length>
-        <widget_type>Polyline</widget_type>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="Black" red="0" green="0" blue="0" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>349</width>
-        <x>30</x>
-        <name>Polyline</name>
-        <y>378</y>
-        <fill_level>0.0</fill_level>
+        <width>332</width>
+        <x>968</x>
+        <name>Label Template_9</name>
+        <y>261</y>
         <foreground_color>
-          <color red="255" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-33be</wuid>
-        <transparent>false</transparent>
-        <auto_size>false</auto_size>
-        <text>Plates Power Supply</text>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-6a3e</wuid>
+        <transparent>true</transparent>
+        <auto_size>true</auto_size>
+        <text>HOME: If at home position.</text>
         <scripts />
-        <height>20</height>
-        <border_width>1</border_width>
+        <height>15</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -4949,37 +5810,38 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="panelArea" red="240" green="240" blue="240" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>229</width>
-        <x>84</x>
-        <name>Label_156</name>
-        <y>369</y>
+        <width>157</width>
+        <x>968</x>
+        <name>Label Template_10</name>
+        <y>282</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="Sans" height="11" style="0">Default</opifont.name>
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
         <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-33b3</wuid>
+        <wuid>1e771979:1565068c2e3:-6a3d</wuid>
         <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>Number of points</text>
+        <auto_size>true</auto_size>
+        <text>PRESENT: Encoder is present.</text>
         <scripts />
-        <height>20</height>
+        <height>15</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -4992,91 +5854,76 @@ $(pv_value)</tooltip>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>199</width>
-        <x>30</x>
-        <name>Label Orientation_7</name>
-        <y>231</y>
+        <width>181</width>
+        <x>968</x>
+        <name>Label Template_22</name>
+        <y>303</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).NPTS</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-33a9</wuid>
-        <transparent>false</transparent>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-6a3c</wuid>
+        <transparent>true</transparent>
+        <auto_size>true</auto_size>
+        <text>PROBLEM: Driver stopped polling, or hardware problem.</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>15</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>100</width>
-        <x>228</x>
-        <y>225</y>
-        <maximum>1.7976931348623157E308</maximum>
+        <width>324</width>
+        <x>968</x>
+        <name>Label Template_23</name>
+        <y>324</y>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
+        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
         <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-335c</wuid>
+        <wuid>1e771979:1565068c2e3:-6a3b</wuid>
         <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>Step size</text>
+        <auto_size>true</auto_size>
+        <text>MOVING: Non-zero velocity present.</text>
         <scripts />
-        <height>20</height>
+        <height>15</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -5089,91 +5936,76 @@ $(pv_value)</tooltip>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>199</width>
-        <x>30</x>
-        <name>Label Orientation_7</name>
-        <y>276</y>
+        <width>210</width>
+        <x>968</x>
+        <name>Label Template_13</name>
+        <y>345</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).P4SI</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-335b</wuid>
-        <transparent>false</transparent>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-6a3a</wuid>
+        <transparent>true</transparent>
+        <auto_size>true</auto_size>
+        <text>GAIN_SUPPORT: Motor supports closed-loop pos. control.</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>15</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>100</width>
-        <x>228</x>
-        <y>270</y>
-        <maximum>1.7976931348623157E308</maximum>
+        <width>340</width>
+        <x>968</x>
+        <name>Label Template_14</name>
+        <y>366</y>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
+        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
         <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-31f4</wuid>
+        <wuid>1e771979:1565068c2e3:-6a39</wuid>
         <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>Start Voltage</text>
+        <auto_size>true</auto_size>
+        <text>COMM_ERR: Controller communication error.</text>
         <scripts />
-        <height>20</height>
+        <height>15</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -5186,91 +6018,35 @@ $(pv_value)</tooltip>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>151</width>
-        <x>42</x>
-        <name>Label Orientation_7</name>
-        <y>413</y>
+        <width>263</width>
+        <x>968</x>
+        <name>Label Template_15</name>
+        <y>387</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_PS).P4SP</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-31f3</wuid>
-        <transparent>false</transparent>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
-        <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
-        </background_color>
-        <width>100</width>
-        <x>228</x>
-        <y>407</y>
-        <maximum>1.7976931348623157E308</maximum>
-        <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
-        </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
-        <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
         <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-31f2</wuid>
+        <wuid>1e771979:1565068c2e3:-6a38</wuid>
         <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>End Voltage</text>
+        <auto_size>true</auto_size>
+        <text>MINUS_LS: Minus limit switch has been hit.</text>
         <scripts />
-        <height>20</height>
+        <height>15</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -5283,89 +6059,74 @@ $(pv_value)</tooltip>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
           <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>93</width>
-        <x>71</x>
-        <name>Label Orientation_1</name>
-        <y>455</y>
+        <width>255</width>
+        <x>968</x>
+        <name>Label Template_16</name>
+        <y>408</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
-        <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_PS).P4EP</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input_1</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-31f1</wuid>
-        <transparent>false</transparent>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-6a37</wuid>
+        <transparent>true</transparent>
+        <auto_size>true</auto_size>
+        <text>HOMED: The motor has been homed.</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <height>15</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
+        <visible>true</visible>
+        <vertical_alignment>1</vertical_alignment>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Label</widget_type>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>100</width>
-        <x>228</x>
-        <y>449</y>
-        <maximum>1.7976931348623157E308</maximum>
+        <width>218</width>
+        <x>968</x>
+        <name>Label Template_17</name>
+        <y>429</y>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
+        <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
         <enabled>false</enabled>
-        <wuid>1e771979:1565068c2e3:-31f0</wuid>
-        <transparent>true</transparent>
+        <wuid>1e771979:1565068c2e3:-6a36</wuid>
+        <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>Number of points</text>
+        <text>DIRECTION: Last raw direction; (Grey: Neg., Green: Pos.)</text>
         <scripts />
         <height>20</height>
         <border_width>2</border_width>
@@ -5380,99 +6141,132 @@ $(pv_value)</tooltip>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="IO Shape Fill" red="188" green="188" blue="188" />
         </background_color>
-        <width>199</width>
-        <x>30</x>
-        <name>Label Orientation_2</name>
-        <y>495</y>
+        <width>350</width>
+        <x>968</x>
+        <name>Label Template_45</name>
+        <y>135</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+        <toggle_button>true</toggle_button>
+        <border_style>6</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
+        <push_action_index>1</push_action_index>
         <rules />
-        <pv_value />
-        <auto_size>false</auto_size>
-        <text></text>
-        <rotation_angle>0.0</rotation_angle>
-        <show_units>true</show_units>
-        <height>31</height>
-        <multiline_input>false</multiline_input>
-        <border_width>1</border_width>
-        <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_PS).NPTS</pv_name>
-        <selector_type>0</selector_type>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Input</widget_type>
-        <confirm_message></confirm_message>
-        <name>Text Input_2</name>
-        <style>0</style>
-        <actions hook="false" hook_all="false" />
-        <border_style>3</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-31ef</wuid>
-        <transparent>false</transparent>
+        <wuid>1e771979:1565068c2e3:-597a</wuid>
+        <release_action_index>0</release_action_index>
+        <pv_value />
+        <text>STOP</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <border_alarm_sensitive>true</border_alarm_sensitive>
+        <height>64</height>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
+        <image></image>
+        <visible>true</visible>
+        <pv_name></pv_name>
+        <border_color>
+          <color name="IO Border" red="215" green="215" blue="215" />
+        </border_color>
+        <widget_type>Action Button</widget_type>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <format_type>0</format_type>
-        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color name="TextBackground" red="70" green="70" blue="70" />
+          <color name="Major" red="255" green="0" blue="0" />
         </background_color>
-        <width>100</width>
-        <x>228</x>
-        <y>489</y>
-        <maximum>1.7976931348623157E308</maximum>
+        <width>181</width>
+        <x>576</x>
+        <name>Action Button Template_1</name>
+        <y>380</y>
+        <style>0</style>
         <foreground_color>
-          <color name="KeyboardEntry" red="0" green="255" blue="255" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
-        <minimum>-1.7976931348623157E308</minimum>
+        <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
+    </widget>
+    <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
+      <border_style>0</border_style>
+      <tooltip></tooltip>
+      <rules />
+      <enabled>true</enabled>
+      <wuid>-5b5af26c:15364c41bca:-6d20</wuid>
+      <transparent>true</transparent>
+      <lock_children>false</lock_children>
+      <scripts />
+      <height>1130</height>
+      <border_width>1</border_width>
+      <scale_options>
+        <width_scalable>true</width_scalable>
+        <height_scalable>true</height_scalable>
+        <keep_wh_ratio>false</keep_wh_ratio>
+      </scale_options>
+      <macros>
+        <include_parent_macros>true</include_parent_macros>
+      </macros>
+      <visible>false</visible>
+      <border_color>
+        <color red="0" green="128" blue="255" />
+      </border_color>
+      <widget_type>Grouping Container</widget_type>
+      <background_color>
+        <color red="240" green="240" blue="240" />
+      </background_color>
+      <width>2489</width>
+      <x>1</x>
+      <name>TREK6096E</name>
+      <y>1</y>
+      <foreground_color>
+        <color red="192" green="192" blue="192" />
+      </foreground_color>
+      <actions hook="false" hook_all="false" />
+      <fc>false</fc>
+      <show_scrollbar>true</show_scrollbar>
+      <font>
+        <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
+      </font>
+      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-2c60</wuid>
+        <wuid>1e771979:1565068c2e3:-5856</wuid>
         <transparent>false</transparent>
         <pv_value />
-        <auto_size>false</auto_size>
-        <text>######</text>
-        <rotation_angle>0.0</rotation_angle>
+        <alpha>255</alpha>
+        <corner_height>16</corner_height>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <show_units>true</show_units>
-        <height>20</height>
+        <height>106</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -5480,44 +6274,51 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).FAZE</pv_name>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name></pv_name>
+        <gradient>false</gradient>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Update</widget_type>
+        <anti_alias>true</anti_alias>
+        <corner_width>16</corner_width>
+        <line_style>0</line_style>
+        <widget_type>Rounded Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <wrap_words>false</wrap_words>
-        <format_type>0</format_type>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color red="186" green="189" blue="182" />
         </background_color>
-        <width>133</width>
-        <x>576</x>
-        <name>Text Update_4</name>
-        <y>141</y>
+        <width>568</width>
+        <x>72</x>
+        <name>Rounded Rectangle_4</name>
+        <y>72</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
         <border_style>0</border_style>
         <tooltip></tooltip>
         <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-2c5f</wuid>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-5860</wuid>
         <transparent>true</transparent>
         <auto_size>false</auto_size>
-        <text> Faze </text>
+        <text>Voltage</text>
         <scripts />
         <height>20</height>
-        <border_width>1</border_width>
+        <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -5526,76 +6327,80 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color red="0" green="128" blue="255" />
+          <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>100</width>
-        <x>439</x>
-        <name>Label_131</name>
-        <y>141</y>
+        <width>87</width>
+        <x>93</x>
+        <name>Label Orientation_7</name>
+        <y>122</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <fontdata fontName="Sans" height="11" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
-        <border_style>0</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+      <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
         <alarm_pulsing>false</alarm_pulsing>
         <precision>0</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-2c4e</wuid>
-        <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
-        <text>######</text>
+        <text></text>
         <rotation_angle>0.0</rotation_angle>
-        <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
         <show_units>true</show_units>
-        <height>20</height>
+        <height>31</height>
+        <multiline_input>false</multiline_input>
         <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
         <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_MTR).CPT</pv_name>
-        <vertical_alignment>1</vertical_alignment>
+        <pv_name>$(PREFIX_PS)hor-SP</pv_name>
+        <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
         <precision_from_pv>true</precision_from_pv>
-        <widget_type>Text Update</widget_type>
+        <widget_type>Text Input</widget_type>
+        <confirm_message></confirm_message>
+        <name>Text Input</name>
+        <style>0</style>
+        <actions hook="false" hook_all="false" />
+        <border_style>3</border_style>
+        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <enabled>true</enabled>
+        <wuid>1e771979:1565068c2e3:-585f</wuid>
+        <transparent>false</transparent>
+        <scripts />
+        <border_alarm_sensitive>false</border_alarm_sensitive>
+        <scale_options>
+          <width_scalable>true</width_scalable>
+          <height_scalable>true</height_scalable>
+          <keep_wh_ratio>false</keep_wh_ratio>
+        </scale_options>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
-        <wrap_words>false</wrap_words>
         <format_type>0</format_type>
+        <limits_from_pv>false</limits_from_pv>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>80</width>
-        <x>606</x>
-        <name>Text Update_2</name>
-        <y>214</y>
+        <width>140</width>
+        <x>189</x>
+        <y>116</y>
+        <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
-        <actions hook="false" hook_all="false" />
+        <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -5604,12 +6409,12 @@ $(pv_value)</tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-2c4d</wuid>
-        <transparent>true</transparent>
+        <wuid>1e771979:1565068c2e3:-585e</wuid>
+        <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>DAQ</text>
+        <text>HORIZONTAL Power Supply</text>
         <scripts />
-        <height>20</height>
+        <height>32</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -5624,32 +6429,32 @@ $(pv_value)</tooltip>
         <widget_type>Label</widget_type>
         <wrap_words>true</wrap_words>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
-        <width>80</width>
-        <x>426</x>
-        <name>Label_7</name>
-        <y>214</y>
+        <width>568</width>
+        <x>72</x>
+        <name>Label_15</name>
+        <y>66</y>
         <foreground_color>
           <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <show_scrollbar>false</show_scrollbar>
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <alarm_pulsing>false</alarm_pulsing>
-        <precision>0</precision>
+        <precision>3</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <horizontal_alignment>0</horizontal_alignment>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-2c4c</wuid>
+        <wuid>1e771979:1565068c2e3:-5848</wuid>
         <transparent>false</transparent>
         <pv_value />
         <auto_size>false</auto_size>
@@ -5658,7 +6463,7 @@ $(pv_value)</tooltip>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
         <show_units>true</show_units>
-        <height>20</height>
+        <height>31</height>
         <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
@@ -5666,178 +6471,129 @@ $(pv_value)</tooltip>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
         <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_MTR)-NORD_POS</pv_name>
+        <pv_name>$(PREFIX_PS)hor-RBV</pv_name>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color red="0" green="128" blue="255" />
         </border_color>
-        <precision_from_pv>true</precision_from_pv>
+        <precision_from_pv>false</precision_from_pv>
         <widget_type>Text Update</widget_type>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <wrap_words>false</wrap_words>
         <format_type>0</format_type>
         <background_color>
-          <color red="255" green="255" blue="255" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>80</width>
-        <x>576</x>
-        <name>Text Update_10</name>
-        <y>182</y>
+        <width>150</width>
+        <x>411</x>
+        <name>Text Update_3</name>
+        <y>116</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="TextDynamic" red="0" green="244" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.RoundedRectangle" version="1.0.0">
         <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-2c4b</wuid>
-        <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>Positions </text>
-        <scripts />
-        <height>20</height>
-        <border_width>1</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color red="0" green="128" blue="255" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>true</wrap_words>
-        <background_color>
-          <color red="255" green="255" blue="255" />
-        </background_color>
-        <width>80</width>
-        <x>438</x>
-        <name>Label_142</name>
-        <y>180</y>
-        <foreground_color>
-          <color red="0" green="0" blue="0" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <show_scrollbar>false</show_scrollbar>
-        <font>
-          <opifont.name fontName="arial" height="10" style="0">IO Normal</opifont.name>
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
-        <toggle_button>false</toggle_button>
-        <border_style>6</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+        <line_width>0</line_width>
+        <horizontal_fill>true</horizontal_fill>
         <alarm_pulsing>false</alarm_pulsing>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
-        <push_action_index>0</push_action_index>
         <rules />
         <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-2a00</wuid>
+        <wuid>1e771979:1565068c2e3:-5732</wuid>
+        <transparent>false</transparent>
         <pv_value />
-        <text>Abort</text>
+        <alpha>255</alpha>
+        <corner_height>16</corner_height>
+        <bg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </bg_gradient_color>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>55</height>
-        <border_width>2</border_width>
+        <height>106</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <image></image>
         <visible>true</visible>
         <pv_name></pv_name>
+        <gradient>false</gradient>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Action Button</widget_type>
+        <anti_alias>true</anti_alias>
+        <corner_width>16</corner_width>
+        <line_style>0</line_style>
+        <widget_type>Rounded Rectangle</widget_type>
+        <fg_gradient_color>
+          <color red="255" green="255" blue="255" />
+        </fg_gradient_color>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
         <background_color>
-          <color name="IO Button" red="178" green="178" blue="178" />
+          <color red="186" green="189" blue="182" />
         </background_color>
-        <width>139</width>
-        <x>129</x>
-        <name>Abort Scan</name>
-        <y>756</y>
-        <style>0</style>
+        <width>568</width>
+        <x>72</x>
+        <name>Rounded Rectangle_4</name>
+        <y>246</y>
+        <fill_level>0.0</fill_level>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="255" green="0" blue="0" />
         </foreground_color>
-        <actions hook="false" hook_all="true">
-          <action type="WRITE_PV">
-            <pv_name>${PREFIX_SCAN}:$(NAME_MTR)-ABORT.PROC</pv_name>
-            <value>1</value>
-            <timeout>10</timeout>
-            <confirm_message></confirm_message>
-            <description>Abort Scan</description>
-          </action>
-        </actions>
+        <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
+        <line_color>
+          <color red="128" green="0" blue="255" />
+        </line_color>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
-        <toggle_button>false</toggle_button>
-        <border_style>6</border_style>
-        <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
-        <alarm_pulsing>false</alarm_pulsing>
-        <tooltip>$(pv_name)
-$(pv_value)</tooltip>
-        <push_action_index>0</push_action_index>
+      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+        <border_style>0</border_style>
+        <tooltip></tooltip>
+        <horizontal_alignment>0</horizontal_alignment>
         <rules />
-        <enabled>true</enabled>
-        <wuid>1e771979:1565068c2e3:-2a01</wuid>
-        <pv_value />
-        <text>Start scan</text>
+        <enabled>false</enabled>
+        <wuid>1e771979:1565068c2e3:-5731</wuid>
+        <transparent>true</transparent>
+        <auto_size>false</auto_size>
+        <text>Voltage</text>
         <scripts />
-        <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>55</height>
+        <height>20</height>
         <border_width>2</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <image></image>
         <visible>true</visible>
-        <pv_name></pv_name>
+        <vertical_alignment>1</vertical_alignment>
         <border_color>
           <color name="IO Border" red="215" green="215" blue="215" />
         </border_color>
-        <widget_type>Action Button</widget_type>
-        <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <widget_type>Label</widget_type>
+        <wrap_words>false</wrap_words>
         <background_color>
-          <color name="IO Button" red="178" green="178" blue="178" />
+          <color name="IO Background" red="255" green="255" blue="205" />
         </background_color>
-        <width>139</width>
-        <x>129</x>
-        <name>Start Scan</name>
-        <y>666</y>
-        <style>0</style>
+        <width>87</width>
+        <x>93</x>
+        <name>Label Orientation_7</name>
+        <y>296</y>
         <foreground_color>
           <color name="IO Foreground" red="0" green="0" blue="0" />
         </foreground_color>
-        <actions hook="false" hook_all="false">
-          <action type="WRITE_PV">
-            <pv_name>${PREFIX_SCAN}:$(NAME_MTR).EXSC</pv_name>
-            <value>1</value>
-            <timeout>10</timeout>
-            <confirm_message></confirm_message>
-            <description>Start Scan</description>
-          </action>
-        </actions>
+        <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <fontdata fontName="Sans" height="11" style="1" />
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
@@ -5856,7 +6612,7 @@ $(pv_value)</tooltip>
         <multiline_input>false</multiline_input>
         <border_width>1</border_width>
         <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_PS).PDLY</pv_name>
+        <pv_name>$(PREFIX_PS)ver-SP</pv_name>
         <selector_type>0</selector_type>
         <border_color>
           <color red="0" green="128" blue="255" />
@@ -5870,7 +6626,7 @@ $(pv_value)</tooltip>
         <border_style>3</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <enabled>true</enabled>
-        <wuid>-6b2ac396:15659b62087:-789d</wuid>
+        <wuid>1e771979:1565068c2e3:-5730</wuid>
         <transparent>false</transparent>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
@@ -5885,56 +6641,16 @@ $(pv_value)</tooltip>
         <background_color>
           <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>100</width>
-        <x>228</x>
-        <y>528</y>
+        <width>140</width>
+        <x>189</x>
+        <y>290</y>
         <maximum>1.7976931348623157E308</maximum>
         <foreground_color>
           <color name="KeyboardEntry" red="0" green="255" blue="255" />
         </foreground_color>
         <minimum>-1.7976931348623157E308</minimum>
         <font>
-          <fontdata fontName="Sans" height="10" style="1" />
-        </font>
-      </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
-        <border_style>0</border_style>
-        <tooltip></tooltip>
-        <horizontal_alignment>1</horizontal_alignment>
-        <rules />
-        <enabled>false</enabled>
-        <wuid>-6b2ac396:15659b62087:-5a56</wuid>
-        <transparent>true</transparent>
-        <auto_size>false</auto_size>
-        <text>Delay</text>
-        <scripts />
-        <height>20</height>
-        <border_width>2</border_width>
-        <scale_options>
-          <width_scalable>true</width_scalable>
-          <height_scalable>true</height_scalable>
-          <keep_wh_ratio>false</keep_wh_ratio>
-        </scale_options>
-        <visible>true</visible>
-        <vertical_alignment>1</vertical_alignment>
-        <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
-        </border_color>
-        <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
-        <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
-        </background_color>
-        <width>183</width>
-        <x>34</x>
-        <name>Label Orientation_2</name>
-        <y>534</y>
-        <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
-        </foreground_color>
-        <actions hook="false" hook_all="false" />
-        <font>
-          <fontdata fontName="Sans" height="10" style="1" />
+          <opifont.name fontName="Cantarell" height="11" style="1">Default Bold</opifont.name>
         </font>
       </widget>
       <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -5942,14 +6658,14 @@ $(pv_value)</tooltip>
         <tooltip></tooltip>
         <horizontal_alignment>1</horizontal_alignment>
         <rules />
-        <enabled>false</enabled>
-        <wuid>-6b2ac396:15659b62087:-5a49</wuid>
-        <transparent>true</transparent>
+        <enabled>true</enabled>
+        <wuid>1e771979:1565068c2e3:-572f</wuid>
+        <transparent>false</transparent>
         <auto_size>false</auto_size>
-        <text>After SCAN Position</text>
+        <text>VERTICAL Power Supply</text>
         <scripts />
-        <height>20</height>
-        <border_width>2</border_width>
+        <height>32</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
           <height_scalable>true</height_scalable>
@@ -5958,65 +6674,76 @@ $(pv_value)</tooltip>
         <visible>true</visible>
         <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
         <widget_type>Label</widget_type>
-        <wrap_words>false</wrap_words>
+        <wrap_words>true</wrap_words>
         <background_color>
-          <color name="IO Background" red="255" green="255" blue="205" />
+          <color name="SubPanel" red="176" green="218" blue="249" />
         </background_color>
-        <width>199</width>
-        <x>34</x>
-        <name>Label Orientation_7</name>
-        <y>576</y>
+        <width>568</width>
+        <x>72</x>
+        <name>Label_15</name>
+        <y>240</y>
         <foreground_color>
-          <color name="IO Foreground" red="0" green="0" blue="0" />
+          <color red="0" green="0" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
+        <show_scrollbar>false</show_scrollbar>
         <font>
           <fontdata fontName="Sans" height="10" style="1" />
         </font>
       </widget>
-      <widget typeId="org.csstudio.opibuilder.widgets.combo" version="1.0.0">
+      <widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
         <border_style>0</border_style>
         <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
         <alarm_pulsing>false</alarm_pulsing>
+        <precision>3</precision>
         <tooltip>$(pv_name)
 $(pv_value)</tooltip>
+        <horizontal_alignment>1</horizontal_alignment>
         <rules />
         <enabled>true</enabled>
-        <wuid>-6b2ac396:15659b62087:-5a48</wuid>
+        <wuid>1e771979:1565068c2e3:-572e</wuid>
+        <transparent>false</transparent>
         <pv_value />
+        <auto_size>false</auto_size>
+        <text>######</text>
+        <rotation_angle>0.0</rotation_angle>
         <scripts />
         <border_alarm_sensitive>false</border_alarm_sensitive>
-        <height>20</height>
-        <border_width>0</border_width>
+        <show_units>true</show_units>
+        <height>31</height>
+        <border_width>1</border_width>
         <scale_options>
           <width_scalable>true</width_scalable>
-          <height_scalable>false</height_scalable>
+          <height_scalable>true</height_scalable>
           <keep_wh_ratio>false</keep_wh_ratio>
         </scale_options>
-        <items_from_pv>true</items_from_pv>
         <visible>true</visible>
-        <pv_name>${PREFIX_SCAN}:$(NAME_PS).PASM</pv_name>
+        <pv_name>$(PREFIX_PS)ver-RBV</pv_name>
+        <vertical_alignment>1</vertical_alignment>
         <border_color>
-          <color name="IO Border" red="215" green="215" blue="215" />
+          <color red="0" green="128" blue="255" />
         </border_color>
-        <widget_type>Combo Box</widget_type>
+        <precision_from_pv>false</precision_from_pv>
+        <widget_type>Text Update</widget_type>
         <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+        <wrap_words>false</wrap_words>
+        <format_type>0</format_type>
         <background_color>
-          <color name="IO Grid" red="215" green="215" blue="215" />
+          <color name="TextBackground" red="70" green="70" blue="70" />
         </background_color>
-        <width>100</width>
-        <x>228</x>
-        <name>channel_name</name>
-        <y>576</y>
+        <width>150</width>
+        <x>411</x>
+        <name>Text Update_3</name>
+        <y>290</y>
         <foreground_color>
-          <color red="0" green="0" blue="0" />
+          <color name="TextDynamic" red="0" green="244" blue="0" />
         </foreground_color>
         <actions hook="false" hook_all="false" />
         <font>
-          <fontdata fontName="Sans" height="10" style="0" />
+          <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
         </font>
       </widget>
     </widget>
@@ -6063,8 +6790,8 @@ $(pv_value)</tooltip>
     <background_color>
       <color red="0" green="148" blue="202" />
     </background_color>
-    <width>1963</width>
-    <x>0</x>
+    <width>2491</width>
+    <x>18</x>
     <name>Rectangle Template</name>
     <y>0</y>
     <fill_level>100.0</fill_level>
@@ -6120,4 +6847,101 @@ $(pv_value)</tooltip>
       <fontdata fontName="Titillium" height="25" style="0" />
     </font>
   </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <border_style>0</border_style>
+    <tooltip></tooltip>
+    <horizontal_alignment>1</horizontal_alignment>
+    <rules />
+    <enabled>false</enabled>
+    <wuid>-cae44c:157dd221fed:-6b69</wuid>
+    <transparent>true</transparent>
+    <auto_size>false</auto_size>
+    <text>Status</text>
+    <scripts />
+    <height>20</height>
+    <border_width>2</border_width>
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <visible>true</visible>
+    <vertical_alignment>1</vertical_alignment>
+    <border_color>
+      <color name="IO Border" red="215" green="215" blue="215" />
+    </border_color>
+    <widget_type>Label</widget_type>
+    <wrap_words>false</wrap_words>
+    <background_color>
+      <color name="IO Background" red="255" green="255" blue="205" />
+    </background_color>
+    <width>145</width>
+    <x>666</x>
+    <name>Label Orientation_7</name>
+    <y>30</y>
+    <foreground_color>
+      <color name="IO Foreground" red="0" green="0" blue="0" />
+    </foreground_color>
+    <actions hook="false" hook_all="false" />
+    <font>
+      <fontdata fontName="Sans" height="10" style="1" />
+    </font>
+  </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
+    <alarm_pulsing>false</alarm_pulsing>
+    <precision>0</precision>
+    <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+    <horizontal_alignment>0</horizontal_alignment>
+    <rules />
+    <pv_value />
+    <auto_size>false</auto_size>
+    <text></text>
+    <rotation_angle>0.0</rotation_angle>
+    <show_units>true</show_units>
+    <height>25</height>
+    <multiline_input>false</multiline_input>
+    <border_width>1</border_width>
+    <visible>true</visible>
+    <pv_name>${PREFIX_SCAN}:$(NAME_MTR).FAZE</pv_name>
+    <selector_type>0</selector_type>
+    <border_color>
+      <color red="0" green="128" blue="255" />
+    </border_color>
+    <precision_from_pv>true</precision_from_pv>
+    <widget_type>Text Input</widget_type>
+    <confirm_message></confirm_message>
+    <name>Text Input_9</name>
+    <style>0</style>
+    <actions hook="false" hook_all="false" />
+    <border_style>3</border_style>
+    <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
+    <enabled>true</enabled>
+    <wuid>-cae44c:157dd221fed:-6b63</wuid>
+    <transparent>false</transparent>
+    <scripts />
+    <border_alarm_sensitive>false</border_alarm_sensitive>
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
+    <format_type>0</format_type>
+    <limits_from_pv>false</limits_from_pv>
+    <background_color>
+      <color name="Black" red="0" green="0" blue="0" />
+    </background_color>
+    <width>352</width>
+    <x>780</x>
+    <y>27</y>
+    <maximum>1.7976931348623157E308</maximum>
+    <foreground_color>
+      <color name="Major" red="255" green="0" blue="0" />
+    </foreground_color>
+    <minimum>-1.7976931348623157E308</minimum>
+    <font>
+      <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
+    </font>
+  </widget>
 </display>
\ No newline at end of file
diff --git a/startup/EMU_Motor2.cmd b/startup/EMU.cmd
similarity index 70%
rename from startup/EMU_Motor2.cmd
rename to startup/EMU.cmd
index e0fc57e75896f600025e09bd629167ca90ae8470..36ccaaa067949e48ab49df9b9ee0a2b00327d95d 100644
--- a/startup/EMU_Motor2.cmd
+++ b/startup/EMU.cmd
@@ -1,12 +1,9 @@
 # Required modules ###
-require ifcdaq
-require singlemotion
+require ifcdaq,0.2.0
+require singlemotion,1.4.5
 require mrfsample
 require pev
-require scanning
 require EMU,jfdenis
-require FastAcquisition,RC
-require DataAcquisition,RC
 
 ### MACROS ###
 # PMAC common macros3       ) 
@@ -17,12 +14,12 @@ epicsEnvSet("NB_AXES", "1" )
 
 # Motor Macros
 epicsEnvSet("EGU",       "mm"   )
-epicsEnvSet("DIR",       "Neg"  )
-epicsEnvSet("MRES",      "0.0002495")
-epicsEnvSet("PREC",      "2"    )
-epicsEnvSet("DHLM",      "250"   )
-epicsEnvSet("DLLM",      "-250"  )
-epicsEnvSet("VELO",      "2"    )
+epicsEnvSet("DIR",       "Pos"  )
+epicsEnvSet("MRES",      "0.000249515")
+epicsEnvSet("PREC",      "4"    )
+epicsEnvSet("DHLM",      "10"   )
+epicsEnvSet("DLLM",      "-200"  )
+epicsEnvSet("VELO",      "1"    )
 epicsEnvSet("VBAS",      "0.1"  )
 epicsEnvSet("VMAX",      "2"    )
 epicsEnvSet("ACCL",      "0.1"  )
@@ -61,12 +58,12 @@ epicsEnvSet("EVR_PUL0_WIDTH",   "$(EVR_EV14_OUT0_WIDTH=1000)")
 
 #DAQ macros
 epicsEnvSet("DAQPREFIX",  "SCANNINGDAQ"  )
-epicsEnvSet("DAQBUFSIZE", "1024"         )
+epicsEnvSet("DAQBUFSIZE", "5000"         )
 
 #Scanning macros
-epicsEnvSet("SCANPREFIX", "SCANNING"     )
-epicsEnvSet("SCAN_SLIT", "SLIT"          )
-epicsEnvSet("SCAN_EF", "EF"              )
+epicsEnvSet("SCANPREFIX", "SCAN"     )
+epicsEnvSet("SCAN_SLIT", "MTR"          )
+epicsEnvSet("SCAN_EF", "PS"              )
 epicsEnvSet("SCAN_POINTS_EF", "1000"     )
 epicsEnvSet("SCAN_POINTS_SLIT", "100"    )
 
@@ -89,28 +86,19 @@ ndsCreateDevice(ifcdaq, $(DAQPREFIX), card=0, fmc=2)
 ### LOAD RECORDS ###
 
 #Load EVG records
-dbLoadRecords("evg-vme-ess230.db", "EVG=$(EVG), SYS=$(SYS)")
+dbLoadRecords("evg-vme-230.db", "DEVICE=$(EVG), SYS=$(SYS)")
 
 #Load EVR records
-dbLoadRecords("evr-pmc-230.db", "EVR=$(EVR), EVG=$(EVR), SYS=$(SYS)")
-dbLoadRecords("evr-softEvent.template", "EVR=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), CODE=$(EVR_PUL0_EVENT)")
-dbLoadRecords("evr-pulserMap.template", "EVR=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), PID=0, F=Trig, ID=0")
+dbLoadRecords("evr-pmc-230.db", "DEVICE=$(EVR), SYS=$(SYS)")
+dbLoadRecords("evr-softEvent.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), CODE=$(EVR_PUL0_EVENT)")
+dbLoadRecords("evr-pulserMap.template", "DEVICE=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), PID=0, F=Trig, ID=0")
 
 ## Load ifcdaq instance
-#dbLoadRecords(IFCDAQAIChannelGroup.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI")
-#dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH0, NELM=$(DAQBUFSIZE)")
-#dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH1, NELM=$(DAQBUFSIZE)")
-#dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH2, NELM=$(DAQBUFSIZE)")
-#dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=${DAQPREFIX},CH_GRP_ID=AI,CH_ID=CH3, NELM=$(DAQBUFSIZE)")
-
-##################### FAST ACQUISITION #######################################
-
-dbLoadRecords(DataAcquisitionChannel.template,"SECTION=INFN,SUBSECTION
-{
-pattern { SECTION, SUBSECTION, DISC, DEVICE, SIGNAL,EVENT_IN,DESCRIPTION,NELM,SIZE,SAMPLING_RATE_PV,UNIT }
-
-	{"INFN","Src","PBI","EM-FC1","CurR","50","Current FC",16000,520,"INFN-Src:CARD0:SAMPLINGRATE","mA"}
-}
+dbLoadRecords(IFCDAQAIChannelGroup.template, "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI")
+dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH0, NELM=$(DAQBUFSIZE)")
+dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH1, NELM=$(DAQBUFSIZE)")
+dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=$(DAQPREFIX),CH_GRP_ID=AI,CH_ID=CH2, NELM=$(DAQBUFSIZE)")
+dbLoadRecords(IFCDAQAIChannel.template,      "PREFIX=${DAQPREFIX},CH_GRP_ID=AI,CH_ID=CH3, NELM=$(DAQBUFSIZE)")
 
 
 #
@@ -135,13 +123,13 @@ dbLoadRecords("motorStatus.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_N
 
 dbLoadRecords("motorHoming.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1),ASYN_PORT=$(PMACPORT),AXIS_NO=$(AXIS_NO1),PREC=$(PREC),EGU=$(EGU)")
 
-dbLoadRecords("EMU.db", "DEVICE=$(SCANPREFIX), SCAN_SLIT=$(SCAN_SLIT), SCAN_EF=$(SCAN_EF), MTRREC=$(PMACPREFIX):$(MOTOR_NAME1), MAX_POINTS_EF=$(SCAN_POINTS_EF), MAX_POINTS_SLIT=$(SCAN_POINTS_SLIT), DAQNDSPREFIX=$(DAQPREFIX), DAQBUFSIZE=$(DAQBUFSIZE), DET1WF=AI-CH0-DATA, DET2WF=AI-CH1-DATA, DET3WF=AI-CH2-DATA, TR_TL=$(SYS)-$(EVR):Pul0-Ena-Sel, TR_TLTSEL=$(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME, PSU_SP=PSU:SP, PSU_RBV=PSU:RBV")
 
-#
-# Simulated PSU
-#
+dbLoadRecords("EMU.db", "DEVICE=$(SCANPREFIX), SCAN_SLIT=$(SCAN_SLIT), SCAN_EF=$(SCAN_EF), MTRREC=$(PMACPREFIX):$(MOTOR_NAME1), MAX_POINTS_EF=$(SCAN_POINTS_EF), MAX_POINTS_SLIT=$(SCAN_POINTS_SLIT), DAQNDSPREFIX=$(DAQPREFIX), DAQBUFSIZE=$(DAQBUFSIZE), DET1WF=AI-CH0-DATA, DET2WF=AI-CH1-DATA, DET3WF=AI-CH2-DATA, TR_TL=$(SYS)-$(EVR):Pul0-Ena-Sel, TR_TLTSEL=$(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME, PSU_SP=LNS-ISRC-010:PBI-EM:HVhor-SP, PSU_RBV=LNS-ISRC-010:PBI-EM:HVhor-RBV, PSU2_SP=LNS-ISRC-010:PBI-EM:HVver-SP, PSU2_RBV=LNS-ISRC-010:PBI-EM:HVver-RBV")
 
-dbLoadRecords "EMU_PS-SIM.template", "PREFIX=PSU"
+
+# Simulated PSU
+dbLoadRecords (EMU_PS-SIM.template, "PREFIX=LNS-ISRC-010:PBI-EM, SIGNAL=HVhor")
+dbLoadRecords (EMU_PS-SIM.template, "PREFIX=LNS-ISRC-010:PBI-EM, SIGNAL=HVver")
 
 iocInit
 
@@ -153,6 +141,7 @@ seq motorHoming "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1)"
 dbpf $(DAQPREFIX):AI-CH0-DATA.FLNK $(SCANPREFIX):DET1-GUARD
 dbpf $(DAQPREFIX):AI-CH1-DATA.FLNK $(SCANPREFIX):DET2-GUARD
 dbpf $(DAQPREFIX):AI-CH2-DATA.FLNK $(SCANPREFIX):DET3-GUARD
+
 # Forward link from state record to Detector trigger
 dbpf $(DAQPREFIX):AI-STAT-RB.FLNK $(SCANPREFIX):DAQTRG-DAQSTGUARD
 
@@ -162,11 +151,18 @@ dbpf $(DAQPREFIX):AI-SMNM-RB.FLNK "$(SCANPREFIX):DET1-COMPRESSN"
 
 ### Setup IFCDAQ PVs ###
 # Set the DAQ to on state
-dbpf $(DAQPREFIX):AI-STAT "ON"
+#dbpf $(DAQPREFIX):AI-STAT "ON"
 # Set trigger repeat to 1
 dbpf $(DAQPREFIX):AI-TRGR 1
 # Set trigger source to external GPIO
 dbpf $(DAQPREFIX):AI-TRGS "EXT-GPIO"
+sleep(1)
+dbpf $(DAQPREFIX):AI-STAT ON
+sleep(3)
+dbpf $(DAQPREFIX):AI-STAT RUNNING
+sleep(1)
+dbpf $(DAQPREFIX):AI-STAT RUNNING
+
 
 # Set tsel on WF record to event record in EVR
 dbpf $(DAQPREFIX):AI-CH0-DATA.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
@@ -176,7 +172,7 @@ dbpf $(DAQPREFIX):AI-CH2-DATA.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
 ########## TIMING GENERATOR: setup softEvent to trigg acquisistion on the  DTAcQ ######
 ## Internal trigger from Mxc1 - TrgSrc0
 dbpf $(SYS)-$(EVG):TrigEvt0-EvtCode-SP 	 $(EVR_PUL0_EVENT)
-dbpf $(SYS)-$(EVG):Mxc1-Frequency-SP	 14
+dbpf $(SYS)-$(EVG):Mxc1-Frequency-SP	 1
 dbpf $(SYS)-$(EVG):Mxc1-TrigSrc0-SP 	 "Set"
 
 dbpf $(SYS)-$(EVG):ResetMxc-Cmd		 1
@@ -195,16 +191,19 @@ dbpf $(SYS)-$(EVR):FrontOut0-Ena-SP      1
 #dbpf $(SYS)-$(EVR):Time-I.TSE -2
 
 ### Setup reasonable values for sscan record ###
-# Initialize slit positioners
-dbpf $(SCANPREFIX):$(SCAN_SLIT).P4SP -1
-dbpf $(SCANPREFIX):$(SCAN_SLIT).P4EP 1
-dbpf $(SCANPREFIX):$(SCAN_SLIT).P2SP 1
-dbpf $(SCANPREFIX):$(SCAN_SLIT).P2EP 1
+# Initialize SLIT(MOTOR) positioners
+dbpf $(SCANPREFIX):$(SCAN_SLIT).P4SP -60
+dbpf $(SCANPREFIX):$(SCAN_SLIT).P4EP -100
 dbpf $(SCANPREFIX):$(SCAN_SLIT).NPTS 11
-
-# Initialize ef positioners
-dbpf $(SCANPREFIX):$(SCAN_EF).P4SP -1
-dbpf $(SCANPREFIX):$(SCAN_EF).P4EP 1
-dbpf $(SCANPREFIX):$(SCAN_EF).PDLY 0.01
-dbpf $(SCANPREFIX):$(SCAN_EF).NPTS 101
-
+dbpf $(SCANPREFIX):$(SCAN_SLIT).PASM "START POS"
+
+# Initialize EF(DAC) positionners
+##### Powers supply PS1
+dbpf $(SCANPREFIX):$(SCAN_EF).P4SP 10
+dbpf $(SCANPREFIX):$(SCAN_EF).P4EP -10
+##### Powers supply PS2
+dbpf $(SCANPREFIX):$(SCAN_EF).P1SP -10
+dbpf $(SCANPREFIX):$(SCAN_EF).P1EP 10
+
+dbpf $(SCANPREFIX):$(SCAN_EF).PDLY 1
+dbpf $(SCANPREFIX):$(SCAN_EF).NPTS 10
diff --git a/startup/EMU_Motor1.cmd b/startup/EMU_Motor1.cmd
deleted file mode 100644
index 42f3f808c5f06a2317a7c53f644f96ceed0c70f2..0000000000000000000000000000000000000000
--- a/startup/EMU_Motor1.cmd
+++ /dev/null
@@ -1,218 +0,0 @@
-# Required modules ###
-require ifcdaq
-require singlemotion
-require mrfsample
-require pev
-require FastAcquisition,RC
-require DataAcquisition,RC
-require EMU,jfdenis
-
-
-### MACROS ###
-# PMAC common macros3       ) 
-epicsEnvSet("PMACPREFIX", "PMAC"  )
-epicsEnvSet("PMACPORT",   "pmacLV")
-epicsEnvSet("MOTOR_PORT", "pmac1" )
-epicsEnvSet("NB_AXES", "1" )
-
-# Motor Macros
-epicsEnvSet("EGU",       "mm"   )
-epicsEnvSet("DIR",       "Neg"  )
-epicsEnvSet("MRES",      "0.0002495")
-epicsEnvSet("PREC",      "2"    )
-epicsEnvSet("DHLM",      "250"   )
-epicsEnvSet("DLLM",      "-250"  )
-epicsEnvSet("VELO",      "2"    )
-epicsEnvSet("VBAS",      "0.1"  )
-epicsEnvSet("VMAX",      "2"    )
-epicsEnvSet("ACCL",      "0.1"  )
-epicsEnvSet("BDST",      "0"    )
-epicsEnvSet("INIT",      ""     )
-epicsEnvSet("OFF",       "0"    )
-epicsEnvSet("MOTOR_NAME1",  "MTR")
-epicsEnvSet("AXIS_NO1",     "1")
-
-# Motor Status macros
-epicsEnvSet("SCAN",         "1 second")
-epicsEnvSet("OVERHEAT1",    "MAJOR"   )
-epicsEnvSet("SWITCH_OFF1",  "MINOR"   )
-epicsEnvSet("OVERHEAT2",    "0"       )
-epicsEnvSet("SWITCH_OFF2",  "0"       )
-epicsEnvSet("MOTOR_ERROR1", "0"       )
-epicsEnvSet("MOTOR_ERROR2", "0"       )
-epicsEnvSet("MOTOR_ERROR3", "0"       )
-epicsEnvSet("MOTOR_ERROR4", "0"       )
-
-# EVG Macros 
-epicsEnvSet("SYS"             "SYS0")
-epicsEnvSet("EVG"             "EVG0")
-epicsEnvSet("EVG_VMESLOT"     "7")
-
-# EVR Macros
-epicsEnvSet("EVR_PCIDOMAIN",    "0000")
-epicsEnvSet("EVR_PCIBUS",       "05")
-epicsEnvSet("EVR_PCIDEVICE",    "00")
-epicsEnvSet("EVR_PCIFUNCTION",  "0")
-epicsEnvSet("EVR",              "EVR0")
-epicsEnvSet("EVR_PUL0_EVENT",   "1")
-epicsEnvSet("EVR_PUL0_DELAY",   "$(EVR_EV14_OUT0_DELAY=0)")
-epicsEnvSet("EVR_PUL0_WIDTH",   "$(EVR_EV14_OUT0_WIDTH=1000)")
-
-#DAQ macros
-epicsEnvSet("DAQPREFIX",  "INFN-Src"  )
-epicsEnvSet("DAQBUFSIZE", "10000")
-epicsEnvSet("DAQBUFSIZE_REDUC", "1000")
-
-#Scanning macros
-epicsEnvSet("SCANPREFIX", "INFN-Src:PBI-EM-SCAN"     )
-epicsEnvSet("SCAN_MTR", "MTR"          )
-epicsEnvSet("SCAN_PS", "PS"              )
-epicsEnvSet("SCAN_POINTS_EF", "100"     )
-epicsEnvSet("SCAN_POINTS_SLIT", "100"    )
-
-epicsEnvSet(EPICS_CA_MAX_ARRAY_BYTES, 400000000)
-
-# Connection to PMAC and setup for $(NUM_MOTORS) motors
-pmacAsynIPConfigure($(PMACPORT), "192.6.94.2:1025")
-pmacCreateController($(MOTOR_PORT), $(PMACPORT), 0, $(NB_AXES), 50, 300)
-pmacCreateAxis($(MOTOR_PORT), $(AXIS_NO1))
-
-# Initialize EVG
-mrmEvgSetupVME($(EVG), $(EVG_VMESLOT), 0x100000, 1, 0x01)
-
-# Initialize EVR
-mrmEvrSetupPCI($(EVR), $(EVR_PCIDOMAIN), $(EVR_PCIBUS), $(EVR_PCIDEVICE), $(EVR_PCIFUNCTION))
-
-# Initialize daq
-ndsCreateDevice(ifcdaq, CARD0, card=0, fmc=2)
-
-
-### LOAD RECORDS ###
-
-#Load EVG records
-dbLoadRecords("evg-vme-230.db", "DEVICE=$(EVG), SYS=$(SYS)")
-
-#Load EVR records
-dbLoadRecords("evr-pmc-230.db", "EVR=$(EVR), DEVICE=$(EVR), SYS=$(SYS)")
-dbLoadRecords("evr-softEvent.template", "EVR=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), CODE=$(EVR_PUL0_EVENT)")
-dbLoadRecords("evr-pulserMap.template", "EVR=$(EVR), SYS=$(SYS), EVT=$(EVR_PUL0_EVENT), PID=0, F=Trig, ID=0")
-
-## Load ifcdaq instance
-dbLoadRecords(DataAcquisitionChannel.template,"SECTION=INFN,SUBSECTION=Src,DISC=PBI,DEVICE=EM-FC1,SIGNAL=CurR,EVENT_IN=100,DESCRIPTION=Current FC,NELM=$(DAQBUFSIZE),SIZE=$(DAQBUFSIZE_REDUC),SAMPLING_RATE_PV=INFN-Src:CARD0:SAMPLINGRATE,Unit=mA")
-dbLoadRecords(DataAcquisitionChannel.template,"SECTION=INFN,SUBSECTION=Src,DISC=PBI,DEVICE=EM-PS1,SIGNAL=VoltR,EVENT_IN=101,DESCRIPTION=Voltage plate 1,NELM=$(DAQBUFSIZE),SIZE=$(DAQBUFSIZE_REDUC),SAMPLING_RATE_PV=INFN-Src:CARD0:SAMPLINGRATE,Unit=kV")
-dbLoadRecords(DataAcquisitionChannel.template,"SECTION=INFN,SUBSECTION=Src,DISC=PBI,DEVICE=EM-PS2,SIGNAL=VoltR,EVENT_IN=102,DESCRIPTION=Voltage plate 2,NELM=$(DAQBUFSIZE),SIZE=$(DAQBUFSIZE_REDUC),SAMPLING_RATE_PV=INFN-Src:CARD0:SAMPLINGRATE,Unit=kV")
-
-dbLoadRecords(FastAcquisition.template,"SECTION=INFN,SUBSECTION=Src,DISC=PBI,DEVICE=EM-FC1,EVENT_OUT=100,SIGNAL=CurR,NICKNAME=CFC,CARD=0,FMC=3,CHANNEL=0,NELM=$(DAQBUFSIZE)")
-dbLoadRecords(FastAcquisition.template,"SECTION=INFN,SUBSECTION=Src,DISC=PBI,DEVICE=EM-PS1,EVENT_OUT=101,SIGNAL=VoltR,NICKNAME=VP1,CARD=0,FMC=3,CHANNEL=1,NELM=$(DAQBUFSIZE)")
-dbLoadRecords(FastAcquisition.template,"SECTION=INFN,SUBSECTION=Src,DISC=PBI,DEVICE=EM-PS2,EVENT_OUT=102,SIGNAL=VoltR,NICKNAME=VP2,CARD=0,FMC=3,CHANNEL=2,NELM=$(DAQBUFSIZE)")
-
-dbLoadRecords(FastAcquisitionInformation.template,"PREFIX=${DAQPREFIX},CARD=0,FMC=2,NELM=$(DAQBUFSIZE)")
-
-#
-# Load Single motions records
-#
-
-#
-# Motors
-#
-
-dbLoadRecords("motor.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1),MOTOR_PORT=$(MOTOR_PORT),AXIS_NO=$(AXIS_NO1),EGU=$(EGU),DIR=$(DIR),MRES=$(MRES),PREC=$(PREC),DHLM=$(DHLM),DLLM=$(DLLM),VELO=$(VELO),VBAS=$(VBAS),VMAX=$(VMAX),ACCL=$(ACCL),BDST=$(BDST),INIT=$(INIT),OFF=$(OFF)")
-
-#
-# Motor status
-#
-
-dbLoadRecords("motorStatus.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1),ASYN_PORT=$(PMACPORT),AXIS_NO=$(AXIS_NO1),SCAN=$(SCAN),EGU=$(EGU),PREC=$(PREC),OVERHEAT1=$(OVERHEAT1),SWITCH_OFF1=$(SWITCH_OFF1),OVERHEAT2=$(OVERHEAT2),SWITCH_OFF2=$(SWITCH_OFF2),MOTOR_ERROR1=$(MOTOR_ERROR1),MOTOR_ERROR2=$(MOTOR_ERROR2),MOTOR_ERROR3=$(MOTOR_ERROR3),MOTOR_ERROR4=$(MOTOR_ERROR4)")
-
-#
-# Homing procedure records
-#
-
-dbLoadRecords("motorHoming.template", "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1),ASYN_PORT=$(PMACPORT),AXIS_NO=$(AXIS_NO1),PREC=$(PREC),EGU=$(EGU)")
-
-#dbLoadRecords("EMU.db", "DEVICE=$(SCANPREFIX), SCAN_SLIT=$(SCAN_MTR), SCAN_EF=$(SCAN_PS), MTRREC=$(PMACPREFIX):$(MOTOR_NAME1), MAX_POINTS_EF=$(SCAN_POINTS_EF), MAX_POINTS_SLIT=$(SCAN_POINTS_SLIT), DAQNDSPREFIX=$(DAQPREFIX), DAQBUFSIZE=$(DAQBUFSIZE), DET1WF=AI-CH0-DATA, DET2WF=AI-CH1-DATA, DET3WF=AI-CH2-DATA, TR_TL=$(SYS)-$(EVR):Pul0-Ena-Sel, TR_TLTSEL=$(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME, PSU_SP=INFN-Src:PBI-EM:HVhor-SP, PSU_RBV=INFN-Src:PBI-EM:HVhor-RBV")
-
-dbLoadRecords("EMU.db","DEVICE=$(SCANPREFIX), SCAN_SLIT=$(SCAN_MTR), SCAN_EF=$(SCAN_PS), MTRREC=$(PMACPREFIX):$(MOTOR_NAME1), MAX_POINTS_EF=$(SCAN_POINTS_EF), MAX_POINTS_SLIT=$(SCAN_POINTS_SLIT), DAQNDSPREFIX=$(DAQPREFIX), DAQBUFSIZE=$(DAQBUFSIZE), DET1WF=PBI-EM-FC1:CurR, DET2WF=PBI-EM-PS1:VoltR,  DET3WF=PBI-EM-PS2:VoltR, TR_TL=$(SYS)-$(EVR):Pul0-Ena-Sel, TR_TLTSEL=$(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME, PSU_SP=INFN-Src:PBI-EM:HVhor-SP, PSU_RBV=INFN-Src:PBI-EM:HVhor-RBV")
-
-#
-# Simulated PSU
-#
-
-dbLoadRecords (EMU_PS-SIM.template, "PREFIX=INFN-Src:PBI-EM, SIGNAL=HVhor")
-#dbLoadRecords (EMU_PS-SIM.template, "PREFIX=INFN-Src:PBI-EM, SIGNAL=HVver")
-
-iocInit
-
-seq motorHoming "PREFIX=$(PMACPREFIX),MOTOR_NAME=$(MOTOR_NAME1)"
-
-# SET INTERFACE FROM IFCDAQ TO Allison scanner
-# Forward link wf record to Detector guard
-dbpf $(DAQPREFIX):PBI-EM-FC1:CurR_Y.FLNK $(SCANPREFIX):DET1-GUARD
-dbpf $(DAQPREFIX):PBI-EM-PS1:VoltR_Y.FLNK $(SCANPREFIX):DET2-GUARD
-dbpf $(DAQPREFIX):PBI-EM-PS2:VoltR_Y.FLNK $(SCANPREFIX):DET3-GUARD
-
-# Forward link from state record to Detector trigger
-dbpf $(DAQPREFIX):CARD0-STAT-RB.FLNK $(SCANPREFIX):DAQTRG-DAQSTGUARD
-
-# Forward link number of samples rbv to compress N record, so that detetor know number of elements to average over.
-dbpf $(DAQPREFIX):CARD0:NSAMPLES-RB.FLNK "$(SCANPREFIX):DET1-COMPRESSN"
-
-############################################################
-################### DTAQ Configuration  ####################
-############################################################
-
-dbpf INFN-Src:CARD0:NSAMPLES $(DAQBUFSIZE)
-dbpf INFN-Src:CARD0:SAMPLINGRATE 250000
-
-# Set trigger repeat to 1
-dbpf $(DAQPREFIX):CARD0:TriggerRepeat 1
-dbpf $(DAQPREFIX):CARD0:TRIGGERSOURCE "EXT-GPIO"
-sleep(1)
-dbpf INFN-Src:CARD0-STAT ON
-
-# Set tsel on WF record to event record in EVR
-dbpf $(DAQPREFIX):PBI-EM-FC1:CurR.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
-dbpf $(DAQPREFIX):PBI-EM-PS1:VoltR.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
-dbpf $(DAQPREFIX):PBI-EM-PS2:VoltR.TSEL $(SYS)-$(EVR):Event-$(EVR_PUL0_EVENT)-SP.TIME
-
-#######################################################################################
-########## TIMING GENERATOR: setup softEvent to trigg acquisistion on the  DTAcQ ######
-#######################################################################################
-
-## Internal trigger from Mxc1 - TrgSrc0
-dbpf $(SYS)-$(EVG):TrigEvt0-EvtCode-SP 	 $(EVR_PUL0_EVENT)
-dbpf $(SYS)-$(EVG):Mxc1-Frequency-SP	 14
-dbpf $(SYS)-$(EVG):Mxc1-TrigSrc0-SP 	 "Set"
-
-dbpf $(SYS)-$(EVG):ResetMxc-Cmd		 1
-dbpf $(SYS)-$(EVG):SoftEvt-Enable-Sel    1
-
-### Setup EVR
-# setup OUT 0
-# set the pulser 0 to trigger on output  0
-# and map the pulser to trigger on event $(EVR_PUL0_EVENT)
-dbpf $(SYS)-$(EVR):FrontOut0-Src-SP      0
-dbpf $(SYS)-$(EVR):Pul0-Evt-Trig0-SP 	 $(EVR_PUL0_EVENT)
-dbpf $(SYS)-$(EVR):Pul0-Width-SP         20000
-dbpf $(SYS)-$(EVR):Pul0-Delay-SP         0
-dbpf $(SYS)-$(EVR):FrontOut0-Ena-SP      1
-
-#dbpf $(SYS)-$(EVR):Time-I.TSE -2
-
-################################################
-### Setup reasonable values for sscan record ###
-################################################
-
-# Initialize slit positioners
-dbpf $(SCANPREFIX):$(SCAN_MTR).P4SP 0
-dbpf $(SCANPREFIX):$(SCAN_MTR).P4EP 10
-dbpf $(SCANPREFIX):$(SCAN_MTR).P2SP 1
-dbpf $(SCANPREFIX):$(SCAN_MTR).P2EP 1
-dbpf $(SCANPREFIX):$(SCAN_MTR).NPTS 11
-
-# Initialize ef positioners
-dbpf $(SCANPREFIX):$(SCAN_PS).P4SP 0
-dbpf $(SCANPREFIX):$(SCAN_PS).P4EP 10
-dbpf $(SCANPREFIX):$(SCAN_PS).PDLY 1
-dbpf $(SCANPREFIX):$(SCAN_PS).NPTS 10
-